From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=36977 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PmQSs-0008Jy-Ar for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:45:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PmQSo-0001ZF-2b for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:45:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:41241) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PmQSn-0001Yi-Rt for qemu-devel@nongnu.org; Mon, 07 Feb 2011 07:45:06 -0500 From: Kevin Wolf Date: Mon, 7 Feb 2011 13:46:32 +0100 Message-Id: <1297082796-1369-11-git-send-email-kwolf@redhat.com> In-Reply-To: <1297082796-1369-1-git-send-email-kwolf@redhat.com> References: <1297082796-1369-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [STABLE 0.14][PATCH 10/14] block-migration: actually disable dirty tracking on cleanup List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org 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) --- 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