diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2023-11-08 20:34:49 +0800 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2023-11-08 20:34:49 +0800 |
| commit | f09744ddc2424bc6a76702e1951a8d24917062d6 (patch) | |
| tree | 097f791ec5b615c5db3b527c78d6924c5de691cd /io/net-listener.c | |
| parent | 44ad47b75877e10a750adb17174539ddfeae3963 (diff) | |
| parent | 3e7ebf58e808afb422e5000bbf77dc4aa88dd6e6 (diff) | |
| download | focaccia-qemu-f09744ddc2424bc6a76702e1951a8d24917062d6.tar.gz focaccia-qemu-f09744ddc2424bc6a76702e1951a8d24917062d6.zip | |
Merge tag 'misc-fixes-pull-request' of https://gitlab.com/berrange/qemu into staging
* Print error with f32 audio format in wav backend instead of abort * Drop redundant listener name suffix * Update libvirt mailing list address * Cleanup RSA key error paths * Fix CPU uarch ABI script QMP command calling # -----BEGIN PGP SIGNATURE----- # # iQIzBAABCAAdFiEE2vOm/bJrYpEtDo4/vobrtBUQT98FAmVKiwoACgkQvobrtBUQ # T9+SjxAAmDBWE9WI/eKZEb3QVNi3W90bVNIKMSdu7DMaqSPGMe6dcNeJy6kHL2ud # EgdvtKgWq5wwFDojrYiUB75tSFGP7InK2a7EN7t60kE/XxtqR/fvLo11d+gUI7Z6 # vetsHLtDYEs3Hr/75qg1/ock/G1TxzlJknzww1zDjQrwFSaJnOWDdY+RSRGTwEho # PRfFRkIDZqs3LAKyjRdiYWms90vogG2Bwygmo/mirgta9Lmkz9WC9SN/EqOvOBOE # NyaO84xu38U3JwN5d9w4MFdgayFNRYTcvTu8J0NdHLp16CYBViGecIGb4deDYN0U # jhmfKChyr0tJucPsRndXQU2KFusePjiSWEsG9FdbpXdjFGIwinJUDKOaHI4Kk9pc # stGCwb8+9Ec0e31JqtMBd5VeoToK8UsthVqAx1brnXv9K5liSXS7nyFPwNp/SMi4 # UNpjawSItAHEgc6VzqDNZY+dGtueMZmM0lf7cMLho3BgAeyTbr1NuwOIJx28JP2E # NnkAwDHjj9u1mkhRM7BbgBzGq006naWP8V6dCGQSH+/D0C9P3yzs7XLtvwtUDO3P # DalGRsazT+o+pyuyw0uyV2z6GuLAl9ZhI0MJCgIxsmASdxANxMcIaCrs1yc0IG2A # y16e4/Ic/FzqkbwkkBy3tkDF7vI0++1MuqmcWki+RFz1hzqmY+Y= # =KHzn # -----END PGP SIGNATURE----- # gpg: Signature made Wed 08 Nov 2023 03:07:54 HKT # gpg: using RSA key DAF3A6FDB26B62912D0E8E3FBE86EBB415104FDF # gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>" [full] # gpg: aka "Daniel P. Berrange <berrange@redhat.com>" [full] # Primary key fingerprint: DAF3 A6FD B26B 6291 2D0E 8E3F BE86 EBB4 1510 4FDF * tag 'misc-fixes-pull-request' of https://gitlab.com/berrange/qemu: scripts/cpu-x86-uarch-abi.py: Fix parameter error of cmd MAINTAINERS: update libvirt devel mailing list address audio: don't abort on f32 audio format in wav backend io: Stop appending -listen to net listeners crypto/rsakey-builtin.c.inc: Clean up two error paths Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'io/net-listener.c')
| -rw-r--r-- | io/net-listener.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/io/net-listener.c b/io/net-listener.c index 1c984d69c6..47405965a6 100644 --- a/io/net-listener.c +++ b/io/net-listener.c @@ -109,9 +109,7 @@ void qio_net_listener_add(QIONetListener *listener, QIOChannelSocket *sioc) { if (listener->name) { - char *name = g_strdup_printf("%s-listen", listener->name); - qio_channel_set_name(QIO_CHANNEL(sioc), name); - g_free(name); + qio_channel_set_name(QIO_CHANNEL(sioc), listener->name); } listener->sioc = g_renew(QIOChannelSocket *, listener->sioc, |