From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44279) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuP1h-0008TR-8e for qemu-devel@nongnu.org; Thu, 05 Nov 2015 13:12:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZuP1g-0003yq-BP for qemu-devel@nongnu.org; Thu, 05 Nov 2015 13:12:45 -0500 Received: from mx1.redhat.com ([209.132.183.28]:38286) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZuP1g-0003yZ-6b for qemu-devel@nongnu.org; Thu, 05 Nov 2015 13:12:44 -0500 From: "Dr. David Alan Gilbert (git)" Date: Thu, 5 Nov 2015 18:10:57 +0000 Message-Id: <1446747083-18205-31-git-send-email-dgilbert@redhat.com> In-Reply-To: <1446747083-18205-1-git-send-email-dgilbert@redhat.com> References: <1446747083-18205-1-git-send-email-dgilbert@redhat.com> Subject: [Qemu-devel] [PATCH v9 30/56] migration_completion: Take current state List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: aarcange@redhat.com, yamahata@private.email.ne.jp, quintela@redhat.com, liang.z.li@intel.com, luis@cs.umu.se, bharata@linux.vnet.ibm.com, amit.shah@redhat.com, pbonzini@redhat.com, david@gibson.dropbear.id.au From: "Dr. David Alan Gilbert" Soon we'll be in either ACTIVE or POSTCOPY_ACTIVE when we complete migration, and we need to know which we expect to be in to change state safely. Signed-off-by: Dr. David Alan Gilbert --- migration/migration.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/migration/migration.c b/migration/migration.c index f5cb9c5..d6f6f4c 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -1243,10 +1243,12 @@ static int await_return_path_close_on_source(MigrationState *ms) * The caller 'breaks' the loop when this returns. * * @s: Current migration state + * @current_active_state: The migration state we expect to be in * @*old_vm_running: Pointer to old_vm_running flag * @*start_time: Pointer to time to update */ -static void migration_completion(MigrationState *s, bool *old_vm_running, +static void migration_completion(MigrationState *s, int current_active_state, + bool *old_vm_running, int64_t *start_time) { int ret; @@ -1275,11 +1277,11 @@ static void migration_completion(MigrationState *s, bool *old_vm_running, goto fail; } - migrate_set_state(s, MIGRATION_STATUS_ACTIVE, MIGRATION_STATUS_COMPLETED); + migrate_set_state(s, current_active_state, MIGRATION_STATUS_COMPLETED); return; fail: - migrate_set_state(s, MIGRATION_STATUS_ACTIVE, MIGRATION_STATUS_FAILED); + migrate_set_state(s, current_active_state, MIGRATION_STATUS_FAILED); } /* @@ -1321,7 +1323,8 @@ static void *migration_thread(void *opaque) qemu_savevm_state_iterate(s->file); } else { trace_migration_thread_low_pending(pending_size); - migration_completion(s, &old_vm_running, &start_time); + migration_completion(s, MIGRATION_STATUS_ACTIVE, + &old_vm_running, &start_time); break; } } -- 2.5.0