diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2021-08-05 16:25:44 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2021-08-05 16:25:44 +0100 |
| commit | 287d53398a425308629a9d8ae85595cf55d7bf14 (patch) | |
| tree | 12646d8aca7f9ab87128bf32637c6b4645dd1d38 /net/vhost-user.c | |
| parent | bccabb3a5d60182645c7749e89f21a9ff307a9eb (diff) | |
| parent | a68403b0a6843f106e381b0bbeaacb29f6d27255 (diff) | |
| download | focaccia-qemu-287d53398a425308629a9d8ae85595cf55d7bf14.tar.gz focaccia-qemu-287d53398a425308629a9d8ae85595cf55d7bf14.zip | |
Merge remote-tracking branch 'remotes/marcandre/tags/chr-fix-pull-request' into staging
Chardev-related fixes Hi Here are some bug fixes worthy for 6.1. thanks # gpg: Signature made Thu 05 Aug 2021 13:52:03 BST # gpg: using RSA key 87A9BD933F87C606D276F62DDAE8E10975969CE5 # gpg: issuer "marcandre.lureau@redhat.com" # gpg: Good signature from "Marc-André Lureau <marcandre.lureau@redhat.com>" [full] # gpg: aka "Marc-André Lureau <marcandre.lureau@gmail.com>" [full] # Primary key fingerprint: 87A9 BD93 3F87 C606 D276 F62D DAE8 E109 7596 9CE5 * remotes/marcandre/tags/chr-fix-pull-request: chardev: report a simpler error about duplicated id chardev: give some context on chardev-add error chardev: fix qemu_chr_open_fd() with fd_in==fd_out chardev: fix qemu_chr_open_fd() being called with fd=-1 chardev: fix fd_chr_add_watch() when in != out chardev: mark explicitly first argument as poisoned chardev/socket: print a more correct command-line address util: fix abstract socket path copy Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'net/vhost-user.c')
| -rw-r--r-- | net/vhost-user.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/vhost-user.c b/net/vhost-user.c index ffbd94d944..6adfcd623a 100644 --- a/net/vhost-user.c +++ b/net/vhost-user.c @@ -208,8 +208,8 @@ static NetClientInfo net_vhost_user_info = { .set_vnet_le = vhost_user_set_vnet_endianness, }; -static gboolean net_vhost_user_watch(GIOChannel *chan, GIOCondition cond, - void *opaque) +static gboolean net_vhost_user_watch(void *do_not_use, GIOCondition cond, + void *opaque) { NetVhostUserState *s = opaque; |