[Qemu-devel] [STABLE 0.14][PATCH 10/14] block-migration: actually disable dirty tracking on cleanup

[Kevin Wolf]

From: Marcelo Tosatti <address@hidden>

Call to set_dirty_tracking() is misplaced.

Signed-off-by: Marcelo Tosatti <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
(cherry picked from commit 8f794c557c4b51c7a957d47ef6a2230114bb9e79)
---
 block-migration.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/block-migration.c b/block-migration.c
index c9d3e81..483ca7b 100644
--- a/block-migration.c
+++ b/block-migration.c
@@ -533,6 +533,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);
         qemu_free(bmds->aio_bitmap);
@@ -545,8 +547,6 @@ static void blk_mig_cleanup(Monitor *mon)
         qemu_free(blk);
     }
 
-    set_dirty_tracking(0);
-
     monitor_printf(mon, "\n");
 }
 
-- 
1.7.2.3