[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 29/32] migration: init dst in migration_object_in
From: |
Peter Xu |
Subject: |
[Qemu-devel] [PATCH v3 29/32] migration: init dst in migration_object_init too |
Date: |
Mon, 16 Oct 2017 14:52:13 +0800 |
Though we may not need it, now we init both the src/dst migration
objects in migration_object_init() so that even incoming migration
object would be thread safe (it was not).
Reviewed-by: Dr. David Alan Gilbert <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
---
migration/migration.c | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 387fbefad4..51e771685c 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -104,6 +104,7 @@ enum mig_rp_message_type {
dynamic creation of migration */
static MigrationState *current_migration;
+static MigrationIncomingState *current_incoming;
static bool migration_object_check(MigrationState *ms, Error **errp);
@@ -116,6 +117,18 @@ void migration_object_init(void)
assert(!current_migration);
current_migration = MIGRATION_OBJ(object_new(TYPE_MIGRATION));
+ /*
+ * Init the migrate incoming object as well no matter whether
+ * we'll use it or not.
+ */
+ assert(!current_incoming);
+ current_incoming = g_new0(MigrationIncomingState, 1);
+ current_incoming->state = MIGRATION_STATUS_NONE;
+ qemu_mutex_init(¤t_incoming->rp_mutex);
+ qemu_event_init(¤t_incoming->main_thread_load_event, false);
+ qemu_sem_init(¤t_incoming->postcopy_pause_sem_dst, 0);
+ qemu_sem_init(¤t_incoming->postcopy_pause_sem_fault, 0);
+
if (!migration_object_check(current_migration, &err)) {
error_report_err(err);
exit(1);
@@ -141,19 +154,8 @@ MigrationState *migrate_get_current(void)
MigrationIncomingState *migration_incoming_get_current(void)
{
- static bool once;
- static MigrationIncomingState mis_current;
-
- if (!once) {
- mis_current.state = MIGRATION_STATUS_NONE;
- memset(&mis_current, 0, sizeof(MigrationIncomingState));
- qemu_mutex_init(&mis_current.rp_mutex);
- qemu_event_init(&mis_current.main_thread_load_event, false);
- qemu_sem_init(&mis_current.postcopy_pause_sem_dst, 0);
- qemu_sem_init(&mis_current.postcopy_pause_sem_fault, 0);
- once = true;
- }
- return &mis_current;
+ assert(current_incoming);
+ return current_incoming;
}
void migration_incoming_state_destroy(void)
--
2.13.5
- [Qemu-devel] [PATCH v3 19/32] migration: introduce SaveVMHandlers.resume_prepare, (continued)
- [Qemu-devel] [PATCH v3 19/32] migration: introduce SaveVMHandlers.resume_prepare, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 20/32] migration: synchronize dirty bitmap for resume, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 21/32] migration: setup ramstate for resume, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 22/32] migration: final handshake for the resume, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 23/32] migration: free SocketAddress where allocated, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 24/32] migration: return incoming task tag for sockets, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 25/32] migration: return incoming task tag for exec, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 26/32] migration: return incoming task tag for fd, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 27/32] migration: store listen task tag, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 28/32] migration: allow migrate_incoming for paused VM, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 29/32] migration: init dst in migration_object_init too,
Peter Xu <=
- [Qemu-devel] [PATCH v3 30/32] migration: delay the postcopy-active state switch, Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 31/32] migration, qmp: new command "migrate-pause", Peter Xu, 2017/10/16
- [Qemu-devel] [PATCH v3 32/32] migration, hmp: new command "migrate_pause", Peter Xu, 2017/10/16
- Re: [Qemu-devel] [PATCH v3 00/32] Migration: postcopy failure recovery, no-reply, 2017/10/16
- Re: [Qemu-devel] [PATCH v3 00/32] Migration: postcopy failure recovery, no-reply, 2017/10/16