[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH 4/6] spapr: sanitize error handling in spapr_ics_creat
From: |
Greg Kurz |
Subject: |
[Qemu-ppc] [PATCH 4/6] spapr: sanitize error handling in spapr_ics_create() |
Date: |
Mon, 15 May 2017 13:39:45 +0200 |
User-agent: |
StGit/0.17.1-20-gc0b1b-dirty |
The spapr_ics_create() function handles errors in a rather convoluted
way, with two local Error * variables. Moreover, failing to parent the
ICS object to the machine should be considered as a bug but it is
currently ignored.
This patch addresses both issues.
Signed-off-by: Greg Kurz <address@hidden>
---
hw/ppc/spapr.c | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index 44f7dc7f40e9..c53989bb10b1 100644
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -101,21 +101,26 @@ static ICSState *spapr_ics_create(sPAPRMachineState
*spapr,
const char *type_ics,
int nr_irqs, Error **errp)
{
- Error *err = NULL, *local_err = NULL;
+ Error *local_err = NULL;
Object *obj;
obj = object_new(type_ics);
- object_property_add_child(OBJECT(spapr), "ics", obj, NULL);
+ object_property_add_child(OBJECT(spapr), "ics", obj, &error_abort);
object_property_add_const_link(obj, "xics", OBJECT(spapr), &error_abort);
- object_property_set_int(obj, nr_irqs, "nr-irqs", &err);
+ object_property_set_int(obj, nr_irqs, "nr-irqs", &local_err);
+ if (local_err) {
+ goto error;
+ }
object_property_set_bool(obj, true, "realized", &local_err);
- error_propagate(&err, local_err);
- if (err) {
- error_propagate(errp, err);
- return NULL;
+ if (local_err) {
+ goto error;
}
return ICS_SIMPLE(obj);
+
+error:
+ error_propagate(errp, local_err);
+ return NULL;
}
static void xics_system_init(MachineState *machine, int nr_irqs, Error **errp)
- Re: [Qemu-ppc] [PATCH 1/6] ppc/xics: simplify prototype of xics_spapr_init(), (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 <=
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, 2017/05/15
[Qemu-ppc] [PATCH 6/6] spapr: fix migration of ICP objects from/to older QEMU, Greg Kurz, 2017/05/15