[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 21/41] pc-dimm: use get_uint() for dimm properties
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL v2 21/41] pc-dimm: use get_uint() for dimm properties |
Date: |
Tue, 20 Jun 2017 14:40:48 +0200 |
From: Marc-André Lureau <address@hidden>
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>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <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 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 = 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 b5734f5..f507b49 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 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, 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 e877d45..ede5167 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2589,7 +2589,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;
@@ -2751,7 +2752,7 @@ static void spapr_memory_unplug_request(HotplugHandler
*hotplug_dev,
sPAPRDRConnector *drc;
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;
@@ -2986,7 +2987,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.7.5
- [Qemu-devel] [PULL v2 07/41] qapi: Remove visit_start_alternate() parameter promote_int, (continued)
- [Qemu-devel] [PULL v2 07/41] qapi: Remove visit_start_alternate() parameter promote_int, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 37/41] pnv-core: use get_uint() for "core-pir" property, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 26/41] platform-bus: use get_uint() for "addr" property, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 27/41] acpi: use get_uint() for "acpi-pcihp-io*" properties, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 22/41] pc-dimm: make "size" property uint64, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 30/41] pc: use get_uint() for "iobase" property, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 23/41] pcihp: use get_uint() for "bsel" property, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 15/41] qdev: Rename DEFINE_PROP_DEFAULT() to DEFINE_PROP_SIGNED(), Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 40/41] console: use get_uint() for "head" property, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 18/41] apic-common: make "id" property a uint32, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 21/41] pc-dimm: use get_uint() for dimm properties,
Markus Armbruster <=
- [Qemu-devel] [PULL v2 38/41] numa: use get_uint() for "size" property, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 16/41] qdev: wrap default property value in an union, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 17/41] qdev: avoid type casts between signed and unsigned, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 32/41] pc: use get_uint() for "hpet-intcap" property, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 29/41] acpi: use get_uint() for "pci-hole*" properties, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 12/41] object: add uint property setter/getter, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 31/41] pc: use get_uint() for "apic-id" property, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 33/41] xen: use get_uint() for "max-ram-below-4g" property, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 41/41] tests/qdict: check more get_try_int() cases, Markus Armbruster, 2017/06/20
- [Qemu-devel] [PULL v2 39/41] i386/cpu: use get_uint() for "min-level"/"min-xlevel" properties, Markus Armbruster, 2017/06/20