From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52355) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJIra-0004jA-Cs for qemu-devel@nongnu.org; Wed, 13 Jan 2016 05:41:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aJIrX-000277-Mb for qemu-devel@nongnu.org; Wed, 13 Jan 2016 05:41:14 -0500 Received: from mx1.redhat.com ([209.132.183.28]:36324) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aJIrX-00026T-EY for qemu-devel@nongnu.org; Wed, 13 Jan 2016 05:41:11 -0500 From: Amit Shah Date: Wed, 13 Jan 2016 16:10:43 +0530 Message-Id: <93d7af6ff0243f8a9843a3e8a9362d64c9ab4d4b.1452681449.git.amit.shah@redhat.com> In-Reply-To: References: In-Reply-To: References: Subject: [Qemu-devel] [PULL 2/6] migration: Add state records for migration incoming List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu list Cc: Amit Shah , Peter Maydell , zhanghailiang , "Dr. David Alan Gilbert" , Juan Quintela From: zhanghailiang For migration destination, we also need to know its state, we will use it in COLO. Here we add a new member 'state' for MigrationIncomingState, and also use migrate_set_state() to modify its value. Signed-off-by: zhanghailiang dgilbert: Fixed early free of MigraitonIncomingState Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Juan Quintela Reviewed-by: Amit Shah Message-Id: <1450266458-3178-3-git-send-email-dgilbert@redhat.com> Signed-off-by: Amit Shah --- include/migration/migration.h | 1 + migration/migration.c | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index a64ca7c..0fc1ffa 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -105,6 +105,7 @@ struct MigrationIncomingState { QemuMutex rp_mutex; /* We send replies from multiple threads */ void *postcopy_tmp_page; + int state; /* See savevm.c */ LoadStateEntry_Head loadvm_handlers; }; diff --git a/migration/migration.c b/migration/migration.c index 5db6227..bc611e4 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -111,6 +111,7 @@ MigrationIncomingState *migration_incoming_state_new(QEMUFile* f) { mis_current = g_new0(MigrationIncomingState, 1); mis_current->from_src_file = f; + mis_current->state = MIGRATION_STATUS_NONE; QLIST_INIT(&mis_current->loadvm_handlers); qemu_mutex_init(&mis_current->rp_mutex); qemu_event_init(&mis_current->main_thread_load_event, false); @@ -331,8 +332,8 @@ static void process_incoming_migration_co(void *opaque) mis = migration_incoming_state_new(f); postcopy_state_set(POSTCOPY_INCOMING_NONE); - migrate_generate_event(MIGRATION_STATUS_ACTIVE); - + migrate_set_state(&mis->state, MIGRATION_STATUS_NONE, + MIGRATION_STATUS_ACTIVE); ret = qemu_loadvm_state(f); ps = postcopy_state_get(); @@ -358,10 +359,10 @@ static void process_incoming_migration_co(void *opaque) qemu_fclose(f); free_xbzrle_decoded_buf(); - migration_incoming_state_destroy(); if (ret < 0) { - migrate_generate_event(MIGRATION_STATUS_FAILED); + migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, + MIGRATION_STATUS_FAILED); error_report("load of migration failed: %s", strerror(-ret)); migrate_decompress_threads_join(); exit(EXIT_FAILURE); @@ -370,7 +371,8 @@ static void process_incoming_migration_co(void *opaque) /* Make sure all file formats flush their mutable metadata */ bdrv_invalidate_cache_all(&local_err); if (local_err) { - migrate_generate_event(MIGRATION_STATUS_FAILED); + migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, + MIGRATION_STATUS_FAILED); error_report_err(local_err); migrate_decompress_threads_join(); exit(EXIT_FAILURE); @@ -402,7 +404,9 @@ static void process_incoming_migration_co(void *opaque) * observer sees this event they might start to prod at the VM assuming * it's ready to use. */ - migrate_generate_event(MIGRATION_STATUS_COMPLETED); + migrate_set_state(&mis->state, MIGRATION_STATUS_ACTIVE, + MIGRATION_STATUS_COMPLETED); + migration_incoming_state_destroy(); } void process_incoming_migration(QEMUFile *f) -- 2.5.0