From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38515) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dJKGM-0000kM-KZ for qemu-devel@nongnu.org; Fri, 09 Jun 2017 09:47:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dJKGI-0003cB-92 for qemu-devel@nongnu.org; Fri, 09 Jun 2017 09:47:42 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33714) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dJKGH-0003aB-PP for qemu-devel@nongnu.org; Fri, 09 Jun 2017 09:47:38 -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 A0B5480480 for ; Fri, 9 Jun 2017 13:47:36 +0000 (UTC) From: Markus Armbruster Date: Fri, 9 Jun 2017 15:47:05 +0200 Message-Id: <1497016045-6009-22-git-send-email-armbru@redhat.com> In-Reply-To: <1497016045-6009-1-git-send-email-armbru@redhat.com> References: <1497016045-6009-1-git-send-email-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 21/41] pc-dimm: use get_uint() for dimm properties List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= From: Marc-Andr=C3=A9 Lureau TYPE_PC_DIMM's property PC_DIMM_ADDR_PROP is defined with DEFINE_PROP_UINT64(). TYPE_PC_DIMM's property PC_DIMM_NODE_PROP is defined with DEFINE_PROP_UINT32(). Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20170607163635.17635-22-marcandre.lureau@redhat.com> Signed-off-by: Markus Armbruster --- hw/acpi/memory_hotplug.c | 7 ++++--- hw/acpi/nvdimm.c | 10 +++++----- hw/mem/pc-dimm.c | 5 +++-- hw/ppc/spapr.c | 7 ++++--- 4 files changed, 16 insertions(+), 13 deletions(-) diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c index 210073d..d2a9656 100644 --- a/hw/acpi/memory_hotplug.c +++ b/hw/acpi/memory_hotplug.c @@ -83,11 +83,12 @@ static uint64_t acpi_memory_hotplug_read(void *opaque= , hwaddr addr, o =3D OBJECT(mdev->dimm); switch (addr) { case 0x0: /* Lo part of phys address where DIMM is mapped */ - val =3D o ? object_property_get_int(o, PC_DIMM_ADDR_PROP, NULL) = : 0; + val =3D o ? object_property_get_uint(o, PC_DIMM_ADDR_PROP, NULL)= : 0; trace_mhp_acpi_read_addr_lo(mem_st->selector, val); break; case 0x4: /* Hi part of phys address where DIMM is mapped */ - val =3D o ? object_property_get_int(o, PC_DIMM_ADDR_PROP, NULL) = >> 32 : 0; + val =3D + o ? object_property_get_uint(o, PC_DIMM_ADDR_PROP, NULL) >> = 32 : 0; trace_mhp_acpi_read_addr_hi(mem_st->selector, val); break; case 0x8: /* Lo part of DIMM size */ @@ -99,7 +100,7 @@ static uint64_t acpi_memory_hotplug_read(void *opaque,= hwaddr addr, trace_mhp_acpi_read_size_hi(mem_st->selector, val); break; case 0x10: /* node proximity for _PXM method */ - val =3D o ? object_property_get_int(o, PC_DIMM_NODE_PROP, NULL) = : 0; + val =3D o ? object_property_get_uint(o, PC_DIMM_NODE_PROP, NULL)= : 0; trace_mhp_acpi_read_pxm(mem_st->selector, val); break; case 0x14: /* pack and return is_* fields */ diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c index 8e7d6ec..e570271 100644 --- a/hw/acpi/nvdimm.c +++ b/hw/acpi/nvdimm.c @@ -236,14 +236,14 @@ static void nvdimm_build_structure_spa(GArray *structures, DeviceState *dev) { NvdimmNfitSpa *nfit_spa; - uint64_t addr =3D object_property_get_int(OBJECT(dev), PC_DIMM_ADDR_= PROP, - NULL); + uint64_t addr =3D object_property_get_uint(OBJECT(dev), PC_DIMM_ADDR= _PROP, + NULL); uint64_t size =3D object_property_get_int(OBJECT(dev), PC_DIMM_SIZE_= PROP, NULL); - uint32_t node =3D object_property_get_int(OBJECT(dev), PC_DIMM_NODE_= PROP, - NULL); + uint32_t node =3D object_property_get_uint(OBJECT(dev), PC_DIMM_NODE= _PROP, + NULL); int slot =3D object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, - NULL); + NULL); =20 nfit_spa =3D acpi_data_push(structures, sizeof(*nfit_spa)); =20 diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 9e8dab0..f6def8c 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -46,7 +46,8 @@ void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplu= gState *hpms, uint64_t existing_dimms_capacity =3D 0; uint64_t addr; =20 - addr =3D object_property_get_int(OBJECT(dimm), PC_DIMM_ADDR_PROP, &l= ocal_err); + addr =3D object_property_get_uint(OBJECT(dimm), + PC_DIMM_ADDR_PROP, &local_err); if (local_err) { goto out; } @@ -73,7 +74,7 @@ void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplu= gState *hpms, goto out; } =20 - object_property_set_int(OBJECT(dev), addr, PC_DIMM_ADDR_PROP, &local= _err); + object_property_set_uint(OBJECT(dev), addr, PC_DIMM_ADDR_PROP, &loca= l_err); if (local_err) { goto out; } diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 91b4057..bae26e2 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -2582,7 +2582,8 @@ static void spapr_memory_plug(HotplugHandler *hotpl= ug_dev, DeviceState *dev, goto out; } =20 - addr =3D object_property_get_int(OBJECT(dimm), PC_DIMM_ADDR_PROP, &l= ocal_err); + addr =3D object_property_get_uint(OBJECT(dimm), + PC_DIMM_ADDR_PROP, &local_err); if (local_err) { pc_dimm_memory_unplug(dev, &ms->hotplug_memory, mr); goto out; @@ -2741,7 +2742,7 @@ static void spapr_memory_unplug_request(HotplugHand= ler *hotplug_dev, sPAPRDRConnectorClass *drck; sPAPRDIMMState *ds; =20 - addr_start =3D object_property_get_int(OBJECT(dimm), PC_DIMM_ADDR_PR= OP, + addr_start =3D object_property_get_uint(OBJECT(dimm), PC_DIMM_ADDR_P= ROP, &local_err); if (local_err) { goto out; @@ -2980,7 +2981,7 @@ static void spapr_machine_device_plug(HotplugHandle= r *hotplug_dev, error_setg(errp, "Memory hotplug not supported for this mach= ine"); return; } - node =3D object_property_get_int(OBJECT(dev), PC_DIMM_NODE_PROP,= errp); + node =3D object_property_get_uint(OBJECT(dev), PC_DIMM_NODE_PROP= , errp); if (*errp) { return; } --=20 2.7.5