From patchwork Tue Mar 16 10:53:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yoshiaki Tamura X-Patchwork-Id: 47844 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 7FB61B8137 for ; Tue, 16 Mar 2010 22:27:24 +1100 (EST) Received: from localhost ([127.0.0.1]:37092 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NrUrY-0006av-8w for incoming@patchwork.ozlabs.org; Tue, 16 Mar 2010 07:23:04 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NrUX0-0006X3-Gy for qemu-devel@nongnu.org; Tue, 16 Mar 2010 07:01:50 -0400 Received: from [199.232.76.173] (port=48520 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NrUX0-0006Wq-1u for qemu-devel@nongnu.org; Tue, 16 Mar 2010 07:01:50 -0400 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1NrUWw-0006qT-FS for qemu-devel@nongnu.org; Tue, 16 Mar 2010 07:01:47 -0400 Received: from sh.osrg.net ([192.16.179.4]:55300) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NrUWu-0006pv-DD for qemu-devel@nongnu.org; Tue, 16 Mar 2010 07:01:45 -0400 Received: from fs.osrg.net (postfix@fs.osrg.net [10.0.0.12]) by sh.osrg.net (8.14.3/8.14.3/OSRG-NET) with ESMTP id o2GAu22B024598; Tue, 16 Mar 2010 19:56:02 +0900 Received: from localhost (hype-wd0.osrg.net [10.72.1.16]) by fs.osrg.net (Postfix) with ESMTP id 33FE71B8003; Tue, 16 Mar 2010 19:56:01 +0900 (JST) From: Yoshiaki Tamura To: kvm@vger.kernel.org, qemu-devel@nongnu.org Date: Tue, 16 Mar 2010 19:53:58 +0900 Message-Id: <1268736839-27371-6-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Mailer: git-send-email 1.7.0.31.g1df487 In-Reply-To: <1268736839-27371-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> References: <1268736839-27371-1-git-send-email-tamura.yoshiaki@lab.ntt.co.jp> X-Dispatcher: imput version 20070423(IM149) Lines: 50 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-3.0 (sh.osrg.net [192.16.179.4]); Tue, 16 Mar 2010 19:56:02 +0900 (JST) X-Virus-Scanned: clamav-milter 0.95.3 at sh X-Virus-Status: Clean X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: ohmura.kei@lab.ntt.co.jp, avi@redhat.com, Yoshiaki Tamura Subject: [Qemu-devel] [PATCH 5/6] qemu-kvm: Use cpu_physical_memory_set_dirty_range() to update phys_ram_dirty. 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 Modifies kvm_get_dirty_pages_log_range to use cpu_physical_memory_set_dirty_range() to update the row of the bit-based phys_ram_dirty bitmap at once. Signed-off-by: Yoshiaki Tamura Signed-off-by: OHMURA Kei --- qemu-kvm.c | 19 ++++++------------- 1 files changed, 6 insertions(+), 13 deletions(-) diff --git a/qemu-kvm.c b/qemu-kvm.c index e417f21..75fa9b0 100644 --- a/qemu-kvm.c +++ b/qemu-kvm.c @@ -2305,9 +2305,8 @@ static int kvm_get_dirty_pages_log_range(unsigned long start_addr, unsigned long offset, unsigned long mem_size) { - unsigned int i, j; - unsigned long page_number, addr, addr1, c; - ram_addr_t ram_addr; + unsigned int i; + unsigned long page_number, addr, addr1; unsigned int len = ((mem_size / TARGET_PAGE_SIZE) + HOST_LONG_BITS - 1) / HOST_LONG_BITS; @@ -2317,16 +2316,10 @@ static int kvm_get_dirty_pages_log_range(unsigned long start_addr, */ for (i = 0; i < len; i++) { if (bitmap[i] != 0) { - c = leul_to_cpu(bitmap[i]); - do { - j = ffsl(c) - 1; - c &= ~(1ul << j); - page_number = i * HOST_LONG_BITS + j; - addr1 = page_number * TARGET_PAGE_SIZE; - addr = offset + addr1; - ram_addr = cpu_get_physical_page_desc(addr); - cpu_physical_memory_set_dirty(ram_addr); - } while (c != 0); + page_number = i * HOST_LONG_BITS; + addr1 = page_number * TARGET_PAGE_SIZE; + addr = offset + addr1; + cpu_physical_memory_set_dirty_range(addr, leul_to_cpu(bitmap[i])); } } return 0;