[PULL,03/13] migration: fix inability to save VM after snapshot

Commit Message

Amit Shah June 17, 2016, 1:06 p.m. UTC

From: "Denis V. Lunev" <[e-mail]>

The following sequence of operations fails:
    virsh start vm
    virsh snapshot-create vm
    virshh save vm --file file
with the following error
    error: Failed to save domain vm to file
    error: internal error: unable to execute QEMU command 'migrate':
    There's a migration process in progress

The problem is that qemu_savevm_state() calls migrate_init() which sets
migration state to MIGRATION_STATUS_SETUP and never cleaned it up.
This patch do the job.

Signed-off-by: Denis V. Lunev <[e-mail]>
Reviewed-by: Dr. David Alan Gilbert <[e-mail]>
CC: Juan Quintela <[e-mail]>
CC: Amit Shah <[e-mail]>
Message-Id: <[e-mail]>
Signed-off-by: Amit Shah <[e-mail]>
---
 migration/savevm.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

Patch

diff --git a/migration/savevm.c b/migration/savevm.c
index 6da084c..38b85ee 100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -1150,10 +1150,12 @@  static int qemu_savevm_state(QEMUFile *f, Error **errp)
         .shared = 0
     };
     MigrationState *ms = migrate_init(&params);
+    MigrationStatus status;
     ms->to_dst_file = f;
 
     if (migration_is_blocked(errp)) {
-        return -EINVAL;
+        ret = -EINVAL;
+        goto done;
     }
 
     qemu_mutex_unlock_iothread();
@@ -1176,6 +1178,14 @@  static int qemu_savevm_state(QEMUFile *f, Error **errp)
     if (ret != 0) {
         error_setg_errno(errp, -ret, "Error while writing VM state");
     }
+
+done:
+    if (ret != 0) {
+        status = MIGRATION_STATUS_FAILED;
+    } else {
+        status = MIGRATION_STATUS_COMPLETED;
+    }
+    migrate_set_state(&ms->state, MIGRATION_STATUS_SETUP, status);
     return ret;
 }