[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 21/43] pc-dimm: use get_uint() for dimm propertie
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v3 21/43] pc-dimm: use get_uint() for dimm properties |
Date: |
Wed, 7 Jun 2017 20:36:13 +0400 |
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é Lureau <address@hidden>
---
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 210073d283..d2a96569ba 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 = OBJECT(mdev->dimm);
switch (addr) {
case 0x0: /* Lo part of phys address where DIMM is mapped */
- val = o ? object_property_get_int(o, PC_DIMM_ADDR_PROP, NULL) : 0;
+ val = 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 = o ? object_property_get_int(o, PC_DIMM_ADDR_PROP, NULL) >> 32 :
0;
+ val =
+ 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 = o ? object_property_get_int(o, PC_DIMM_NODE_PROP, NULL) : 0;
+ val = 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 8e7d6ec034..e57027149d 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 = object_property_get_int(OBJECT(dev), PC_DIMM_ADDR_PROP,
- NULL);
+ uint64_t addr = object_property_get_uint(OBJECT(dev), PC_DIMM_ADDR_PROP,
+ NULL);
uint64_t size = object_property_get_int(OBJECT(dev), PC_DIMM_SIZE_PROP,
NULL);
- uint32_t node = object_property_get_int(OBJECT(dev), PC_DIMM_NODE_PROP,
- NULL);
+ uint32_t node = object_property_get_uint(OBJECT(dev), PC_DIMM_NODE_PROP,
+ NULL);
int slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP,
- NULL);
+ NULL);
nfit_spa = acpi_data_push(structures, sizeof(*nfit_spa));
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 9e8dab0e89..f6def8c239 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -46,7 +46,8 @@ void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplugState
*hpms,
uint64_t existing_dimms_capacity = 0;
uint64_t addr;
- addr = object_property_get_int(OBJECT(dimm), PC_DIMM_ADDR_PROP,
&local_err);
+ addr = 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, MemoryHotplugState
*hpms,
goto out;
}
- object_property_set_int(OBJECT(dev), addr, PC_DIMM_ADDR_PROP, &local_err);
+ object_property_set_uint(OBJECT(dev), addr, PC_DIMM_ADDR_PROP, &local_err);
if (local_err) {
goto out;
}
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 91b4057933..bae26e2a56 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2582,7 +2582,8 @@ static void spapr_memory_plug(HotplugHandler
*hotplug_dev, DeviceState *dev,
goto out;
}
- addr = object_property_get_int(OBJECT(dimm), PC_DIMM_ADDR_PROP,
&local_err);
+ addr = 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(HotplugHandler
*hotplug_dev,
sPAPRDRConnectorClass *drck;
sPAPRDIMMState *ds;
- addr_start = object_property_get_int(OBJECT(dimm), PC_DIMM_ADDR_PROP,
+ addr_start = object_property_get_uint(OBJECT(dimm), PC_DIMM_ADDR_PROP,
&local_err);
if (local_err) {
goto out;
@@ -2980,7 +2981,7 @@ static void spapr_machine_device_plug(HotplugHandler
*hotplug_dev,
error_setg(errp, "Memory hotplug not supported for this machine");
return;
}
- node = object_property_get_int(OBJECT(dev), PC_DIMM_NODE_PROP, errp);
+ node = object_property_get_uint(OBJECT(dev), PC_DIMM_NODE_PROP, errp);
if (*errp) {
return;
}
--
2.13.0.91.g00982b8dd
- [Qemu-devel] [PATCH v3 11/43] qapi: update the qobject visitor to use QNUM_U64, (continued)
- [Qemu-devel] [PATCH v3 11/43] qapi: update the qobject visitor to use QNUM_U64, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 12/43] object: add uint property setter/getter, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 13/43] q35: fix get_mmcfg_size to use uint64 visitor, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 14/43] object: use more specific property type names, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 15/43] qdev: rename DEFINE_PROP_DEFAULT() to DEFINE_PROP_SIGNED(), Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 16/43] qdev: wrap default property value in an union, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 17/43] qdev: avoid type casts between signed and unsigned, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 18/43] apic-common: make "id" property a uint32, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 19/43] qdev: use appropriate getter/setters type, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 20/43] isa: use get_uint() for "io-base", Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 21/43] pc-dimm: use get_uint() for dimm properties,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v3 22/43] pc-dimm: make "size" property uint64, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 23/43] pcihp: use get_uint() for "bsel" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 24/43] aspeed: use {set, get}_uint() for "ram-size" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 25/43] bcm2835_fb: use {get, set}_uint() for "vcram-size" and "vcram-base", Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 26/43] platform-bus: use get_uint() for "addr" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 27/43] acpi: use get_uint() for "acpi-pcihp-io*" properties, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 28/43] acpi: use get_uint() for various acpi properties, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 29/43] acpi: use get_uint() for "pci-hole*" properties, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 30/43] pc: use get_uint() for "iobase" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 31/43] pc: use get_uint() for "apic-id" property, Marc-André Lureau, 2017/06/07