diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-09-04 15:38:27 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-09-04 15:38:27 +0100 |
| commit | da9e0c27214733888d6366794f33c4c2db348dc1 (patch) | |
| tree | 6360f112aca29244f7187c3442e034f7b5240247 /chardev | |
| parent | f884294bd76eb89127d311627d8de1b70ec9ba54 (diff) | |
| parent | 0705e56496d2b155b5796c6b28d4110e5bcbd5d8 (diff) | |
| download | qemu-da9e0c27214733888d6366794f33c4c2db348dc1.zip qemu-da9e0c27214733888d6366794f33c4c2db348dc1.tar.gz qemu-da9e0c27214733888d6366794f33c4c2db348dc1.tar.bz2 | |
Merge remote-tracking branch 'remotes/juanquintela/tags/fail-pull-request' into staging
Fix multifd with big number of channels
# gpg: Signature made Wed 04 Sep 2019 07:28:31 BST
# gpg: using RSA key 1899FF8EDEBF58CCEE034B82F487EF185872D723
# gpg: Good signature from "Juan Quintela <quintela@redhat.com>" [full]
# gpg: aka "Juan Quintela <quintela@trasno.org>" [full]
# Primary key fingerprint: 1899 FF8E DEBF 58CC EE03 4B82 F487 EF18 5872 D723
* remotes/juanquintela/tags/fail-pull-request:
multifd: Use number of channels as listen backlog
socket: Add num connections to qio_net_listener_open_sync()
socket: Add num connections to qio_channel_socket_async()
socket: Add num connections to qio_channel_socket_sync()
socket: Add backlog parameter to socket_listen
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'chardev')
| -rw-r--r-- | chardev/char-socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chardev/char-socket.c b/chardev/char-socket.c index 03f0340..185fe38 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -1170,7 +1170,7 @@ static int qmp_chardev_open_socket_server(Chardev *chr, qio_net_listener_set_name(s->listener, name); g_free(name); - if (qio_net_listener_open_sync(s->listener, s->addr, errp) < 0) { + if (qio_net_listener_open_sync(s->listener, s->addr, 1, errp) < 0) { object_unref(OBJECT(s->listener)); s->listener = NULL; return -1; |