From nobody Mon Nov 10 19:09:08 2025 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=1558322147; cv=none; d=zoho.com; s=zohoarc; b=XGvOCBfTf2ym4E1Mp/k+Lffq0aZGJ1S+TOftyCEOJFHV+jf5/cl1HtlsdcW4/+DD49DFV3dUgQ9StKZh2OMMToUlb1m5C0CKjCbpZ3HdfwIsTvh2N1osgA0uObNICtXJjb8azJjRWsTg+SU61TTBooDwyNr7nHjIoblDpRKM/do= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1558322147; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=SwIM2ARxQZbtIlXaQ1aabUcCHmNfkWVZy7qSEomLiAk=; b=lhxIrjMn+A0Voa4G1qsSbxHnZZSlE7lUEio3M5Ru+DzIISOl0TaeCsQk8bOm1OEqEOZ+wL880gxfQJx92QWWNZg637iPmsCOEGA8o+YVkfGw4echdXozx5gENvMiBmgtcfc455ihB4vz65Z4z55B2vyUYLUIuC+SMrv9PdH6i+E= 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 15583221473101003.3141665939148; Sun, 19 May 2019 20:15:47 -0700 (PDT) Received: from localhost ([127.0.0.1]:57077 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSYm4-0007VD-60 for importer@patchew.org; Sun, 19 May 2019 23:15:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49171) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hSYfm-00022I-1G for qemu-devel@nongnu.org; Sun, 19 May 2019 23:09:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hSYfl-0001bU-1Q for qemu-devel@nongnu.org; Sun, 19 May 2019 23:09:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44128) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hSYfk-0001bC-Qf for qemu-devel@nongnu.org; Sun, 19 May 2019 23:09:08 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2FED97EBAE for ; Mon, 20 May 2019 03:09:08 +0000 (UTC) Received: from xz-x1.nay.redhat.com (dhcp-15-205.nay.redhat.com [10.66.15.205]) by smtp.corp.redhat.com (Postfix) with ESMTP id 123A71001E66; Mon, 20 May 2019 03:09:05 +0000 (UTC) From: Peter Xu To: qemu-devel@nongnu.org Date: Mon, 20 May 2019 11:08:31 +0800 Message-Id: <20190520030839.6795-8-peterx@redhat.com> In-Reply-To: <20190520030839.6795-1-peterx@redhat.com> References: <20190520030839.6795-1-peterx@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 20 May 2019 03:09:08 +0000 (UTC) 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] [PATCH v2 07/15] memory: Pass mr into snapshot_and_clear_dirty X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Paolo Bonzini , "Dr . David Alan Gilbert" , peterx@redhat.com, Juan Quintela Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- 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 4e734770c2..2615b4cfed 100644 --- a/exec.c +++ b/exec.c @@ -1387,9 +1387,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 addr, hwaddr length, unsigned client) { DirtyMemoryBlocks *blocks; + ram_addr_t start =3D memory_region_get_ram_addr(mr) + addr; 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 86bc8e1a4a..69cc528c98 100644 --- a/include/exec/ram_addr.h +++ b/include/exec/ram_addr.h @@ -403,7 +403,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, ram_addr_t start, 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 cff0ea8f40..84bba7b65c 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.17.1