ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

migration: convert socket server to QIONetListener 

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.

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.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <20180312141714.7223-1-berrange@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
This commit is contained in:
Daniel P. Berrange 2018-03-12 14:17:14 +00:00 committed by Dr. David Alan Gilbert
parent 4c2c101590
commit bdd847a026
1 changed files with 16 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
migration/socket.c
View File

@ -24,6 +24,7 @@
#include "migration.h" #include "migration.h"
#include "qemu-file.h" #include "qemu-file.h"
#include "io/channel-socket.h" #include "io/channel-socket.h"
#include "io/net-listener.h"
#include "trace.h" #include "trace.h"
@ -129,34 +130,20 @@ void unix_start_outgoing_migration(MigrationState *s,
} }
static gboolean socket_accept_incoming_migration(QIOChannel *ioc, static void socket_accept_incoming_migration(QIONetListener *listener,
GIOCondition condition, QIOChannelSocket *cioc,
gpointer opaque) 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(); trace_migration_socket_incoming_accepted();
qio_channel_set_name(QIO_CHANNEL(sioc), "migration-socket-incoming"); qio_channel_set_name(QIO_CHANNEL(cioc), "migration-socket-incoming");
migration_channel_process_incoming(QIO_CHANNEL(sioc)); migration_channel_process_incoming(QIO_CHANNEL(cioc));
object_unref(OBJECT(sioc));
out:
if (migration_has_all_channels()) { if (migration_has_all_channels()) {
/* Close listening socket as its no longer needed */ /* Close listening socket as its no longer needed */
qio_channel_close(ioc, NULL); qio_net_listener_disconnect(listener);
return G_SOURCE_REMOVE;
} else { object_unref(OBJECT(listener));
return G_SOURCE_CONTINUE;
} }
} }
@ -164,21 +151,18 @@ out:
static void socket_start_incoming_migration(SocketAddress *saddr, static void socket_start_incoming_migration(SocketAddress *saddr,
Error **errp) Error **errp)
{ {
QIOChannelSocket *listen_ioc = qio_channel_socket_new(); QIONetListener *listener = qio_net_listener_new();
qio_channel_set_name(QIO_CHANNEL(listen_ioc), qio_net_listener_set_name(listener, "migration-socket-listener");
"migration-socket-listener");
if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) { if (qio_net_listener_open_sync(listener, saddr, errp) < 0) {
object_unref(OBJECT(listen_ioc)); object_unref(OBJECT(listener));
return; return;
} }
qio_channel_add_watch(QIO_CHANNEL(listen_ioc), qio_net_listener_set_client_func(listener,
G_IO_IN, socket_accept_incoming_migration,
socket_accept_incoming_migration, NULL, NULL);
listen_ioc,
(GDestroyNotify)object_unref);
} }
void tcp_start_incoming_migration(const char *host_port, Error **errp) void tcp_start_incoming_migration(const char *host_port, Error **errp)