From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from [140.186.70.92] (port=40801 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Pi6AX-0006Rc-EN
	for qemu-devel@nongnu.org; Wed, 26 Jan 2011 09:16:25 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1Pi6AT-0001lg-6e
	for qemu-devel@nongnu.org; Wed, 26 Jan 2011 09:16:21 -0500
Received: from mx1.redhat.com ([209.132.183.28]:32122)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mtosatti@redhat.com>) id 1Pi6AS-0001ka-W3
	for qemu-devel@nongnu.org; Wed, 26 Jan 2011 09:16:17 -0500
Received: from int-mx10.intmail.prod.int.phx2.redhat.com
	(int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p0QEGFhZ010409
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Wed, 26 Jan 2011 09:16:15 -0500
Message-Id: <20110126141348.178942206@redhat.com>
Date: Wed, 26 Jan 2011 12:12:31 -0200
From: Marcelo Tosatti <mtosatti@redhat.com>
References: <20110126141230.637895847@redhat.com>
Content-Disposition: inline; filename=00-fix-dirty-log-disable
Subject: [Qemu-devel] [patch 1/5] block-migration: actually disable dirty
	tracking on cleanup
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Marcelo Tosatti <mtosatti@redhat.com>

Call to set_dirty_tracking() is misplaced.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>

Index: qemu/block-migration.c
===================================================================
--- qemu.orig/block-migration.c
+++ qemu/block-migration.c
@@ -528,6 +528,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);
@@ -540,8 +542,6 @@ static void blk_mig_cleanup(Monitor *mon
         qemu_free(blk);
     }
 
-    set_dirty_tracking(0);
-
     monitor_printf(mon, "\n");
 }