[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 5/6] spapr-cpu-core: release ICP object when realizati
From: |
Greg Kurz |
Subject: |
[Qemu-ppc] [PATCH 5/6] spapr-cpu-core: release ICP object when realization fails |
Date: |
Mon, 15 May 2017 13:39:55 +0200 |
User-agent: |
StGit/0.17.1-20-gc0b1b-dirty |
While here we introduce a single error path to avoid code duplication.
Signed-off-by: Greg Kurz <address@hidden>
---
hw/ppc/spapr_cpu_core.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c
index 4389ef4c2aef..63d160f7e010 100644
--- a/hw/ppc/spapr_cpu_core.c
+++ b/hw/ppc/spapr_cpu_core.c
@@ -147,25 +147,25 @@ static void spapr_cpu_core_realize_child(Object *child,
Error **errp)
object_property_add_const_link(obj, "xics", OBJECT(spapr), &error_abort);
object_property_set_bool(obj, true, "realized", &local_err);
if (local_err) {
- error_propagate(errp, local_err);
- return;
+ goto error;
}
object_property_set_bool(child, true, "realized", &local_err);
if (local_err) {
- object_unparent(obj);
- error_propagate(errp, local_err);
- return;
+ goto error;
}
spapr_cpu_init(spapr, cpu, &local_err);
if (local_err) {
- object_unparent(obj);
- error_propagate(errp, local_err);
- return;
+ goto error;
}
xics_cpu_setup(XICS_FABRIC(spapr), cpu, ICP(obj));
+ return;
+
+error:
+ object_unparent(obj);
+ error_propagate(errp, local_err);
}
static void spapr_cpu_core_realize(DeviceState *dev, Error **errp)
- Re: [Qemu-ppc] [PATCH 2/6] spapr: fix error path of required kernel-irqchip, (continued)
[Qemu-ppc] [PATCH 3/6] spapr: fix error reporting in xics_system_init(), Greg Kurz, 2017/05/15
[Qemu-ppc] [PATCH 4/6] spapr: sanitize error handling in spapr_ics_create(), Greg Kurz, 2017/05/15
Re: [Qemu-ppc] [PATCH 4/6] spapr: sanitize error handling in spapr_ics_create(), David Gibson, 2017/05/16
[Qemu-ppc] [PATCH 5/6] spapr-cpu-core: release ICP object when realization fails,
Greg Kurz <=
[Qemu-ppc] [PATCH 6/6] spapr: fix migration of ICP objects from/to older QEMU, Greg Kurz, 2017/05/15
Re: [Qemu-ppc] [PATCH 6/6] spapr: fix migration of ICP objects from/to older QEMU, Cédric Le Goater, 2017/05/15