xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-26 04:50:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spapr: fix memory hotplug error path

Browse Source 
QEMU shouldn't abort if spapr_add_lmbs()->spapr_drc_attach() fails.
Let's propagate the error instead, like it is done everywhere else
where spapr_drc_attach() is called.

Signed-off-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Daniel Barboza <danielhb@linux.vnet.ibm.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Greg Kurz 2017-07-03 16:54:36 +02:00 committed by David Gibson
parent 95cb065776
commit 160bb67885
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
hw/ppc/spapr.c
View File

@ -2601,6 +2601,7 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t addr_start, uint64_t size,
int i, fdt_offset, fdt_size; int i, fdt_offset, fdt_size;
void *fdt; void *fdt;
uint64_t addr = addr_start; uint64_t addr = addr_start;
Error *local_err = NULL;
for (i = 0; i < nr_lmbs; i++) { for (i = 0; i < nr_lmbs; i++) {
drc = spapr_drc_by_id(TYPE_SPAPR_DRC_LMB, drc = spapr_drc_by_id(TYPE_SPAPR_DRC_LMB,
@ -2611,7 +2612,18 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t addr_start, uint64_t size,
fdt_offset = spapr_populate_memory_node(fdt, node, addr, fdt_offset = spapr_populate_memory_node(fdt, node, addr,
SPAPR_MEMORY_BLOCK_SIZE); SPAPR_MEMORY_BLOCK_SIZE);
spapr_drc_attach(drc, dev, fdt, fdt_offset, errp); spapr_drc_attach(drc, dev, fdt, fdt_offset, &local_err);
if (local_err) {
while (addr > addr_start) {
addr -= SPAPR_MEMORY_BLOCK_SIZE;
drc = spapr_drc_by_id(TYPE_SPAPR_DRC_LMB,
addr / SPAPR_MEMORY_BLOCK_SIZE);
spapr_drc_detach(drc, dev, NULL);
}
g_free(fdt);
error_propagate(errp, local_err);
return;
}
addr += SPAPR_MEMORY_BLOCK_SIZE; addr += SPAPR_MEMORY_BLOCK_SIZE;
} }
/* send hotplug notification to the /* send hotplug notification to the
@ -2651,14 +2663,20 @@ static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
addr = object_property_get_uint(OBJECT(dimm), addr = object_property_get_uint(OBJECT(dimm),
PC_DIMM_ADDR_PROP, &local_err); PC_DIMM_ADDR_PROP, &local_err);
if (local_err) { if (local_err) {
pc_dimm_memory_unplug(dev, &ms->hotplug_memory, mr); goto out_unplug;
goto out;
} }
spapr_add_lmbs(dev, addr, size, node, spapr_add_lmbs(dev, addr, size, node,
spapr_ovec_test(ms->ov5_cas, OV5_HP_EVT), spapr_ovec_test(ms->ov5_cas, OV5_HP_EVT),
&error_abort); &local_err);
if (local_err) {
goto out_unplug;
}
return;
out_unplug:
pc_dimm_memory_unplug(dev, &ms->hotplug_memory, mr);
out: out:
error_propagate(errp, local_err); error_propagate(errp, local_err);
} }