From nobody Tue Nov 4 21:18:45 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.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 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1530792316007434.92217578837347; Thu, 5 Jul 2018 05:05:16 -0700 (PDT) Received: from localhost ([::1]:52036 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb30d-0004PM-8R for importer@patchew.org; Thu, 05 Jul 2018 08:05:15 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50899) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fb2vS-0000jq-KX for qemu-devel@nongnu.org; Thu, 05 Jul 2018 07:59:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fb2vR-0002by-Cj for qemu-devel@nongnu.org; Thu, 05 Jul 2018 07:59:54 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46352 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fb2vR-0002b2-8K for qemu-devel@nongnu.org; Thu, 05 Jul 2018 07:59:53 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id C0E554023132 for ; Thu, 5 Jul 2018 11:59:52 +0000 (UTC) Received: from t460s.redhat.com (ovpn-116-172.ams2.redhat.com [10.36.116.172]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5008C2026D74; Thu, 5 Jul 2018 11:59:51 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 5 Jul 2018 13:59:36 +0200 Message-Id: <20180705115943.29402-5-david@redhat.com> In-Reply-To: <20180705115943.29402-1-david@redhat.com> References: <20180705115943.29402-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 05 Jul 2018 11:59:52 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.6]); Thu, 05 Jul 2018 11:59:52 +0000 (UTC) for IP:'10.11.54.4' DOMAIN:'int-mx04.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'david@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v1 04/11] memory-device: convert get_region_size() to get_memory_region() 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: Eduardo Habkost , "Michael S . Tsirkin" , David Hildenbrand , Markus Armbruster , Stefan Hajnoczi , Igor Mammedov Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" To factor out plugging and unplugging of memory device we need access to the memory region. So let's replace get_region_size() by get_memory_region(). Signed-off-by: David Hildenbrand --- hw/mem/memory-device.c | 10 ++++++---- hw/mem/pc-dimm.c | 19 ++++++++++++++----- include/hw/mem/memory-device.h | 2 +- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index 3ac0d5e505..a69ae343f8 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -56,11 +56,13 @@ static int memory_device_used_region_size(Object *obj, = void *opaque) =20 if (object_dynamic_cast(obj, TYPE_MEMORY_DEVICE)) { const DeviceState *dev =3D DEVICE(obj); - const MemoryDeviceState *md =3D MEMORY_DEVICE(obj); + MemoryDeviceState *md =3D MEMORY_DEVICE(obj); const MemoryDeviceClass *mdc =3D MEMORY_DEVICE_GET_CLASS(obj); =20 if (dev->realized) { - *size +=3D mdc->get_region_size(md, &error_abort); + MemoryRegion *mr =3D mdc->get_memory_region(md, &error_abort); + + *size +=3D memory_region_size(mr); } } =20 @@ -162,12 +164,12 @@ uint64_t memory_device_get_free_addr(MachineState *ms= , const uint64_t *hint, /* find address range that will fit new memory device */ object_child_foreach(OBJECT(ms), memory_device_build_list, &list); for (item =3D list; item; item =3D g_slist_next(item)) { - const MemoryDeviceState *md =3D item->data; + MemoryDeviceState *md =3D item->data; const MemoryDeviceClass *mdc =3D MEMORY_DEVICE_GET_CLASS(OBJECT(md= )); uint64_t md_size, md_addr; =20 md_addr =3D mdc->get_addr(md); - md_size =3D mdc->get_region_size(md, &error_abort); + md_size =3D memory_region_size(mdc->get_memory_region(md, &error_a= bort)); if (*errp) { goto out; } diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 4bf1a0acc9..a208b17c64 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -236,8 +236,8 @@ static uint64_t pc_dimm_md_get_addr(const MemoryDeviceS= tate *md) return dimm->addr; } =20 -static uint64_t pc_dimm_md_get_region_size(const MemoryDeviceState *md, - Error **errp) +static uint64_t pc_dimm_md_get_plugged_size(const MemoryDeviceState *md, + Error **errp) { /* dropping const here is fine as we don't touch the memory region */ PCDIMMDevice *dimm =3D PC_DIMM(md); @@ -249,9 +249,19 @@ static uint64_t pc_dimm_md_get_region_size(const Memor= yDeviceState *md, return 0; } =20 + /* for a dimm plugged_size =3D=3D region_size */ return memory_region_size(mr); } =20 +static MemoryRegion *pc_dimm_md_get_memory_region(MemoryDeviceState *md, + Error **errp) +{ + PCDIMMDevice *dimm =3D PC_DIMM(md); + const PCDIMMDeviceClass *ddc =3D PC_DIMM_GET_CLASS(md); + + return ddc->get_memory_region(dimm, errp); +} + static void pc_dimm_md_fill_device_info(const MemoryDeviceState *md, MemoryDeviceInfo *info) { @@ -297,9 +307,8 @@ static void pc_dimm_class_init(ObjectClass *oc, void *d= ata) ddc->get_vmstate_memory_region =3D pc_dimm_get_memory_region; =20 mdc->get_addr =3D pc_dimm_md_get_addr; - /* for a dimm plugged_size =3D=3D region_size */ - mdc->get_plugged_size =3D pc_dimm_md_get_region_size; - mdc->get_region_size =3D pc_dimm_md_get_region_size; + mdc->get_plugged_size =3D pc_dimm_md_get_plugged_size; + mdc->get_memory_region =3D pc_dimm_md_get_memory_region; mdc->fill_device_info =3D pc_dimm_md_fill_device_info; } =20 diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h index f02b229837..852fd8f98a 100644 --- a/include/hw/mem/memory-device.h +++ b/include/hw/mem/memory-device.h @@ -34,7 +34,7 @@ typedef struct MemoryDeviceClass { =20 uint64_t (*get_addr)(const MemoryDeviceState *md); uint64_t (*get_plugged_size)(const MemoryDeviceState *md, Error **errp= ); - uint64_t (*get_region_size)(const MemoryDeviceState *md, Error **errp); + MemoryRegion *(*get_memory_region)(MemoryDeviceState *md, Error **errp= ); void (*fill_device_info)(const MemoryDeviceState *md, MemoryDeviceInfo *info); } MemoryDeviceClass; --=20 2.17.1