From a40b820bb374f60728096a04920cfe7cdb1f49af Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: Jeffrey Cody Date: Thu, 22 Aug 2013 20:05:00 +0200 Subject: [PATCH 2/3] block-migration: actually disable dirty tracking on cleanup RH-Author: Jeffrey Cody Message-id: Patchwork-id: 53701 O-Subject: [RHEL6.5 qemu-kvm PATCH 2/2] block-migration: actually disable dirty tracking on cleanup Bugzilla: 994813 RH-Acked-by: Markus Armbruster RH-Acked-by: Michal Novotny RH-Acked-by: Paolo Bonzini From: Marcelo Tosatti Call to set_dirty_tracking() is misplaced. Signed-off-by: Marcelo Tosatti Signed-off-by: Kevin Wolf (cherry picked from commit 8f794c557c4b51c7a957d47ef6a2230114bb9e79) Signed-off-by: Jeff Cody --- block-migration.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Signed-off-by: Michal Novotny --- block-migration.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/block-migration.c b/block-migration.c index f09d210..1d1ed94 100644 --- a/block-migration.c +++ b/block-migration.c @@ -389,6 +389,8 @@ static void blk_mig_cleanup(Monitor *mon) BlkMigDevState *bmds; BlkMigBlock *blk; + set_dirty_tracking(0); + while ((bmds = QSIMPLEQ_FIRST(&block_mig_state.bmds_list)) != NULL) { QSIMPLEQ_REMOVE_HEAD(&block_mig_state.bmds_list, entry); bdrv_set_in_use(bmds->bs, 0); @@ -401,8 +403,6 @@ static void blk_mig_cleanup(Monitor *mon) qemu_free(blk); } - set_dirty_tracking(0); - monitor_printf(mon, "\n"); } -- 1.7.11.7