Commit da9e0c27 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f884294b 0705e564

blockdev-nbd.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ void nbd_server_start(SocketAddress *addr, const char *tls_creds, 
    qio_net_listener_set_name(nbd_server->listener,

                              "nbd-listener");



    if (qio_net_listener_open_sync(nbd_server->listener, addr, errp) < 0) {

    if (qio_net_listener_open_sync(nbd_server->listener, addr, 1, errp) < 0) {

        goto error;

    }

chardev/char-socket.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

include/io/channel-socket.h

+4 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ void qio_channel_socket_connect_async(QIOChannelSocket *ioc, 
 * qio_channel_socket_listen_sync:

 * @ioc: the socket channel object

 * @addr: the address to listen to

 * @num: the expected ammount of connections

 * @errp: pointer to a NULL-initialized error object

 *

 * Attempt to listen to the address @addr. This method
@@ -132,12 +133,14 @@ void qio_channel_socket_connect_async(QIOChannelSocket *ioc, 
 */

int qio_channel_socket_listen_sync(QIOChannelSocket *ioc,

                                   SocketAddress *addr,

                                   int num,

                                   Error **errp);



/**

 * qio_channel_socket_listen_async:

 * @ioc: the socket channel object

 * @addr: the address to listen to

 * @num: the expected ammount of connections

 * @callback: the function to invoke on completion

 * @opaque: user data to pass to @callback

 * @destroy: the function to free @opaque
@@ -153,6 +156,7 @@ int qio_channel_socket_listen_sync(QIOChannelSocket *ioc, 
 */

void qio_channel_socket_listen_async(QIOChannelSocket *ioc,

                                     SocketAddress *addr,

                                     int num,

                                     QIOTaskFunc callback,

                                     gpointer opaque,

                                     GDestroyNotify destroy,

include/io/net-listener.h

+2 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ void qio_net_listener_set_name(QIONetListener *listener, 
 * qio_net_listener_open_sync:

 * @listener: the network listener object

 * @addr: the address to listen on

 * @num: the amount of expected connections

 * @errp: pointer to a NULL initialized error object

 *

 * Synchronously open a listening connection on all
@@ -104,6 +105,7 @@ void qio_net_listener_set_name(QIONetListener *listener, 
 */

int qio_net_listener_open_sync(QIONetListener *listener,

                               SocketAddress *addr,

                               int num,

                               Error **errp);



/**

include/qemu/sockets.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ int unix_connect(const char *path, Error **errp); 


SocketAddress *socket_parse(const char *str, Error **errp);

int socket_connect(SocketAddress *addr, Error **errp);

int socket_listen(SocketAddress *addr, Error **errp);

int socket_listen(SocketAddress *addr, int num, Error **errp);

void socket_listen_cleanup(int fd, Error **errp);

int socket_dgram(SocketAddress *remote, SocketAddress *local, Error **errp);