spapr: Simplify error handling in spapr_memory_plug()
As recommended in "qapi/error.h", add a bool return value to spapr_add_lmbs() and spapr_add_nvdimm(), and use them instead of local_err in spapr_memory_plug(). This allows to get rid of the error propagation overhead. Signed-off-by: Greg Kurz <groug@kaod.org> Message-Id: <160309734178.2739814.3488437759887793902.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:
parent
271ced1d62
commit
6e837f98ba
|
@ -3382,7 +3382,7 @@ int spapr_lmb_dt_populate(SpaprDrc *drc, SpaprMachineState *spapr,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void spapr_add_lmbs(DeviceState *dev, uint64_t addr_start, uint64_t size,
|
static bool spapr_add_lmbs(DeviceState *dev, uint64_t addr_start, uint64_t size,
|
||||||
bool dedicated_hp_event_source, Error **errp)
|
bool dedicated_hp_event_source, Error **errp)
|
||||||
{
|
{
|
||||||
SpaprDrc *drc;
|
SpaprDrc *drc;
|
||||||
|
@ -3403,7 +3403,7 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t addr_start, uint64_t size,
|
||||||
addr / SPAPR_MEMORY_BLOCK_SIZE);
|
addr / SPAPR_MEMORY_BLOCK_SIZE);
|
||||||
spapr_drc_detach(drc);
|
spapr_drc_detach(drc);
|
||||||
}
|
}
|
||||||
return;
|
return false;
|
||||||
}
|
}
|
||||||
if (!hotplugged) {
|
if (!hotplugged) {
|
||||||
spapr_drc_reset(drc);
|
spapr_drc_reset(drc);
|
||||||
|
@ -3425,12 +3425,12 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t addr_start, uint64_t size,
|
||||||
nr_lmbs);
|
nr_lmbs);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
||||||
Error **errp)
|
Error **errp)
|
||||||
{
|
{
|
||||||
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;
|
uint64_t size, addr;
|
||||||
|
@ -3444,26 +3444,24 @@ 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, &error_abort);
|
PC_DIMM_ADDR_PROP, &error_abort);
|
||||||
spapr_add_lmbs(dev, addr, size,
|
if (!spapr_add_lmbs(dev, addr, size,
|
||||||
spapr_ovec_test(ms->ov5_cas, OV5_HP_EVT),
|
spapr_ovec_test(ms->ov5_cas, OV5_HP_EVT), errp)) {
|
||||||
&local_err);
|
goto out_unplug;
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
slot = object_property_get_int(OBJECT(dimm),
|
slot = object_property_get_int(OBJECT(dimm),
|
||||||
PC_DIMM_SLOT_PROP, &error_abort);
|
PC_DIMM_SLOT_PROP, &error_abort);
|
||||||
/* 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);
|
if (!spapr_add_nvdimm(dev, slot, errp)) {
|
||||||
}
|
goto out_unplug;
|
||||||
|
}
|
||||||
if (local_err) {
|
|
||||||
goto out_unplug;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return;
|
return;
|
||||||
|
|
||||||
out_unplug:
|
out_unplug:
|
||||||
pc_dimm_unplug(dimm, MACHINE(ms));
|
pc_dimm_unplug(dimm, MACHINE(ms));
|
||||||
error_propagate(errp, local_err);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
|
||||||
|
|
|
@ -89,7 +89,7 @@ bool spapr_nvdimm_validate(HotplugHandler *hotplug_dev, NVDIMMDevice *nvdimm,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void spapr_add_nvdimm(DeviceState *dev, uint64_t slot, Error **errp)
|
bool spapr_add_nvdimm(DeviceState *dev, uint64_t slot, Error **errp)
|
||||||
{
|
{
|
||||||
SpaprDrc *drc;
|
SpaprDrc *drc;
|
||||||
bool hotplugged = spapr_drc_hotplugged(dev);
|
bool hotplugged = spapr_drc_hotplugged(dev);
|
||||||
|
@ -98,12 +98,13 @@ void spapr_add_nvdimm(DeviceState *dev, uint64_t slot, Error **errp)
|
||||||
g_assert(drc);
|
g_assert(drc);
|
||||||
|
|
||||||
if (!spapr_drc_attach(drc, dev, errp)) {
|
if (!spapr_drc_attach(drc, dev, errp)) {
|
||||||
return;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hotplugged) {
|
if (hotplugged) {
|
||||||
spapr_hotplug_req_add_by_index(drc);
|
spapr_hotplug_req_add_by_index(drc);
|
||||||
}
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int spapr_dt_nvdimm(SpaprMachineState *spapr, void *fdt,
|
static int spapr_dt_nvdimm(SpaprMachineState *spapr, void *fdt,
|
||||||
|
|
|
@ -30,6 +30,6 @@ int spapr_pmem_dt_populate(SpaprDrc *drc, SpaprMachineState *spapr,
|
||||||
void spapr_dt_persistent_memory(SpaprMachineState *spapr, void *fdt);
|
void spapr_dt_persistent_memory(SpaprMachineState *spapr, void *fdt);
|
||||||
bool spapr_nvdimm_validate(HotplugHandler *hotplug_dev, NVDIMMDevice *nvdimm,
|
bool spapr_nvdimm_validate(HotplugHandler *hotplug_dev, NVDIMMDevice *nvdimm,
|
||||||
uint64_t size, Error **errp);
|
uint64_t size, Error **errp);
|
||||||
void spapr_add_nvdimm(DeviceState *dev, uint64_t slot, Error **errp);
|
bool spapr_add_nvdimm(DeviceState *dev, uint64_t slot, Error **errp);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue