ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

spapr: Pass &error_abort when getting some PC DIMM properties 

Both PC_DIMM_SLOT_PROP and PC_DIMM_ADDR_PROP are defined in the
default property list of the PC DIMM device class:

    DEFINE_PROP_UINT64(PC_DIMM_ADDR_PROP, PCDIMMDevice, addr, 0),

    DEFINE_PROP_INT32(PC_DIMM_SLOT_PROP, PCDIMMDevice, slot,
                      PC_DIMM_UNASSIGNED_SLOT),

They should thus be always gettable for both PC DIMMs and NVDIMMs.
An error in getting them can only be the result of a programming
error. It doesn't make much sense to propagate the error in this
case. Abort instead.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <160309732180.2739814.7243774674998010907.stgit@bahia.lan>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Greg Kurz 2020-10-19 10:48:41 +02:00 committed by David Gibson
parent 581778dd47
commit 271ced1d62
1 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
hw/ppc/spapr.c
View File

@ -3443,19 +3443,13 @@ static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
if (!is_nvdimm) { if (!is_nvdimm) {
addr = object_property_get_uint(OBJECT(dimm), addr = object_property_get_uint(OBJECT(dimm),
PC_DIMM_ADDR_PROP, &local_err); PC_DIMM_ADDR_PROP, &error_abort);
if (local_err) {
goto out_unplug;
}
spapr_add_lmbs(dev, addr, size, spapr_add_lmbs(dev, addr, size,
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_int(OBJECT(dimm), slot = object_property_get_int(OBJECT(dimm),
PC_DIMM_SLOT_PROP, &local_err); PC_DIMM_SLOT_PROP, &error_abort);
if (local_err) {
goto out_unplug;
}
/* We should have valid slot number at this point */ /* We should have valid slot number at this point */
g_assert(slot >= 0); g_assert(slot >= 0);
spapr_add_nvdimm(dev, slot, &local_err); spapr_add_nvdimm(dev, slot, &local_err);
@ -3633,7 +3627,6 @@ static void spapr_memory_unplug_request(HotplugHandler *hotplug_dev,
DeviceState *dev, Error **errp) DeviceState *dev, Error **errp)
{ {
SpaprMachineState *spapr = SPAPR_MACHINE(hotplug_dev); SpaprMachineState *spapr = SPAPR_MACHINE(hotplug_dev);
Error *local_err = NULL;
PCDIMMDevice *dimm = PC_DIMM(dev); PCDIMMDevice *dimm = PC_DIMM(dev);
uint32_t nr_lmbs; uint32_t nr_lmbs;
uint64_t size, addr_start, addr; uint64_t size, addr_start, addr;
@ -3649,11 +3642,7 @@ static void spapr_memory_unplug_request(HotplugHandler *hotplug_dev,
nr_lmbs = size / SPAPR_MEMORY_BLOCK_SIZE; nr_lmbs = size / SPAPR_MEMORY_BLOCK_SIZE;
addr_start = object_property_get_uint(OBJECT(dimm), PC_DIMM_ADDR_PROP, addr_start = object_property_get_uint(OBJECT(dimm), PC_DIMM_ADDR_PROP,
&local_err); &error_abort);
if (local_err) {
error_propagate(errp, local_err);
return;
}
/* /*
* An existing pending dimm state for this DIMM means that there is an * An existing pending dimm state for this DIMM means that there is an