diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-08-03 17:33:35 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-08-03 17:33:35 +0100 |
| commit | e95edefbd0559e1d0aa09549641b5d9af1f96fac (patch) | |
| tree | 88dcd36e5ae08283a170ee8bf9394932c94a5871 /migration | |
| parent | f60c87154ac722c528fd5582f7137914a93c5eec (diff) | |
| parent | 8c6dc68f4cff9eef870497a19a5373dde9dbdcc2 (diff) | |
| download | qemu-e95edefbd0559e1d0aa09549641b5d9af1f96fac.zip qemu-e95edefbd0559e1d0aa09549641b5d9af1f96fac.tar.gz qemu-e95edefbd0559e1d0aa09549641b5d9af1f96fac.tar.bz2 | |
Merge remote-tracking branch 'remotes/sstabellini/tags/xen-migration-2.4-tag' into staging
xen-migration-2.4
# gpg: Signature made Mon 03 Aug 2015 17:18:36 BST using RSA key ID 70E1AE90
# gpg: Good signature from "Stefano Stabellini <stefano.stabellini@eu.citrix.com>"
* remotes/sstabellini/tags/xen-migration-2.4-tag:
migration: Fix regression for xenfv and pc,accel=xen machine.
migration: Fix global state with Xen.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'migration')
| -rw-r--r-- | migration/migration.c | 7 | ||||
| -rw-r--r-- | migration/savevm.c | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/migration/migration.c b/migration/migration.c index fd4f99b..662e77e 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 81dbe58..6071215 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) { |