mirrors
/
qemu
mirror of https://gitlab.com/qemu-project/qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pc-dimm: use get_uint() for dimm properties 

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 <marcandre.lureau@redhat.com>
Message-Id: <20170607163635.17635-22-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Marc-André Lureau 2017-06-07 20:36:13 +04:00 committed by Markus Armbruster
parent 822335eb51
commit 9ed442b8ae
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/acpi/memory_hotplug.c
View File

@ -83,11 +83,12 @@ static uint64_t acpi_memory_hotplug_read(void *opaque, hwaddr addr,
o = OBJECT(mdev->dimm); o = OBJECT(mdev->dimm);
switch (addr) { switch (addr) {
case 0x0: /* Lo part of phys address where DIMM is mapped */ 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); trace_mhp_acpi_read_addr_lo(mem_st->selector, val);
break; break;
case 0x4: /* Hi part of phys address where DIMM is mapped */ 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); trace_mhp_acpi_read_addr_hi(mem_st->selector, val);
break; break;
case 0x8: /* Lo part of DIMM size */ 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); trace_mhp_acpi_read_size_hi(mem_st->selector, val);
break; break;
case 0x10: /* node proximity for _PXM method */ 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); trace_mhp_acpi_read_pxm(mem_st->selector, val);
break; break;
case 0x14: /* pack and return is_* fields */ case 0x14: /* pack and return is_* fields */

10
hw/acpi/nvdimm.c
View File

@ -236,14 +236,14 @@ static void
nvdimm_build_structure_spa(GArray *structures, DeviceState *dev) nvdimm_build_structure_spa(GArray *structures, DeviceState *dev)
{ {
NvdimmNfitSpa *nfit_spa; NvdimmNfitSpa *nfit_spa;
uint64_t addr = object_property_get_int(OBJECT(dev), PC_DIMM_ADDR_PROP, uint64_t addr = object_property_get_uint(OBJECT(dev), PC_DIMM_ADDR_PROP,
NULL); NULL);
uint64_t size = object_property_get_int(OBJECT(dev), PC_DIMM_SIZE_PROP, uint64_t size = object_property_get_int(OBJECT(dev), PC_DIMM_SIZE_PROP,
NULL); NULL);
uint32_t node = object_property_get_int(OBJECT(dev), PC_DIMM_NODE_PROP, uint32_t node = object_property_get_uint(OBJECT(dev), PC_DIMM_NODE_PROP,
NULL); NULL);
int slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, int slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP,
NULL); NULL);
nfit_spa = acpi_data_push(structures, sizeof(*nfit_spa)); nfit_spa = acpi_data_push(structures, sizeof(*nfit_spa));

5
hw/mem/pc-dimm.c
View File

@ -46,7 +46,8 @@ void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplugState *hpms,
uint64_t existing_dimms_capacity = 0; uint64_t existing_dimms_capacity = 0;
uint64_t addr; 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) { if (local_err) {
goto out; goto out;
} }
@ -73,7 +74,7 @@ void pc_dimm_memory_plug(DeviceState *dev, MemoryHotplugState *hpms,
goto out; 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) { if (local_err) {
goto out; goto out;
} }

7
hw/ppc/spapr.c
View File

@ -2589,7 +2589,8 @@ static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
goto out; 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) { if (local_err) {
pc_dimm_memory_unplug(dev, &ms->hotplug_memory, mr); pc_dimm_memory_unplug(dev, &ms->hotplug_memory, mr);
goto out; goto out;
@ -2751,7 +2752,7 @@ static void spapr_memory_unplug_request(HotplugHandler *hotplug_dev,
sPAPRDRConnector *drc; sPAPRDRConnector *drc;
sPAPRDIMMState *ds; 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); &local_err);
if (local_err) { if (local_err) {
goto out; 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"); error_setg(errp, "Memory hotplug not supported for this machine");
return; 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) { if (*errp) {
return; return;
} }