motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-08 02:03:56 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

spapr: Use appropriate getter for PC_DIMM_SLOT_PROP

Browse source 
The PC_DIMM_SLOT_PROP property is defined as:

    DEFINE_PROP_INT32(PC_DIMM_SLOT_PROP, PCDIMMDevice, slot,
                      PC_DIMM_UNASSIGNED_SLOT),

Use object_property_get_int() instead of object_property_get_uint().
Since spapr_memory_plug() only gets called if pc_dimm_pre_plug()
succeeded, we expect to have a valid >= 0 slot number, either because
the user passed a valid slot number or because pc_dimm_get_free_slot()
picked one up for us.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <160309730758.2739814.15821922745424652642.stgit@bahia.lan>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Greg Kurz 2020-10-19 10:48:27 +02:00 • committed by David Gibson
parent 65226afd90
commit 581778dd47
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
hw/ppc/spapr.c
View file

@ -3433,7 +3433,8 @@ static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
Error *local_err = NULL; Error *local_err = NULL;
SpaprMachineState *ms = SPAPR_MACHINE(hotplug_dev); SpaprMachineState *ms = SPAPR_MACHINE(hotplug_dev);
PCDIMMDevice *dimm = PC_DIMM(dev); PCDIMMDevice *dimm = PC_DIMM(dev);
uint64_t size, addr, slot; uint64_t size, addr;
int64_t slot;
bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); bool is_nvdimm = object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM);
size = memory_device_get_region_size(MEMORY_DEVICE(dev), &error_abort); size = memory_device_get_region_size(MEMORY_DEVICE(dev), &error_abort);
@ -3450,11 +3451,13 @@ static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
spapr_ovec_test(ms->ov5_cas, OV5_HP_EVT), spapr_ovec_test(ms->ov5_cas, OV5_HP_EVT),
&local_err); &local_err);
} else { } else {
slot = object_property_get_uint(OBJECT(dimm), slot = object_property_get_int(OBJECT(dimm),
PC_DIMM_SLOT_PROP, &local_err); PC_DIMM_SLOT_PROP, &local_err);
if (local_err) { if (local_err) {
goto out_unplug; goto out_unplug;
} }
/* We should have valid slot number at this point */
g_assert(slot >= 0);
spapr_add_nvdimm(dev, slot, &local_err); spapr_add_nvdimm(dev, slot, &local_err);
} }