summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Li <liang.z.li@intel.com>2015-11-12 10:56:44 +0800
committerLiang Li <liang.z.li@intel.com>2015-11-12 10:56:44 +0800
commit1750c932f8686f1ab06e19cf81522393d269bbec (patch)
treef43a22816ea012a9314bce9452ed16c179f109c0
parentddbae00816a243e16209f291af562d9f1bb3d4c2 (diff)
Bug fix.
qemu_savevm_state_cancel becomes mandatory operation, it should be done unconditionally. back port from upstream. Change-Id: If1a2a6d70f1b2632b72a7f7290a67f442096fdcf Signed-off-by: Denis V. Lunev <den@openvz.org> Reviewed-by: Liang Li <liang.z.li@intel.com> Reviewed-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Liang Li <liang.z.li@intel.com>
-rw-r--r--qemu/migration/savevm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/qemu/migration/savevm.c b/qemu/migration/savevm.c
index 60712153f..a42874b10 100644
--- a/qemu/migration/savevm.c
+++ b/qemu/migration/savevm.c
@@ -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;