Re: [Qemu-devel] [PATCH] migration: convert socket server to QIONetListener

["Daniel P. Berrangé" <berrange@redhat.com>]

Ping

On Mon, Feb 12, 2018 at 05:48:22PM +0000, Daniel P. Berrangé wrote:
> Ping, any thoughts on this ?
> 
> NB, it will conflict with the multiple-sockets migration work I
> expect, since IIRC that assumes it can get the GSource ID of the
> migration listener, but that's not valid going forward, since
> the GSource's are private to the QIONetListener. The callers
> just register & unregister the callbacks.
> 
> On Thu, Jan 25, 2018 at 03:59:15PM +0000, Daniel P. Berrangé wrote:
> > From: "Daniel P. Berrange" <berrange@redhat.com>
> > 
> > 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.
> > 
> > Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
> > ---
> >  migration/socket.c | 48 ++++++++++++++++--------------------------------
> >  1 file changed, 16 insertions(+), 32 deletions(-)
> > 
> > diff --git a/migration/socket.c b/migration/socket.c
> > index 3a8232dd2d..d0ef50765c 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"
> >  
> >  
> > @@ -130,34 +131,20 @@ void unix_start_outgoing_migration(MigrationState *s,
> >  }
> >  
> >  
> > -static gboolean socket_accept_incoming_migration(QIOChannel *ioc,
> > -                                                 GIOCondition condition,
> > -                                                 gpointer opaque)
> > +static void socket_accept_incoming_migration(QIONetListener *listener,
> > +                                             QIOChannelSocket *cioc,
> > +                                             gpointer opaque)
> >  {
> > -    QIOChannelSocket *sioc;
> > -    Error *err = NULL;
> > -
> > -    sioc = 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();
> >  
> > -    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));
> >  
> > -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));
> >      }
> >  }
> >  
> > @@ -165,21 +152,18 @@ out:
> >  static void socket_start_incoming_migration(SocketAddress *saddr,
> >                                              Error **errp)
> >  {
> > -    QIOChannelSocket *listen_ioc = qio_channel_socket_new();
> > +    QIONetListener *listener = qio_net_listener_new();
> >  
> > -    qio_channel_set_name(QIO_CHANNEL(listen_ioc),
> > -                         "migration-socket-listener");
> > +    qio_net_listener_set_name(listener, "migration-socket-listener");
> >  
> > -    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;
> >      }
> >  
> > -    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);
> >  }
> >  
> >  void tcp_start_incoming_migration(const char *host_port, Error **errp)
> > -- 
> > 2.14.3
> > 
> 
> Regards,
> Daniel
> -- 
> |: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org         -o-            https://fstop138.berrange.com :|
> |: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|
> 

Regards,
Daniel
-- 
|: https://berrange.com      -o-    https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org         -o-            https://fstop138.berrange.com :|
|: https://entangle-photo.org    -o-    https://www.instagram.com/dberrange :|