Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-09 01:50:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spapr: spapr_drc_attach() cannot fail

Browse Source 
All users are passing &error_abort already. Document the fact
that spapr_drc_attach() should only be passed a free DRC, which
is supposedly the case if appropriate checking is done earlier.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <20201201113728.885700-5-groug@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Greg Kurz 2020-12-01 12:37:28 +01:00 committed by David Gibson
parent f9b43958b9
commit bc370a659a
5 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/ppc/spapr.c
View File

@ -3398,7 +3398,7 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t addr_start, uint64_t size,
* that doesn't overlap with any existing mapping at pre-plug. The * that doesn't overlap with any existing mapping at pre-plug. The
* corresponding LMB DRCs are thus assumed to be all attachable. * corresponding LMB DRCs are thus assumed to be all attachable.
*/ */
spapr_drc_attach(drc, dev, &error_abort); spapr_drc_attach(drc, dev);
if (!hotplugged) { if (!hotplugged) {
spapr_drc_reset(drc); spapr_drc_reset(drc);
} }
@ -3766,7 +3766,7 @@ static void spapr_core_plug(HotplugHandler *hotplug_dev, DeviceState *dev)
* core being plugged into a free slot. Nothing should already * core being plugged into a free slot. Nothing should already
* be attached to the corresponding DRC. * be attached to the corresponding DRC.
*/ */
spapr_drc_attach(drc, dev, &error_abort); spapr_drc_attach(drc, dev);
if (hotplugged) { if (hotplugged) {
/* /*
@ -3931,7 +3931,7 @@ static void spapr_phb_plug(HotplugHandler *hotplug_dev, DeviceState *dev)
assert(drc); assert(drc);
/* spapr_phb_pre_plug() already checked the DRC is attachable */ /* spapr_phb_pre_plug() already checked the DRC is attachable */
spapr_drc_attach(drc, dev, &error_abort); spapr_drc_attach(drc, dev);
if (hotplugged) { if (hotplugged) {
spapr_hotplug_req_add_by_index(drc); spapr_hotplug_req_add_by_index(drc);

8
hw/ppc/spapr_drc.c
View File

@ -369,14 +369,11 @@ static void prop_get_fdt(Object *obj, Visitor *v, const char *name,
} while (fdt_depth != 0); } while (fdt_depth != 0);
} }
bool spapr_drc_attach(SpaprDrc *drc, DeviceState *d, Error **errp) void spapr_drc_attach(SpaprDrc *drc, DeviceState *d)
{ {
trace_spapr_drc_attach(spapr_drc_index(drc)); trace_spapr_drc_attach(spapr_drc_index(drc));
if (drc->dev) { g_assert(!drc->dev);
error_setg(errp, "an attached device is still awaiting release");
return false;
}
g_assert((drc->state == SPAPR_DRC_STATE_LOGICAL_UNUSABLE) g_assert((drc->state == SPAPR_DRC_STATE_LOGICAL_UNUSABLE)
|| (drc->state == SPAPR_DRC_STATE_PHYSICAL_POWERON)); || (drc->state == SPAPR_DRC_STATE_PHYSICAL_POWERON));
@ -386,7 +383,6 @@ bool spapr_drc_attach(SpaprDrc *drc, DeviceState *d, Error **errp)
object_get_typename(OBJECT(drc->dev)), object_get_typename(OBJECT(drc->dev)),
(Object **)(&drc->dev), (Object **)(&drc->dev),
NULL, 0); NULL, 0);
return true;
} }
static void spapr_drc_release(SpaprDrc *drc) static void spapr_drc_release(SpaprDrc *drc)

2
hw/ppc/spapr_nvdimm.c
View File

@ -101,7 +101,7 @@ void spapr_add_nvdimm(DeviceState *dev, uint64_t slot)
* pc_dimm_get_free_slot() provided a free slot at pre-plug. The * pc_dimm_get_free_slot() provided a free slot at pre-plug. The
* corresponding DRC is thus assumed to be attachable. * corresponding DRC is thus assumed to be attachable.
*/ */
spapr_drc_attach(drc, dev, &error_abort); spapr_drc_attach(drc, dev);
if (hotplugged) { if (hotplugged) {
spapr_hotplug_req_add_by_index(drc); spapr_hotplug_req_add_by_index(drc);

2
hw/ppc/spapr_pci.c
View File

@ -1601,7 +1601,7 @@ static void spapr_pci_plug(HotplugHandler *plug_handler,
} }
/* spapr_pci_pre_plug() already checked the DRC is attachable */ /* spapr_pci_pre_plug() already checked the DRC is attachable */
spapr_drc_attach(drc, DEVICE(pdev), &error_abort); spapr_drc_attach(drc, DEVICE(pdev));
/* If this is function 0, signal hotplug for all the device functions. /* If this is function 0, signal hotplug for all the device functions.
* Otherwise defer sending the hotplug event. * Otherwise defer sending the hotplug event.

8
include/hw/ppc/spapr_drc.h
View File

@ -235,7 +235,13 @@ SpaprDrc *spapr_drc_by_index(uint32_t index);
SpaprDrc *spapr_drc_by_id(const char *type, uint32_t id); SpaprDrc *spapr_drc_by_id(const char *type, uint32_t id);
int spapr_dt_drc(void *fdt, int offset, Object *owner, uint32_t drc_type_mask); int spapr_dt_drc(void *fdt, int offset, Object *owner, uint32_t drc_type_mask);
bool spapr_drc_attach(SpaprDrc *drc, DeviceState *d, Error **errp); /*
* These functions respectively abort if called with a device already
* attached or no device attached. In the case of spapr_drc_attach(),
* this means that the attachability of the DRC *must* be checked
* beforehand (eg. check drc->dev at pre-plug).
*/
void spapr_drc_attach(SpaprDrc *drc, DeviceState *d);
void spapr_drc_detach(SpaprDrc *drc); void spapr_drc_detach(SpaprDrc *drc);
/* Returns true if a hot plug/unplug request is pending */ /* Returns true if a hot plug/unplug request is pending */