From patchwork Tue Mar 26 09:58:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Lieven X-Patchwork-Id: 231140 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D73152C0084 for ; Tue, 26 Mar 2013 21:03:57 +1100 (EST) Received: from localhost ([::1]:35309 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKQjT-0000CI-VU for incoming@patchwork.ozlabs.org; Tue, 26 Mar 2013 06:03:55 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55422) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKQgy-0005Dr-M7 for qemu-devel@nongnu.org; Tue, 26 Mar 2013 06:01:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UKQgr-0006QL-Qz for qemu-devel@nongnu.org; Tue, 26 Mar 2013 06:01:20 -0400 Received: from [2a02:248:0:30:223:aeff:fefe:7f1c] (port=49000 helo=dns.kamp-intra.net) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UKQgr-0006Pe-KX for qemu-devel@nongnu.org; Tue, 26 Mar 2013 06:01:13 -0400 Received: from lieven-pc.kamp-intra.net (lieven-pc.kamp-intra.net [172.21.12.60]) by dns.kamp-intra.net (Postfix) with ESMTP id E67E0206B6; Tue, 26 Mar 2013 11:01:10 +0100 (CET) Received: by lieven-pc.kamp-intra.net (Postfix, from userid 1000) id D83705FBAA; Tue, 26 Mar 2013 11:01:12 +0100 (CET) From: Peter Lieven To: qemu-devel@nongnu.org Date: Tue, 26 Mar 2013 10:58:38 +0100 Message-Id: <1364291919-19563-10-git-send-email-pl@kamp.de> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1364291919-19563-1-git-send-email-pl@kamp.de> References: <1364291919-19563-1-git-send-email-pl@kamp.de> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 2a02:248:0:30:223:aeff:fefe:7f1c Cc: quintela@redhat.com, Stefan Hajnoczi , Peter Lieven , Orit Wasserman , Paolo Bonzini Subject: [Qemu-devel] [PATCHv5 09/10] migration: do not search dirty pages in bulk stage X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org avoid searching for dirty pages just increment the page offset. all pages are dirty anyway. Signed-off-by: Peter Lieven Reviewed-by: Eric Blake Reviewed-by: Orit Wasserman --- arch_init.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arch_init.c b/arch_init.c index 3a0d02e..a522735 100644 --- a/arch_init.c +++ b/arch_init.c @@ -340,7 +340,13 @@ ram_addr_t migration_bitmap_find_and_reset_dirty(MemoryRegion *mr, unsigned long nr = base + (start >> TARGET_PAGE_BITS); unsigned long size = base + (int128_get64(mr->size) >> TARGET_PAGE_BITS); - unsigned long next = find_next_bit(migration_bitmap, size, nr); + unsigned long next; + + if (ram_bulk_stage && nr > base) { + next = nr + 1; + } else { + next = find_next_bit(migration_bitmap, size, nr); + } if (next < size) { clear_bit(next, migration_bitmap);