Commit fc8135c6 authored by Juan Quintela's avatar Juan Quintela
Browse files

socket: Add num connections to qio_net_listener_open_sync() 



Reviewed-by: default avatarDaniel P. Berrangé <berrange@redhat.com>
Signed-off-by: default avatarJuan Quintela <quintela@redhat.com>
parent 7959e29e

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/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);



/**

io/net-listener.c

+2 −1
Original line number Diff line number Diff line
@@ -62,6 +62,7 @@ static gboolean qio_net_listener_channel_func(QIOChannel *ioc, 


int qio_net_listener_open_sync(QIONetListener *listener,

                               SocketAddress *addr,

                               int num,

                               Error **errp)

{

    QIODNSResolver *resolver = qio_dns_resolver_get_instance();
@@ -82,7 +83,7 @@ int qio_net_listener_open_sync(QIONetListener *listener, 
    for (i = 0; i < nresaddrs; i++) {

        QIOChannelSocket *sioc = qio_channel_socket_new();



        if (qio_channel_socket_listen_sync(sioc, resaddrs[i], 1,

        if (qio_channel_socket_listen_sync(sioc, resaddrs[i], num,

                                           err ? NULL : &err) == 0) {

            success = true;

migration/socket.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ static void socket_start_incoming_migration(SocketAddress *saddr, 


    qio_net_listener_set_name(listener, "migration-socket-listener");



    if (qio_net_listener_open_sync(listener, saddr, errp) < 0) {

    if (qio_net_listener_open_sync(listener, saddr, 1, errp) < 0) {

        object_unref(OBJECT(listener));

        return;

    }