Make sure to only vm_start() a failed migration if we were running to begin

[qemu.git] / migration.c

diff --git a/migration.c b/migration.c
index 06ea795cf1f235c8aa8c429bc2cc7455a9b5f5f7..61c92fe5ff8137d891aaf3b880b1953bfc6fae98 100644 (file)
--- a/migration.c
+++ b/migration.c
@@ -213,12 +213,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;
@@ -283,5 +287,7 @@ void migrate_fd_wait_for_unfreeze(void *opaque)
 int migrate_fd_close(void *opaque)
 {
     FdMigrationState *s = opaque;
+
+    qemu_set_fd_handler2(s->fd, NULL, NULL, NULL, NULL);
     return s->close(s);
 }