From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42886) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e3zHm-0001aN-D9 for qemu-devel@nongnu.org; Mon, 16 Oct 2017 02:54:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e3zHl-0002ua-DK for qemu-devel@nongnu.org; Mon, 16 Oct 2017 02:54:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53574) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1e3zHl-0002tm-5C for qemu-devel@nongnu.org; Mon, 16 Oct 2017 02:54:01 -0400 From: Peter Xu Date: Mon, 16 Oct 2017 14:52:08 +0800 Message-Id: <20171016065216.18162-25-peterx@redhat.com> In-Reply-To: <20171016065216.18162-1-peterx@redhat.com> References: <20171016065216.18162-1-peterx@redhat.com> Subject: [Qemu-devel] [PATCH v3 24/32] migration: return incoming task tag for sockets List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Andrea Arcangeli , "Daniel P . Berrange" , Juan Quintela , Alexey Perevalov , "Dr . David Alan Gilbert" , peterx@redhat.com For socket based incoming migration, we attached a background task onto main loop to handle the acception of connections. We never had a way to destroy it before, only if we finished the migration. Let's allow socket_start_incoming_migration() to return the source tag of the listening async work, so that we may be able to clean it up in the future. Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Peter Xu --- migration/socket.c | 36 ++++++++++++++++++++++++------------ migration/socket.h | 4 ++-- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/migration/socket.c b/migration/socket.c index 4879f11e0f..e8f3325155 100644 --- a/migration/socket.c +++ b/migration/socket.c @@ -162,8 +162,12 @@ out: } -static void socket_start_incoming_migration(SocketAddress *saddr, - Error **errp) +/* + * Returns the tag ID of the watch that is attached to global main + * loop (>0), or zero if failure detected. + */ +static guint socket_start_incoming_migration(SocketAddress *saddr, + Error **errp) { QIOChannelSocket *listen_ioc = qio_channel_socket_new(); @@ -172,30 +176,38 @@ static void socket_start_incoming_migration(SocketAddress *saddr, if (qio_channel_socket_listen_sync(listen_ioc, saddr, errp) < 0) { object_unref(OBJECT(listen_ioc)); - return; + return 0; } - qio_channel_add_watch(QIO_CHANNEL(listen_ioc), - G_IO_IN, - socket_accept_incoming_migration, - listen_ioc, - (GDestroyNotify)object_unref); + return qio_channel_add_watch(QIO_CHANNEL(listen_ioc), + G_IO_IN, + socket_accept_incoming_migration, + listen_ioc, + (GDestroyNotify)object_unref); } -void tcp_start_incoming_migration(const char *host_port, Error **errp) +guint tcp_start_incoming_migration(const char *host_port, Error **errp) { Error *err = NULL; SocketAddress *saddr = tcp_build_address(host_port, &err); + guint tag = 0; + if (!err) { - socket_start_incoming_migration(saddr, &err); + tag = socket_start_incoming_migration(saddr, &err); } error_propagate(errp, err); qapi_free_SocketAddress(saddr); + + return tag; } -void unix_start_incoming_migration(const char *path, Error **errp) +guint unix_start_incoming_migration(const char *path, Error **errp) { SocketAddress *saddr = unix_build_address(path); - socket_start_incoming_migration(saddr, errp); + guint tag; + + tag = socket_start_incoming_migration(saddr, errp); qapi_free_SocketAddress(saddr); + + return tag; } diff --git a/migration/socket.h b/migration/socket.h index 6b91e9db38..bc8a59aee4 100644 --- a/migration/socket.h +++ b/migration/socket.h @@ -16,12 +16,12 @@ #ifndef QEMU_MIGRATION_SOCKET_H #define QEMU_MIGRATION_SOCKET_H -void tcp_start_incoming_migration(const char *host_port, Error **errp); +guint tcp_start_incoming_migration(const char *host_port, Error **errp); void tcp_start_outgoing_migration(MigrationState *s, const char *host_port, Error **errp); -void unix_start_incoming_migration(const char *path, Error **errp); +guint unix_start_incoming_migration(const char *path, Error **errp); void unix_start_outgoing_migration(MigrationState *s, const char *path, Error **errp); -- 2.13.5