From nobody Wed Nov 5 21:46:08 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 1537439740353479.1642682791478; Thu, 20 Sep 2018 03:35:40 -0700 (PDT) Received: from localhost ([::1]:49341 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g2wJ9-0004FU-21 for importer@patchew.org; Thu, 20 Sep 2018 06:35:39 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33011) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g2wH0-0002px-Uw for qemu-devel@nongnu.org; Thu, 20 Sep 2018 06:33:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g2wGz-0006H5-Nz for qemu-devel@nongnu.org; Thu, 20 Sep 2018 06:33:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40400) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g2wGz-0006Go-Et; Thu, 20 Sep 2018 06:33:25 -0400 Received: from smtp.corp.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.26]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AD66CC049D5C; Thu, 20 Sep 2018 10:33:24 +0000 (UTC) Received: from t460s.redhat.com (ovpn-117-43.ams2.redhat.com [10.36.117.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4E70F3091327; Thu, 20 Sep 2018 10:33:21 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Thu, 20 Sep 2018 12:32:28 +0200 Message-Id: <20180920103243.28474-8-david@redhat.com> In-Reply-To: <20180920103243.28474-1-david@redhat.com> References: <20180920103243.28474-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.26 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Thu, 20 Sep 2018 10:33:24 +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 v3 07/22] memory-device: add and use memory_device_get_region_size() 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: Pankaj Gupta , Eduardo Habkost , "Michael S . Tsirkin" , Xiao Guangrong , David Hildenbrand , "Dr . David Alan Gilbert" , Markus Armbruster , Alexander Graf , qemu-ppc@nongnu.org, Paolo Bonzini , Igor Mammedov , Luiz Capitulino , David Gibson , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We will factor out get_memory_region() from pc-dimm to memory device code soon. Once that is done, get_region_size() can be implemented generically and essentially be replaced by memory_device_get_region_size (and work only on get_memory_region()). We have some users of get_memory_region() (spapr and pc-dimm code) that are only interested in the size. So let's rework them to use memory_device_get_region_size() first, then we can factor out get_memory_region() and eventually remove get_region_size() without touching the same code multiple times. Signed-off-by: David Hildenbrand --- hw/mem/memory-device.c | 13 ++++++++++--- hw/mem/pc-dimm.c | 10 ++++------ hw/ppc/spapr.c | 27 +++++++++------------------ include/hw/mem/memory-device.h | 2 ++ 4 files changed, 25 insertions(+), 27 deletions(-) diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index bdcee6fd55..2fa68b3730 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -57,10 +57,9 @@ static int memory_device_used_region_size(Object *obj, v= oid *opaque) if (object_dynamic_cast(obj, TYPE_MEMORY_DEVICE)) { const DeviceState *dev =3D DEVICE(obj); const 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); + *size +=3D memory_device_get_region_size(md, &error_abort); } } =20 @@ -169,7 +168,7 @@ uint64_t memory_device_get_free_addr(MachineState *ms, = const uint64_t *hint, 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_device_get_region_size(md, &error_abort); =20 if (ranges_overlap(md_addr, md_size, new_addr, size)) { if (hint) { @@ -268,6 +267,14 @@ void memory_device_unplug_region(MachineState *ms, Mem= oryRegion *mr) memory_region_del_subregion(&ms->device_memory->mr, mr); } =20 +uint64_t memory_device_get_region_size(const MemoryDeviceState *md, + Error **errp) +{ + MemoryDeviceClass *mdc =3D MEMORY_DEVICE_GET_CLASS(md); + + return mdc->get_region_size(md, errp); +} + static const TypeInfo memory_device_info =3D { .name =3D TYPE_MEMORY_DEVICE, .parent =3D TYPE_INTERFACE, diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 4bf1a0acc9..a06da7e08e 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -163,16 +163,14 @@ static Property pc_dimm_properties[] =3D { static void pc_dimm_get_size(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { + Error *local_err =3D NULL; uint64_t value; - MemoryRegion *mr; - PCDIMMDevice *dimm =3D PC_DIMM(obj); - PCDIMMDeviceClass *ddc =3D PC_DIMM_GET_CLASS(obj); =20 - mr =3D ddc->get_memory_region(dimm, errp); - if (!mr) { + value =3D memory_device_get_region_size(MEMORY_DEVICE(obj), errp); + if (local_err) { + error_propagate(errp, local_err); return; } - value =3D memory_region_size(mr); =20 visit_type_uint64(v, name, &value, errp); } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 4edb6c7d16..b56ce6b7aa 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3124,20 +3124,17 @@ static void spapr_memory_plug(HotplugHandler *hotpl= ug_dev, DeviceState *dev, { Error *local_err =3D NULL; sPAPRMachineState *ms =3D SPAPR_MACHINE(hotplug_dev); - PCDIMMDevice *dimm =3D PC_DIMM(dev); - PCDIMMDeviceClass *ddc =3D PC_DIMM_GET_CLASS(dimm); - MemoryRegion *mr =3D ddc->get_memory_region(dimm, &error_abort); uint64_t size, addr; uint32_t node; =20 - size =3D memory_region_size(mr); + size =3D memory_device_get_region_size(MEMORY_DEVICE(dev), &error_abor= t); =20 pc_dimm_plug(dev, MACHINE(ms), &local_err); if (local_err) { goto out; } =20 - addr =3D object_property_get_uint(OBJECT(dimm), + addr =3D object_property_get_uint(OBJECT(dev), PC_DIMM_ADDR_PROP, &local_err); if (local_err) { goto out_unplug; @@ -3165,10 +3162,7 @@ static void spapr_memory_pre_plug(HotplugHandler *ho= tplug_dev, DeviceState *dev, { const sPAPRMachineClass *smc =3D SPAPR_MACHINE_GET_CLASS(hotplug_dev); sPAPRMachineState *spapr =3D SPAPR_MACHINE(hotplug_dev); - PCDIMMDevice *dimm =3D PC_DIMM(dev); - PCDIMMDeviceClass *ddc =3D PC_DIMM_GET_CLASS(dimm); Error *local_err =3D NULL; - MemoryRegion *mr; uint64_t size; Object *memdev; hwaddr pagesize; @@ -3178,11 +3172,11 @@ static void spapr_memory_pre_plug(HotplugHandler *h= otplug_dev, DeviceState *dev, return; } =20 - mr =3D ddc->get_memory_region(dimm, errp); - if (!mr) { + size =3D memory_device_get_region_size(MEMORY_DEVICE(dev), &error_abor= t); + if (local_err) { + error_propagate(errp, local_err); return; } - size =3D memory_region_size(mr); =20 if (size % SPAPR_MEMORY_BLOCK_SIZE) { error_setg(errp, "Hotplugged memory size must be a multiple of " @@ -3190,7 +3184,7 @@ static void spapr_memory_pre_plug(HotplugHandler *hot= plug_dev, DeviceState *dev, return; } =20 - memdev =3D object_property_get_link(OBJECT(dimm), PC_DIMM_MEMDEV_PROP, + memdev =3D object_property_get_link(OBJECT(dev), PC_DIMM_MEMDEV_PROP, &error_abort); pagesize =3D host_memory_backend_pagesize(MEMORY_BACKEND(memdev)); spapr_check_pagesize(spapr, pagesize, &local_err); @@ -3254,9 +3248,8 @@ static sPAPRDIMMState *spapr_recover_pending_dimm_sta= te(sPAPRMachineState *ms, PCDIMMDevice *dimm) { sPAPRDRConnector *drc; - PCDIMMDeviceClass *ddc =3D PC_DIMM_GET_CLASS(dimm); - MemoryRegion *mr =3D ddc->get_memory_region(dimm, &error_abort); - uint64_t size =3D memory_region_size(mr); + uint64_t size =3D memory_device_get_region_size(MEMORY_DEVICE(dimm), + &error_abort); uint32_t nr_lmbs =3D size / SPAPR_MEMORY_BLOCK_SIZE; uint32_t avail_lmbs =3D 0; uint64_t addr_start, addr; @@ -3322,14 +3315,12 @@ static void spapr_memory_unplug_request(HotplugHand= ler *hotplug_dev, sPAPRMachineState *spapr =3D SPAPR_MACHINE(hotplug_dev); Error *local_err =3D NULL; PCDIMMDevice *dimm =3D PC_DIMM(dev); - PCDIMMDeviceClass *ddc =3D PC_DIMM_GET_CLASS(dimm); - MemoryRegion *mr =3D ddc->get_memory_region(dimm, &error_abort); uint32_t nr_lmbs; uint64_t size, addr_start, addr; int i; sPAPRDRConnector *drc; =20 - size =3D memory_region_size(mr); + size =3D memory_device_get_region_size(MEMORY_DEVICE(dev), &error_abor= t); nr_lmbs =3D size / SPAPR_MEMORY_BLOCK_SIZE; =20 addr_start =3D object_property_get_uint(OBJECT(dimm), PC_DIMM_ADDR_PRO= P, diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h index d6853156ff..12f8ca9eb1 100644 --- a/include/hw/mem/memory-device.h +++ b/include/hw/mem/memory-device.h @@ -60,5 +60,7 @@ uint64_t memory_device_get_free_addr(MachineState *ms, co= nst uint64_t *hint, void memory_device_plug_region(MachineState *ms, MemoryRegion *mr, uint64_t addr); void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr); +uint64_t memory_device_get_region_size(const MemoryDeviceState *md, + Error **errp); =20 #endif --=20 2.17.1