Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-10 03:59:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

spapr: Simplify error handling in prop_get_fdt()

Browse Source 
Use the return value of visit_check_struct() and visit_check_list()
for error checking instead of local_err. This allows to get rid of
the error propagation overhead.

Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <20200914123505.612812-10-groug@kaod.org>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
Greg Kurz 2020-09-14 14:34:59 +02:00 committed by David Gibson
parent 17548fe64a
commit ebd226d221
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
hw/ppc/spapr_drc.c
View File

@ -302,7 +302,6 @@ static void prop_get_fdt(Object *obj, Visitor *v, const char *name,
{ {
SpaprDrc *drc = SPAPR_DR_CONNECTOR(obj); SpaprDrc *drc = SPAPR_DR_CONNECTOR(obj);
QNull *null = NULL; QNull *null = NULL;
Error *err = NULL;
int fdt_offset_next, fdt_offset, fdt_depth; int fdt_offset_next, fdt_offset, fdt_depth;
void *fdt; void *fdt;
@ -321,6 +320,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, const char *name,
const struct fdt_property *prop = NULL; const struct fdt_property *prop = NULL;
int prop_len = 0, name_len = 0; int prop_len = 0, name_len = 0;
uint32_t tag; uint32_t tag;
bool ok;
tag = fdt_next_tag(fdt, fdt_offset, &fdt_offset_next); tag = fdt_next_tag(fdt, fdt_offset, &fdt_offset_next);
switch (tag) { switch (tag) {
@ -334,10 +334,9 @@ static void prop_get_fdt(Object *obj, Visitor *v, const char *name,
case FDT_END_NODE: case FDT_END_NODE:
/* shouldn't ever see an FDT_END_NODE before FDT_BEGIN_NODE */ /* shouldn't ever see an FDT_END_NODE before FDT_BEGIN_NODE */
g_assert(fdt_depth > 0); g_assert(fdt_depth > 0);
visit_check_struct(v, &err); ok = visit_check_struct(v, errp);
visit_end_struct(v, NULL); visit_end_struct(v, NULL);
if (err) { if (!ok) {
error_propagate(errp, err);
return; return;
} }
fdt_depth--; fdt_depth--;
@ -355,10 +354,9 @@ static void prop_get_fdt(Object *obj, Visitor *v, const char *name,
return; return;
} }
} }
visit_check_list(v, &err); ok = visit_check_list(v, errp);
visit_end_list(v, NULL); visit_end_list(v, NULL);
if (err) { if (!ok) {
error_propagate(errp, err);
return; return;
} }
break; break;