[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 27/32] migration: store listen task tag
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v4 27/32] migration: store listen task tag |
Date: |
Wed, 8 Nov 2017 14:01:25 +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.
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
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 189d5d2d42..a4cdedcde8 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -175,6 +175,7 @@ void migration_incoming_state_destroy(void)
mis->from_src_file = NULL;
}
+ mis->listen_task_tag = 0;
qemu_event_reset(&mis->main_thread_load_event);
}
@@ -269,25 +270,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)
@@ -453,6 +460,13 @@ void migration_fd_process_incoming(QEMUFile *f)
migration_incoming_setup(f);
migration_incoming_process();
}
+
+ /*
+ * 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;
}
void migration_ioc_process_incoming(QIOChannel *ioc)
diff --git a/migration/migration.h b/migration/migration.h
index 82dd7d9820..a0af86ab21 100644
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -27,6 +27,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.13.6
- [Qemu-devel] [PATCH v4 11/32] migration: pass MigrationState to migrate_init(), (continued)
- [Qemu-devel] [PATCH v4 11/32] migration: pass MigrationState to migrate_init(), Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 15/32] migration: new cmd MIG_CMD_RECV_BITMAP, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 17/32] migration: new cmd MIG_CMD_POSTCOPY_RESUME, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 18/32] migration: new message MIG_RP_MSG_RESUME_ACK, Peter Xu, 2017/11/08
- [Qemu-devel] [PATCH v4 19/32] migration: introduce SaveVMHandlers.resume_prepare, Peter Xu, 2017/11/08
- [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 <=
- [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, 2017/11/08
- [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