From patchwork Thu Nov 26 18:44:05 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Riteau X-Patchwork-Id: 39583 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 685A51007D1 for ; Fri, 27 Nov 2009 05:52:51 +1100 (EST) Received: from localhost ([127.0.0.1]:54074 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDjST-0004tq-Cd for incoming@patchwork.ozlabs.org; Thu, 26 Nov 2009 13:52:49 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NDjLZ-0004nt-LM for qemu-devel@nongnu.org; Thu, 26 Nov 2009 13:45:41 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NDjLS-0004eQ-3d for qemu-devel@nongnu.org; Thu, 26 Nov 2009 13:45:38 -0500 Received: from [199.232.76.173] (port=41010 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NDjLR-0004eI-Q3 for qemu-devel@nongnu.org; Thu, 26 Nov 2009 13:45:33 -0500 Received: from mail1-relais-roc.national.inria.fr ([192.134.164.82]:53686) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.60) (envelope-from ) id 1NDjLR-0006i5-Dq for qemu-devel@nongnu.org; Thu, 26 Nov 2009 13:45:33 -0500 X-IronPort-AV: E=Sophos;i="4.47,295,1257116400"; d="scan'208";a="40878416" Received: from elfe.irisa.fr (HELO localhost.localdomain) ([131.254.60.12]) by mail1-relais-roc.national.inria.fr with ESMTP/TLS/DHE-RSA-AES256-SHA; 26 Nov 2009 19:45:29 +0100 From: Pierre Riteau To: Liran Schour , qemu-devel@nongnu.org Date: Thu, 26 Nov 2009 19:44:05 +0100 Message-Id: <1259261046-32650-6-git-send-email-Pierre.Riteau@irisa.fr> X-Mailer: git-send-email 1.6.5 In-Reply-To: <1259261046-32650-5-git-send-email-Pierre.Riteau@irisa.fr> References: <1259261046-32650-1-git-send-email-Pierre.Riteau@irisa.fr> <1259261046-32650-2-git-send-email-Pierre.Riteau@irisa.fr> <1259261046-32650-3-git-send-email-Pierre.Riteau@irisa.fr> <1259261046-32650-4-git-send-email-Pierre.Riteau@irisa.fr> <1259261046-32650-5-git-send-email-Pierre.Riteau@irisa.fr> X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Pierre Riteau Subject: [Qemu-devel] [PATCH 5/6] Remove duplicated code 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 Signed-off-by: Pierre Riteau --- block-migration.c | 7 ++----- 1 files changed, 2 insertions(+), 5 deletions(-) diff --git a/block-migration.c b/block-migration.c index aff4c20..e09db78 100644 --- a/block-migration.c +++ b/block-migration.c @@ -313,7 +313,8 @@ static void blk_mig_save_dirty_blocks(QEMUFile *f) int len; QSIMPLEQ_FOREACH(bmds, &block_mig_state->bmds_list, entries) { - for (sector = 0; sector < bmds->cur_sector;) { + for (sector = 0; sector < bmds->cur_sector; + sector += block_mig_state->sectors_per_block) { if (bdrv_get_dirty(bmds->bs, sector)) { @@ -337,10 +338,6 @@ static void blk_mig_save_dirty_blocks(QEMUFile *f) bdrv_reset_dirty(bmds->bs, sector, block_mig_state->sectors_per_block); - sector += block_mig_state->sectors_per_block; - } else { - /* sector is clean */ - sector += block_mig_state->sectors_per_block; } } }