Merge "Bug fix."
authorDon Dugger <donald.d.dugger@intel.com>
Tue, 1 Dec 2015 17:15:14 +0000 (17:15 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 1 Dec 2015 17:15:15 +0000 (17:15 +0000)
qemu/migration/savevm.c

index 6071215..a42874b 100644 (file)
@@ -945,8 +945,8 @@ static int qemu_savevm_state(QEMUFile *f, Error **errp)
         qemu_savevm_state_complete(f);
         ret = qemu_file_get_error(f);
     }
+    qemu_savevm_state_cancel();
     if (ret != 0) {
-        qemu_savevm_state_cancel();
         error_setg_errno(errp, -ret, "Error while writing VM state");
     }
     return ret;