[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 31/33] migration: store listen task tag
From: |
Peter Xu |
Subject: |
[Qemu-devel] [RFC v2 31/33] migration: store listen task tag |
Date: |
Wed, 30 Aug 2017 16:32:28 +0800 |
Store the task tag for migration types: tcp/unix/fd/exec in current
MigrationIncomingState struct.
For defered migration, no need to store task tag since there is no task
running in the main loop at all. For RDMA, let's mark it as todo.
Signed-off-by: Peter Xu <address@hidden>
---
migration/migration.c | 22 ++++++++++++++++++----
migration/migration.h | 2 ++
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index c9b7085..daf356b 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -171,6 +171,7 @@ void migration_incoming_state_destroy(void)
mis->from_src_file = NULL;
}
+ mis->listen_task_tag = 0;
qemu_event_destroy(&mis->main_thread_load_event);
}
@@ -265,25 +266,31 @@ int migrate_send_rp_req_pages(MigrationIncomingState
*mis, const char *rbname,
void qemu_start_incoming_migration(const char *uri, Error **errp)
{
const char *p;
+ guint task_tag = 0;
+ MigrationIncomingState *mis = migration_incoming_get_current();
qapi_event_send_migration(MIGRATION_STATUS_SETUP, &error_abort);
if (!strcmp(uri, "defer")) {
deferred_incoming_migration(errp);
} else if (strstart(uri, "tcp:", &p)) {
- tcp_start_incoming_migration(p, errp);
+ task_tag = tcp_start_incoming_migration(p, errp);
#ifdef CONFIG_RDMA
} else if (strstart(uri, "rdma:", &p)) {
+ /* TODO: store task tag for RDMA migrations */
rdma_start_incoming_migration(p, errp);
#endif
} else if (strstart(uri, "exec:", &p)) {
- exec_start_incoming_migration(p, errp);
+ task_tag = exec_start_incoming_migration(p, errp);
} else if (strstart(uri, "unix:", &p)) {
- unix_start_incoming_migration(p, errp);
+ task_tag = unix_start_incoming_migration(p, errp);
} else if (strstart(uri, "fd:", &p)) {
- fd_start_incoming_migration(p, errp);
+ task_tag = fd_start_incoming_migration(p, errp);
} else {
error_setg(errp, "unknown migration protocol: %s", uri);
+ return;
}
+
+ mis->listen_task_tag = task_tag;
}
static void process_incoming_migration_bh(void *opaque)
@@ -422,6 +429,13 @@ void migration_fd_process_incoming(QEMUFile *f)
co = qemu_coroutine_create(process_incoming_migration_co, f);
qemu_coroutine_enter(co);
}
+
+ /*
+ * When reach here, we should not need the listening port any
+ * more. We'll detach the listening task soon, let's reset the
+ * listen task tag.
+ */
+ mis->listen_task_tag = 0;
}
/*
diff --git a/migration/migration.h b/migration/migration.h
index d041369..1f4faef 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -26,6 +26,8 @@
/* State for the incoming migration */
struct MigrationIncomingState {
QEMUFile *from_src_file;
+ /* Task tag for incoming listen port. Valid when >0. */
+ guint listen_task_tag;
/*
* Free at the start of the main state load, set as the main thread
finishes
--
2.7.4
- [Qemu-devel] [RFC v2 21/33] migration: new cmd MIG_CMD_POSTCOPY_RESUME, (continued)
- [Qemu-devel] [RFC v2 21/33] migration: new cmd MIG_CMD_POSTCOPY_RESUME, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 22/33] migration: new message MIG_RP_MSG_RESUME_ACK, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 23/33] migration: introduce SaveVMHandlers.resume_prepare, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 24/33] migration: synchronize dirty bitmap for resume, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 25/33] migration: setup ramstate for resume, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 26/33] migration: final handshake for the resume, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 27/33] migration: free SocketAddress where allocated, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 28/33] migration: return incoming task tag for sockets, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 29/33] migration: return incoming task tag for exec, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 30/33] migration: return incoming task tag for fd, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 31/33] migration: store listen task tag,
Peter Xu <=
- [Qemu-devel] [RFC v2 32/33] migration: allow migrate_incoming for paused VM, Peter Xu, 2017/08/30
- [Qemu-devel] [RFC v2 33/33] migration: init dst in migration_object_init too, Peter Xu, 2017/08/30