From patchwork Wed Jan 26 14:12:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Tosatti X-Patchwork-Id: 80509 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D8F99B70F9 for ; Thu, 27 Jan 2011 01:19:19 +1100 (EST) Received: from localhost ([127.0.0.1]:59638 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pi6DM-0007f6-IL for incoming@patchwork.ozlabs.org; Wed, 26 Jan 2011 09:19:16 -0500 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 ) 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 ) 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 ; Wed, 26 Jan 2011 09:16:15 -0500 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id p0QEGFuS023884; Wed, 26 Jan 2011 09:16:15 -0500 Received: from amt.cnet (vpn1-4-107.ams2.redhat.com [10.36.4.107]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id p0QEGD1W024795; Wed, 26 Jan 2011 09:16:14 -0500 Received: from amt.cnet (localhost.localdomain [127.0.0.1]) by amt.cnet (Postfix) with ESMTP id 1C686652161; Wed, 26 Jan 2011 12:15:29 -0200 (BRST) Received: (from marcelo@localhost) by amt.cnet (8.14.4/8.14.4/Submit) id p0QEFRBE027449; Wed, 26 Jan 2011 12:15:27 -0200 Message-Id: <20110126141348.178942206@redhat.com> User-Agent: quilt/0.47-1 Date: Wed, 26 Jan 2011 12:12:31 -0200 From: Marcelo Tosatti To: qemu-devel@nongnu.org References: <20110126141230.637895847@redhat.com> Content-Disposition: inline; filename=00-fix-dirty-log-disable X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Kevin Wolf , Marcelo Tosatti Subject: [Qemu-devel] [patch 1/5] block-migration: actually disable dirty tracking on cleanup X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Call to set_dirty_tracking() is misplaced. Signed-off-by: Marcelo Tosatti 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"); }