Re: [Qemu-devel] [PATCH 1/1] migration: qemu_savevm_state_cleanup becomes mandatory operation

[Denis V. Lunev]

On 11/09/2015 08:10 AM, Li, Liang Z wrote:

since commit
     commit 94f5a43704129ca4995aa3385303c5ae225bde42
     Author: Liang Li <liang.z...@intel.com>
     Date:   Mon Nov 2 15:37:00 2015 +0800

     migration: defer migration_end & blk_mig_cleanup

when actual .cleanup callbacks calling was removed from complete operations.

Signed-off-by: Denis V. Lunev <d...@openvz.org>
CC: Paolo Bonzini <pbonz...@redhat.com>
CC: Juan Quintela <quint...@redhat.com>
CC: Amit Shah <amit.s...@redhat.com>
---
  migration/savevm.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/migration/savevm.c b/migration/savevm.c index e05158d..9f2230f
100644
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -942,8 +942,8 @@ static int qemu_savevm_state(QEMUFile *f, Error
**errp)
          qemu_savevm_state_complete(f);
          ret = qemu_file_get_error(f);
      }
+    qemu_savevm_state_cleanup();
      if (ret != 0) {
-        qemu_savevm_state_cleanup();
          error_setg_errno(errp, -ret, "Error while writing VM state");
      }
      return ret;
--
2.5.0

Yes, you are right. Thanks a lot.

BTW, can this patch fix the regression you reported?

Reviewed-by: Liang Li <liang.z...@intel.com>

yes