[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/5] spapr: Use appropriate getter for PC_DIMM_SLOT_PROP
From: |
Greg Kurz |
Subject: |
[PATCH 3/5] spapr: Use appropriate getter for PC_DIMM_SLOT_PROP |
Date: |
Mon, 19 Oct 2020 10:48:27 +0200 |
User-agent: |
StGit/0.21 |
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>
---
hw/ppc/spapr.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 115fc52e3b06..1b173861152f 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -3433,7 +3433,8 @@ static void spapr_memory_plug(HotplugHandler
*hotplug_dev, DeviceState *dev,
Error *local_err = NULL;
SpaprMachineState *ms = SPAPR_MACHINE(hotplug_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);
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),
&local_err);
} else {
- slot = object_property_get_uint(OBJECT(dimm),
- PC_DIMM_SLOT_PROP, &local_err);
+ slot = object_property_get_int(OBJECT(dimm),
+ PC_DIMM_SLOT_PROP, &local_err);
if (local_err) {
goto out_unplug;
}
+ /* We should have valid slot number at this point */
+ g_assert(slot >= 0);
spapr_add_nvdimm(dev, slot, &local_err);
}
- [PATCH 0/5] spapr: Error handling fixes and cleanups (round 3), Greg Kurz, 2020/10/19
- [PATCH 1/5] pc-dimm: Drop @errp argument of pc_dimm_plug(), Greg Kurz, 2020/10/19
- [PATCH 2/5] spapr: Use appropriate getter for PC_DIMM_ADDR_PROP, Greg Kurz, 2020/10/19
- [PATCH 3/5] spapr: Use appropriate getter for PC_DIMM_SLOT_PROP,
Greg Kurz <=
- [PATCH 4/5] spapr: Pass &error_abort when getting some PC DIMM properties, Greg Kurz, 2020/10/19
- Re: [PATCH 4/5] spapr: Pass &error_abort when getting some PC DIMM properties, Igor Mammedov, 2020/10/23
- Re: [PATCH 4/5] spapr: Pass &error_abort when getting some PC DIMM properties, Greg Kurz, 2020/10/25
- Re: [PATCH 4/5] spapr: Pass &error_abort when getting some PC DIMM properties, Igor Mammedov, 2020/10/27
- Re: [PATCH 4/5] spapr: Pass &error_abort when getting some PC DIMM properties, Greg Kurz, 2020/10/27
- Re: [PATCH 4/5] spapr: Pass &error_abort when getting some PC DIMM properties, Igor Mammedov, 2020/10/28
- Re: [PATCH 4/5] spapr: Pass &error_abort when getting some PC DIMM properties, Greg Kurz, 2020/10/30
[PATCH 5/5] spapr: Simplify error handling in spapr_memory_plug(), Greg Kurz, 2020/10/19