[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 31/40] migration: init dst in migration_object_init t
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PULL 31/40] migration: init dst in migration_object_init too |
Date: |
Wed, 16 May 2018 01:40:08 +0200 |
From: Peter Xu <address@hidden>
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>
Message-Id: <address@hidden>
Signed-off-by: Juan Quintela <address@hidden>
---
migration/migration.c | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/migration/migration.c b/migration/migration.c
index 240960d951..c1832b0263 100644
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -106,6 +106,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);
static int migration_maybe_pause(MigrationState *s,
@@ -121,6 +122,22 @@ 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;
+ current_incoming->postcopy_remote_fds =
+ g_array_new(FALSE, TRUE, sizeof(struct PostCopyFD));
+ 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);
+
+ init_dirty_bitmap_incoming_migration();
+
if (!migration_object_check(current_migration, &err)) {
error_report_err(err);
exit(1);
@@ -151,24 +168,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));
- mis_current.postcopy_remote_fds = g_array_new(FALSE, TRUE,
- sizeof(struct PostCopyFD));
- 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);
-
- init_dirty_bitmap_incoming_migration();
-
- once = true;
- }
- return &mis_current;
+ assert(current_incoming);
+ return current_incoming;
}
void migration_incoming_state_destroy(void)
--
2.17.0
- [Qemu-devel] [PULL 15/40] migration: implement "postcopy-pause" src logic, (continued)
- [Qemu-devel] [PULL 15/40] migration: implement "postcopy-pause" src logic, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 20/40] migration: rebuild channel on source, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 22/40] migration: wakeup dst ram-load-thread for recover, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 23/40] migration: new cmd MIG_CMD_RECV_BITMAP, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 21/40] migration: new state "postcopy-recover", Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 25/40] migration: new cmd MIG_CMD_POSTCOPY_RESUME, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 24/40] migration: new message MIG_RP_MSG_RECV_BITMAP, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 26/40] migration: new message MIG_RP_MSG_RESUME_ACK, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 27/40] migration: introduce SaveVMHandlers.resume_prepare, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 30/40] migration: final handshake for the resume, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 31/40] migration: init dst in migration_object_init too,
Juan Quintela <=
- [Qemu-devel] [PULL 28/40] migration: synchronize dirty bitmap for resume, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 29/40] migration: setup ramstate for resume, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 32/40] qmp/migration: new command migrate-recover, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 33/40] hmp/migration: add migrate_recover command, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 34/40] migration: introduce lock for to_dst_file, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 35/40] migration/qmp: add command migrate-pause, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 36/40] migration/hmp: add migrate_pause command, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 38/40] migration: update index field when delete or qsort RDMALocalBlock, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 39/40] migration: Textual fixups for blocktime, Juan Quintela, 2018/05/15
- [Qemu-devel] [PULL 37/40] migration: update docs, Juan Quintela, 2018/05/15