From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48293) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFHYI-00014D-Uc for qemu-devel@nongnu.org; Wed, 15 Jul 2015 03:56:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZFHYI-0002g6-4z for qemu-devel@nongnu.org; Wed, 15 Jul 2015 03:56:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33776) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZFHYH-0002fy-W3 for qemu-devel@nongnu.org; Wed, 15 Jul 2015 03:56:26 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (Postfix) with ESMTPS id 7DBCB3CBA48 for ; Wed, 15 Jul 2015 07:56:25 +0000 (UTC) From: Juan Quintela Date: Wed, 15 Jul 2015 09:56:22 +0200 Message-Id: <1436946982-24643-1-git-send-email-quintela@redhat.com> Subject: [Qemu-devel] [PATCH] migration: We also want to store the global state for savevm List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: amit.shah@redhat.com, dgilbert@redhat.com Previous commit only stored a valid state for migration. It stored the empty string for savevm. Now, we are also storing the current state for savevm. Signed-off-by: Juan Quintela --- include/migration/migration.h | 1 + migration/migration.c | 2 +- migration/savevm.c | 6 ++++++ 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/include/migration/migration.h b/include/migration/migration.h index b2711ef..a2f8ed0 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -202,4 +202,5 @@ void savevm_skip_section_footers(void); void register_global_state(void); void global_state_set_optional(void); void savevm_skip_configuration(void); +int global_state_store(void); #endif diff --git a/migration/migration.c b/migration/migration.c index ba82ff6..86ca099 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -110,7 +110,7 @@ typedef struct { static GlobalState global_state; -static int global_state_store(void) +int global_state_store(void) { if (!runstate_store((char *)global_state.runstate, sizeof(global_state.runstate))) { diff --git a/migration/savevm.c b/migration/savevm.c index 86735fc..81dbe58 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1315,6 +1315,12 @@ void hmp_savevm(Monitor *mon, const QDict *qdict) } saved_vm_running = runstate_is_running(); + + ret = global_state_store(); + if (ret) { + monitor_printf(mon, "Error saving global state\n"); + return; + } vm_stop(RUN_STATE_SAVE_VM); memset(sn, 0, sizeof(*sn)); -- 2.4.3