[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/5] migration: convert socket server to QIONetListen
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[Qemu-devel] [PULL 1/5] migration: convert socket server to QIONetListener |
Date: |
Fri, 23 Mar 2018 20:23:40 +0000 |
From: "Daniel P. Berrange" <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Dr. David Alan Gilbert <address@hidden>
---
migration/socket.c | 48 ++++++++++++++++--------------------------------
1 file changed, 16 insertions(+), 32 deletions(-)
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"
@@ -129,34 +130,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));
}
}
@@ -164,21 +151,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
- [Qemu-devel] [PULL 0/5] migration queue, Dr. David Alan Gilbert (git), 2018/03/23
- [Qemu-devel] [PULL 2/5] migration: Fix rate limiting issue on RDMA migration, Dr. David Alan Gilbert (git), 2018/03/23
- [Qemu-devel] [PULL 3/5] migration/block: limit the number of parallel I/O requests, Dr. David Alan Gilbert (git), 2018/03/23
- [Qemu-devel] [PULL 1/5] migration: convert socket server to QIONetListener,
Dr. David Alan Gilbert (git) <=
- [Qemu-devel] [PULL 4/5] migration/block: compare only read blocks against the rate limiter, Dr. David Alan Gilbert (git), 2018/03/23
- [Qemu-devel] [PULL 5/5] migration: Fix block migration flag case, Dr. David Alan Gilbert (git), 2018/03/23
- Re: [Qemu-devel] [PULL 0/5] migration queue, Peter Maydell, 2018/03/24