From c69adea462a97c02001b2dd1edd2a0692d27f5a2 Mon Sep 17 00:00:00 2001 From: Anthony PERARD Date: Mon, 3 Aug 2015 15:29:19 +0100 Subject: [PATCH] migration: Fix global state with Xen. When doing migration via the QMP command xen_save_devices_state, the current runstate is not store into the global state section. Also the current runstate is not the one we want on the receiver side. During migration, the Xen toolstack paused QEMU before save the devices state. Also, the toolstack expect QEMU to autostart when the migration is finished. So this patch store "running" as it's current runstate. Signed-off-by: Anthony PERARD Signed-off-by: Stefano Stabellini --- include/migration/migration.h | 1 + migration/migration.c | 7 +++++++ migration/savevm.c | 1 + 3 files changed, 9 insertions(+) diff --git a/include/migration/migration.h b/include/migration/migration.h index a2f8ed093c..83346210b1 100644 --- a/include/migration/migration.h +++ b/include/migration/migration.h @@ -203,4 +203,5 @@ void register_global_state(void); void global_state_set_optional(void); void savevm_skip_configuration(void); int global_state_store(void); +void global_state_store_running(void); #endif diff --git a/migration/migration.c b/migration/migration.c index fd4f99b84e..662e77e4eb 100644 --- a/migration/migration.c +++ b/migration/migration.c @@ -122,6 +122,13 @@ int global_state_store(void) return 0; } +void global_state_store_running(void) +{ + const char *state = RunState_lookup[RUN_STATE_RUNNING]; + strncpy((char *)global_state.runstate, + state, sizeof(global_state.runstate)); +} + static bool global_state_received(void) { return global_state.received; diff --git a/migration/savevm.c b/migration/savevm.c index 81dbe5879f..60712153fa 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -1394,6 +1394,7 @@ void qmp_xen_save_devices_state(const char *filename, Error **errp) saved_vm_running = runstate_is_running(); vm_stop(RUN_STATE_SAVE_VM); + global_state_store_running(); f = qemu_fopen(filename, "wb"); if (!f) { -- 2.11.4.GIT