From nobody Mon Feb 9 17:59:18 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1562842625; cv=none; d=zoho.com; s=zohoarc; b=kXcdbt4Ie16AyrwHkgIW0x0NwCudJ/FHVZtHhdjdsFUjU2FiLg79N4xIl3nOxaV4MaFO4oQsvkf9qYqJs0RRf2oL0UH9Q0Sbz5WX4xw2btyRwvkUdQ/k//78ILKdNLI5vccqusFYeXf3uApFd4qUXG63Buwyvp4F3BRShKlFyOw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1562842625; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=U0Eo7P66jwrJqvj7xfwDvsPrmo0qZI3sL2oiX9pnlm8=; b=Lq5vev0EBdvsrXOsGX05XKliE6iNqTDH81ddhWbe8tNpGjfFBq97mSeWgg7kV7hcqFQ+f6CxcAcrT1Xy78oWHCC8zs+v1MQBie/lMlsNJr9w/lGVDpnKyyici+GwqjzeYbnkmiPH98j47rVoLLwWNfrKzpKozRrN+i7bzzI/0eI= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1562842625034485.09619605064506; Thu, 11 Jul 2019 03:57:05 -0700 (PDT) Received: from localhost ([::1]:40416 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlWl3-0006Nb-Ky for importer@patchew.org; Thu, 11 Jul 2019 06:57:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47626) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hlWiQ-0001v3-Vj for qemu-devel@nongnu.org; Thu, 11 Jul 2019 06:54:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hlWiP-0006sT-1d for qemu-devel@nongnu.org; Thu, 11 Jul 2019 06:54:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51654) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hlWiN-0006rE-TY for qemu-devel@nongnu.org; Thu, 11 Jul 2019 06:54:16 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C3C0BC04BE32; Thu, 11 Jul 2019 10:44:51 +0000 (UTC) Received: from localhost.localdomain (unknown [10.36.118.16]) by smtp.corp.redhat.com (Postfix) with ESMTP id A84DA60605; Thu, 11 Jul 2019 10:44:49 +0000 (UTC) From: Juan Quintela To: qemu-devel@nongnu.org Date: Thu, 11 Jul 2019 12:44:05 +0200 Message-Id: <20190711104412.31233-13-quintela@redhat.com> In-Reply-To: <20190711104412.31233-1-quintela@redhat.com> References: <20190711104412.31233-1-quintela@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 11 Jul 2019 10:44:51 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 12/19] memory: Pass mr into snapshot_and_clear_dirty X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , kvm@vger.kernel.org, Juan Quintela , "Dr. David Alan Gilbert" , Peter Xu , Paolo Bonzini , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Peter Xu Also we change the 2nd parameter of it to be the relative offset within the memory region. This is to be used in follow up patches. Signed-off-by: Peter Xu Reviewed-by: Juan Quintela Message-Id: <20190603065056.25211-6-peterx@redhat.com> Signed-off-by: Juan Quintela --- exec.c | 3 ++- include/exec/ram_addr.h | 2 +- memory.c | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/exec.c b/exec.c index 50ea9c5aaa..3a00698cc0 100644 --- a/exec.c +++ b/exec.c @@ -1390,9 +1390,10 @@ bool cpu_physical_memory_test_and_clear_dirty(ram_ad= dr_t start, } =20 DirtyBitmapSnapshot *cpu_physical_memory_snapshot_and_clear_dirty - (ram_addr_t start, ram_addr_t length, unsigned client) + (MemoryRegion *mr, hwaddr offset, hwaddr length, unsigned client) { DirtyMemoryBlocks *blocks; + ram_addr_t start =3D memory_region_get_ram_addr(mr) + offset; unsigned long align =3D 1UL << (TARGET_PAGE_BITS + BITS_PER_LEVEL); ram_addr_t first =3D QEMU_ALIGN_DOWN(start, align); ram_addr_t last =3D QEMU_ALIGN_UP(start + length, align); diff --git a/include/exec/ram_addr.h b/include/exec/ram_addr.h index 0a532c3963..1843b6f2d3 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -404,7 +404,7 @@ bool cpu_physical_memory_test_and_clear_dirty(ram_addr_= t start, unsigned client); =20 DirtyBitmapSnapshot *cpu_physical_memory_snapshot_and_clear_dirty - (ram_addr_t start, ram_addr_t length, unsigned client); + (MemoryRegion *mr, hwaddr offset, hwaddr length, unsigned client); =20 bool cpu_physical_memory_snapshot_get_dirty(DirtyBitmapSnapshot *snap, ram_addr_t start, diff --git a/memory.c b/memory.c index 93486a71d7..71fcaf2d00 100644 --- a/memory.c +++ b/memory.c @@ -2071,8 +2071,7 @@ DirtyBitmapSnapshot *memory_region_snapshot_and_clear= _dirty(MemoryRegion *mr, { assert(mr->ram_block); memory_region_sync_dirty_bitmap(mr); - return cpu_physical_memory_snapshot_and_clear_dirty( - memory_region_get_ram_addr(mr) + addr, size, client); + return cpu_physical_memory_snapshot_and_clear_dirty(mr, addr, size, cl= ient); } =20 bool memory_region_snapshot_get_dirty(MemoryRegion *mr, DirtyBitmapSnapsho= t *snap, --=20 2.21.0