[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 24/32] migration: return incoming task tag for so
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v4 24/32] migration: return incoming task tag for sockets |
Date: |
Wed, 8 Nov 2017 14:01:22 +0800 |
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 <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
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.6
- [Qemu-devel] [PATCH v4 20/32] migration: synchronize dirty bitmap for resume, (continued)
- [Qemu-devel] [PATCH v4 20/32] migration: synchronize dirty bitmap for resume, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 21/32] migration: setup ramstate for resume, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 23/32] migration: free SocketAddress where allocated, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 22/32] migration: final handshake for the resume, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 26/32] migration: return incoming task tag for fd, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 27/32] migration: store listen task tag, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 29/32] migration: init dst in migration_object_init too, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 30/32] migration: delay the postcopy-active state switch, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 32/32] migration, hmp: new command "migrate_pause", Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 31/32] migration, qmp: new command "migrate-pause", Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 24/32] migration: return incoming task tag for sockets,
Peter Xu <=
- [Qemu-devel] [PATCH v4 25/32] migration: return incoming task tag for exec, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 14/32] migration: wakeup dst ram-load-thread for recover, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 05/32] migration: implement "postcopy-pause" src logic, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 07/32] migration: allow src return path to pause, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 12/32] migration: rebuild channel on source, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 13/32] migration: new state "postcopy-recover", Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 16/32] migration: new message MIG_RP_MSG_RECV_BITMAP, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 28/32] migration: allow migrate_incoming for paused VM, Peter Xu, 2017/11/08