From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35403) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1evg7Q-0006BN-D4 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 05:21:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1evg7M-0006UD-W9 for qemu-devel@nongnu.org; Tue, 13 Mar 2018 05:21:16 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:53120 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1evg7M-0006SU-Kk for qemu-devel@nongnu.org; Tue, 13 Mar 2018 05:21:12 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0911F4022931 for ; Tue, 13 Mar 2018 09:21:01 +0000 (UTC) Date: Tue, 13 Mar 2018 09:20:53 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20180313092053.GA3545@work-vm> References: <20180312141714.7223-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20180312141714.7223-1-berrange@redhat.com> Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH for-2.12 REPOST] migration: convert socket server to QIONetListener List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Daniel =?iso-8859-1?Q?P=2E_Berrang=E9?= Cc: qemu-devel@nongnu.org, Juan Quintela * Daniel P. Berrang=E9 (berrange@redhat.com) wrote: > From: "Daniel P. Berrange" >=20 > Instead of creating a QIOChannelSocket directly for the migration > server socket, use a QIONetListener. This provides the ability > to listen on multiple sockets at the same time, so enables > full support for IPv4/IPv6 dual stack. >=20 > For example, '$QEMU -incoming tcp::9000' now correctly listens > on both 0.0.0.0 and :: at the same time, instead of only on 0.0.0.0. >=20 > Signed-off-by: Daniel P. Berrange Reviewed-by: Dr. David Alan Gilbert > --- > migration/socket.c | 48 ++++++++++++++++------------------------------= -- > 1 file changed, 16 insertions(+), 32 deletions(-) >=20 > diff --git a/migration/socket.c b/migration/socket.c > index 8a93fb1af5..122d8ccfbe 100644 > --- a/migration/socket.c > +++ b/migration/socket.c > @@ -24,6 +24,7 @@ > #include "migration.h" > #include "qemu-file.h" > #include "io/channel-socket.h" > +#include "io/net-listener.h" > #include "trace.h" > =20 > =20 > @@ -129,34 +130,20 @@ void unix_start_outgoing_migration(MigrationState= *s, > } > =20 > =20 > -static gboolean socket_accept_incoming_migration(QIOChannel *ioc, > - GIOCondition conditio= n, > - gpointer opaque) > +static void socket_accept_incoming_migration(QIONetListener *listener, > + QIOChannelSocket *cioc, > + gpointer opaque) > { > - QIOChannelSocket *sioc; > - Error *err =3D NULL; > - > - sioc =3D qio_channel_socket_accept(QIO_CHANNEL_SOCKET(ioc), > - &err); > - if (!sioc) { > - error_report("could not accept migration connection (%s)", > - error_get_pretty(err)); > - goto out; > - } > - > trace_migration_socket_incoming_accepted(); > =20 > - qio_channel_set_name(QIO_CHANNEL(sioc), "migration-socket-incoming= "); > - migration_channel_process_incoming(QIO_CHANNEL(sioc)); > - object_unref(OBJECT(sioc)); > + qio_channel_set_name(QIO_CHANNEL(cioc), "migration-socket-incoming= "); > + migration_channel_process_incoming(QIO_CHANNEL(cioc)); > =20 > -out: > if (migration_has_all_channels()) { > /* Close listening socket as its no longer needed */ > - qio_channel_close(ioc, NULL); > - return G_SOURCE_REMOVE; > - } else { > - return G_SOURCE_CONTINUE; > + qio_net_listener_disconnect(listener); > + > + object_unref(OBJECT(listener)); > } > } > =20 > @@ -164,21 +151,18 @@ out: > static void socket_start_incoming_migration(SocketAddress *saddr, > Error **errp) > { > - QIOChannelSocket *listen_ioc =3D qio_channel_socket_new(); > + QIONetListener *listener =3D qio_net_listener_new(); > =20 > - qio_channel_set_name(QIO_CHANNEL(listen_ioc), > - "migration-socket-listener"); > + qio_net_listener_set_name(listener, "migration-socket-listener"); > =20 > - if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) { > - object_unref(OBJECT(listen_ioc)); > + if (qio_net_listener_open_sync(listener, saddr, errp) < 0) { > + object_unref(OBJECT(listener)); > return; > } > =20 > - qio_channel_add_watch(QIO_CHANNEL(listen_ioc), > - G_IO_IN, > - socket_accept_incoming_migration, > - listen_ioc, > - (GDestroyNotify)object_unref); > + qio_net_listener_set_client_func(listener, > + socket_accept_incoming_migration, > + NULL, NULL); > } > =20 > void tcp_start_incoming_migration(const char *host_port, Error **errp) > --=20 > 2.14.3 >=20 -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK