summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2009-07-09 13:25:47 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2009-07-09 16:58:08 -0500
commiteeb34af986c28b8da4001d947d66e2efaaad0e66 (patch)
tree5f1ab126f50b4074e3eb4c97820c0dd3800d2e56 /migration.c
parentAllow setting qemu process name v2 (diff)
downloadqemu-kvm-eeb34af986c28b8da4001d947d66e2efaaad0e66.tar.gz
qemu-kvm-eeb34af986c28b8da4001d947d66e2efaaad0e66.tar.bz2
qemu-kvm-eeb34af986c28b8da4001d947d66e2efaaad0e66.zip
Make sure to only vm_start() a failed migration if we were running to begin
with. Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'migration.c')
-rw-r--r--migration.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/migration.c b/migration.c
index 190b37e55..e6c8b16a1 100644
--- a/migration.c
+++ b/migration.c
@@ -261,12 +261,16 @@ void migrate_fd_put_ready(void *opaque)
dprintf("iterate\n");
if (qemu_savevm_state_iterate(s->file) == 1) {
int state;
+ int old_vm_running = vm_running;
+
dprintf("done iterating\n");
vm_stop(0);
bdrv_flush_all();
if ((qemu_savevm_state_complete(s->file)) < 0) {
- vm_start();
+ if (old_vm_running) {
+ vm_start();
+ }
state = MIG_STATE_ERROR;
} else {
state = MIG_STATE_COMPLETED;