From: Liang Li <liang.z.li@intel.com>
Date: Thu, 12 Nov 2015 02:56:44 +0000 (+0800)
Subject: Bug fix.
X-Git-Tag: WW-2015-52~2^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=kvmfornfv.git;a=commitdiff_plain;h=1750c932f8686f1ab06e19cf81522393d269bbec

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>
---

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;