[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PULL 13/17] spapr: fix memory hotplug error path
From: |
David Gibson |
Subject: |
[Qemu-ppc] [PULL 13/17] spapr: fix memory hotplug error path |
Date: |
Tue, 11 Jul 2017 14:39:13 +1000 |
From: Greg Kurz <address@hidden>
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 <address@hidden>
Reviewed-by: Daniel Barboza <address@hidden>
Signed-off-by: David Gibson <address@hidden>
---
hw/ppc/spapr.c | 26 ++++++++++++++++++++++----
1 file changed, 22 insertions(+), 4 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 70b3fd3..ba8f57a 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -2601,6 +2601,7 @@ static void spapr_add_lmbs(DeviceState *dev, uint64_t
addr_start, uint64_t size,
int i, fdt_offset, fdt_size;
void *fdt;
uint64_t addr = addr_start;
+ Error *local_err = NULL;
for (i = 0; i < nr_lmbs; i++) {
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,
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;
}
/* 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),
PC_DIMM_ADDR_PROP, &local_err);
if (local_err) {
- pc_dimm_memory_unplug(dev, &ms->hotplug_memory, mr);
- goto out;
+ goto out_unplug;
}
spapr_add_lmbs(dev, addr, size, node,
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:
error_propagate(errp, local_err);
}
--
2.9.4
- [Qemu-ppc] [PULL 00/17] ppc-for-2.10 queue 20170711, David Gibson, 2017/07/11
- [Qemu-ppc] [PULL 01/17] spapr: make spapr_populate_hotplug_cpu_dt() static, David Gibson, 2017/07/11
- [Qemu-ppc] [PULL 03/17] spapr: fix bogus function name in comment, David Gibson, 2017/07/11
- [Qemu-ppc] [PULL 12/17] target/ppc: Add debug function for radix mmu translation, David Gibson, 2017/07/11
- [Qemu-ppc] [PULL 11/17] target/ppc: Refactor tcg radix mmu code, David Gibson, 2017/07/11
- [Qemu-ppc] [PULL 07/17] spapr: Uniform DRC reset paths, David Gibson, 2017/07/11
- [Qemu-ppc] [PULL 14/17] spapr: Only report host/guest IOMMU page size mismatches on KVM, David Gibson, 2017/07/11
- [Qemu-ppc] [PULL 17/17] spapr: populate device tree depending on XIVE_EXPLOIT option, David Gibson, 2017/07/11
- [Qemu-ppc] [PULL 13/17] spapr: fix memory hotplug error path,
David Gibson <=
- [Qemu-ppc] [PULL 10/17] spapr: Use unplug_request for PCI hot unplug, David Gibson, 2017/07/11
- [Qemu-ppc] [PULL 09/17] spapr: Remove unnecessary differences between hotplug and coldplug paths, David Gibson, 2017/07/11
- [Qemu-ppc] [PULL 16/17] spapr: introduce the XIVE_EXPLOIT option in CAS, David Gibson, 2017/07/11
- [Qemu-ppc] [PULL 15/17] ppc/kvm: have the "family" CPU alias to point to TYPE_HOST_POWERPC_CPU, David Gibson, 2017/07/11
- [Qemu-ppc] [PULL 02/17] spapr: refresh "platform-specific" hcalls comment, David Gibson, 2017/07/11
- [Qemu-ppc] [PULL 04/17] spapr: fix migration to pseries machine < 2.8, David Gibson, 2017/07/11
- [Qemu-ppc] [PULL 06/17] spapr: Leave DR-indicator management to the guest, David Gibson, 2017/07/11