system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-10-14 15:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Drop unused error argument for list and implicit struct

Browse source 
No backend was setting an error when ending the visit of a list or
implicit struct, or when moving to the next list node.  Make the
callers a bit easier to follow by making this a part of the contract,
and removing the errp argument - callers can then unconditionally end
an object as part of cleanup without having to think about whether a
second error is dominated by a first, because there is no second
error.

A later patch will then tackle the larger task of splitting
visit_end_struct(), which can indeed set an error.

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1454075341-13658-24-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2016-01-29 06:48:59 -07:00 committed by Markus Armbruster
parent bdd8e6b5d8
commit 08f9541dec
11 changed files with 41 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
hw/ppc/spapr_drc.c
View file

@ -315,11 +315,7 @@ static void prop_get_fdt(Object *obj, Visitor *v, const char *name,
return; return;
} }
} }
visit_end_list(v, &err); visit_end_list(v);
if (err) {
error_propagate(errp, err);
return;
}
break; break;
} }
default: default:

9
include/qapi/visitor-impl.h
View file

@ -24,11 +24,14 @@ struct Visitor
void (*start_implicit_struct)(Visitor *v, void **obj, size_t size, void (*start_implicit_struct)(Visitor *v, void **obj, size_t size,
Error **errp); Error **errp);
void (*end_implicit_struct)(Visitor *v, Error **errp); /* May be NULL */
void (*end_implicit_struct)(Visitor *v);
void (*start_list)(Visitor *v, const char *name, Error **errp); void (*start_list)(Visitor *v, const char *name, Error **errp);
GenericList *(*next_list)(Visitor *v, GenericList **list, Error **errp); /* Must be set */
void (*end_list)(Visitor *v, Error **errp); GenericList *(*next_list)(Visitor *v, GenericList **list);
/* Must be set */
void (*end_list)(Visitor *v);
void (*type_enum)(Visitor *v, const char *name, int *obj, void (*type_enum)(Visitor *v, const char *name, int *obj,
const char *const strings[], Error **errp); const char *const strings[], Error **errp);

8
include/qapi/visitor.h
View file

@ -1,6 +1,7 @@
/* /*
* Core Definitions for QAPI Visitor Classes * Core Definitions for QAPI Visitor Classes
* *
* Copyright (C) 2012-2016 Red Hat, Inc.
* Copyright IBM, Corp. 2011 * Copyright IBM, Corp. 2011
* *
* Authors: * Authors:
@ -32,10 +33,11 @@ void visit_start_struct(Visitor *v, const char *name, void **obj,
void visit_end_struct(Visitor *v, Error **errp); void visit_end_struct(Visitor *v, Error **errp);
void visit_start_implicit_struct(Visitor *v, void **obj, size_t size, void visit_start_implicit_struct(Visitor *v, void **obj, size_t size,
Error **errp); Error **errp);
void visit_end_implicit_struct(Visitor *v, Error **errp); void visit_end_implicit_struct(Visitor *v);
void visit_start_list(Visitor *v, const char *name, Error **errp); void visit_start_list(Visitor *v, const char *name, Error **errp);
GenericList *visit_next_list(Visitor *v, GenericList **list, Error **errp); GenericList *visit_next_list(Visitor *v, GenericList **list);
void visit_end_list(Visitor *v, Error **errp); void visit_end_list(Visitor *v);
/** /**
* Check if an optional member @name of an object needs visiting. * Check if an optional member @name of an object needs visiting.

6
qapi/opts-visitor.c
View file

@ -1,7 +1,7 @@
/* /*
* Options Visitor * Options Visitor
* *
* Copyright Red Hat, Inc. 2012, 2013 * Copyright Red Hat, Inc. 2012-2016
* *
* Author: Laszlo Ersek <lersek@redhat.com> * Author: Laszlo Ersek <lersek@redhat.com>
* *
@ -221,7 +221,7 @@ opts_start_list(Visitor *v, const char *name, Error **errp)
static GenericList * static GenericList *
opts_next_list(Visitor *v, GenericList **list, Error **errp) opts_next_list(Visitor *v, GenericList **list)
{ {
OptsVisitor *ov = to_ov(v); OptsVisitor *ov = to_ov(v);
GenericList **link; GenericList **link;
@ -270,7 +270,7 @@ opts_next_list(Visitor *v, GenericList **list, Error **errp)
static void static void
opts_end_list(Visitor *v, Error **errp) opts_end_list(Visitor *v)
{ {
OptsVisitor *ov = to_ov(v); OptsVisitor *ov = to_ov(v);

8
qapi/qapi-dealloc-visitor.c
View file

@ -1,6 +1,7 @@
/* /*
* Dealloc Visitor * Dealloc Visitor
* *
* Copyright (C) 2012-2016 Red Hat, Inc.
* Copyright IBM, Corp. 2011 * Copyright IBM, Corp. 2011
* *
* Authors: * Authors:
@ -84,7 +85,7 @@ static void qapi_dealloc_start_implicit_struct(Visitor *v,
qapi_dealloc_push(qov, obj); qapi_dealloc_push(qov, obj);
} }
static void qapi_dealloc_end_implicit_struct(Visitor *v, Error **errp) static void qapi_dealloc_end_implicit_struct(Visitor *v)
{ {
QapiDeallocVisitor *qov = to_qov(v); QapiDeallocVisitor *qov = to_qov(v);
void **obj = qapi_dealloc_pop(qov); void **obj = qapi_dealloc_pop(qov);
@ -99,8 +100,7 @@ static void qapi_dealloc_start_list(Visitor *v, const char *name, Error **errp)
qapi_dealloc_push(qov, NULL); qapi_dealloc_push(qov, NULL);
} }
static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp, static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp)
Error **errp)
{ {
GenericList *list = *listp; GenericList *list = *listp;
QapiDeallocVisitor *qov = to_qov(v); QapiDeallocVisitor *qov = to_qov(v);
@ -120,7 +120,7 @@ static GenericList *qapi_dealloc_next_list(Visitor *v, GenericList **listp,
return NULL; return NULL;
} }
static void qapi_dealloc_end_list(Visitor *v, Error **errp) static void qapi_dealloc_end_list(Visitor *v)
{ {
QapiDeallocVisitor *qov = to_qov(v); QapiDeallocVisitor *qov = to_qov(v);
void *obj = qapi_dealloc_pop(qov); void *obj = qapi_dealloc_pop(qov);

12
qapi/qapi-visit-core.c
View file

@ -38,10 +38,10 @@ void visit_start_implicit_struct(Visitor *v, void **obj, size_t size,
} }
} }
void visit_end_implicit_struct(Visitor *v, Error **errp) void visit_end_implicit_struct(Visitor *v)
{ {
if (v->end_implicit_struct) { if (v->end_implicit_struct) {
v->end_implicit_struct(v, errp); v->end_implicit_struct(v);
} }
} }
@ -50,14 +50,14 @@ void visit_start_list(Visitor *v, const char *name, Error **errp)
v->start_list(v, name, errp); v->start_list(v, name, errp);
} }
GenericList *visit_next_list(Visitor *v, GenericList **list, Error **errp) GenericList *visit_next_list(Visitor *v, GenericList **list)
{ {
return v->next_list(v, list, errp); return v->next_list(v, list);
} }
void visit_end_list(Visitor *v, Error **errp) void visit_end_list(Visitor *v)
{ {
v->end_list(v, errp); v->end_list(v);
} }
bool visit_start_union(Visitor *v, bool data_present, Error **errp) bool visit_start_union(Visitor *v, bool data_present, Error **errp)

11
qapi/qmp-input-visitor.c
View file

@ -1,6 +1,7 @@
/* /*
* Input Visitor * Input Visitor
* *
* Copyright (C) 2012-2016 Red Hat, Inc.
* Copyright IBM, Corp. 2011 * Copyright IBM, Corp. 2011
* *
* Authors: * Authors:
@ -154,10 +155,6 @@ static void qmp_input_start_implicit_struct(Visitor *v, void **obj,
} }
} }
static void qmp_input_end_implicit_struct(Visitor *v, Error **errp)
{
}
static void qmp_input_start_list(Visitor *v, const char *name, Error **errp) static void qmp_input_start_list(Visitor *v, const char *name, Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
@ -172,8 +169,7 @@ static void qmp_input_start_list(Visitor *v, const char *name, Error **errp)
qmp_input_push(qiv, qobj, errp); qmp_input_push(qiv, qobj, errp);
} }
static GenericList *qmp_input_next_list(Visitor *v, GenericList **list, static GenericList *qmp_input_next_list(Visitor *v, GenericList **list)
Error **errp)
{ {
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
GenericList *entry; GenericList *entry;
@ -202,7 +198,7 @@ static GenericList *qmp_input_next_list(Visitor *v, GenericList **list,
return entry; return entry;
} }
static void qmp_input_end_list(Visitor *v, Error **errp) static void qmp_input_end_list(Visitor *v)
{ {
QmpInputVisitor *qiv = to_qiv(v); QmpInputVisitor *qiv = to_qiv(v);
@ -353,7 +349,6 @@ QmpInputVisitor *qmp_input_visitor_new(QObject *obj)
v->visitor.start_struct = qmp_input_start_struct; v->visitor.start_struct = qmp_input_start_struct;
v->visitor.end_struct = qmp_input_end_struct; v->visitor.end_struct = qmp_input_end_struct;
v->visitor.start_implicit_struct = qmp_input_start_implicit_struct; v->visitor.start_implicit_struct = qmp_input_start_implicit_struct;
v->visitor.end_implicit_struct = qmp_input_end_implicit_struct;
v->visitor.start_list = qmp_input_start_list; v->visitor.start_list = qmp_input_start_list;
v->visitor.next_list = qmp_input_next_list; v->visitor.next_list = qmp_input_next_list;
v->visitor.end_list = qmp_input_end_list; v->visitor.end_list = qmp_input_end_list;

6
qapi/qmp-output-visitor.c
View file

@ -1,6 +1,7 @@
/* /*
* Core Definitions for QAPI/QMP Command Registry * Core Definitions for QAPI/QMP Command Registry
* *
* Copyright (C) 2012-2016 Red Hat, Inc.
* Copyright IBM, Corp. 2011 * Copyright IBM, Corp. 2011
* *
* Authors: * Authors:
@ -136,8 +137,7 @@ static void qmp_output_start_list(Visitor *v, const char *name, Error **errp)
qmp_output_push(qov, list); qmp_output_push(qov, list);
} }
static GenericList *qmp_output_next_list(Visitor *v, GenericList **listp, static GenericList *qmp_output_next_list(Visitor *v, GenericList **listp)
Error **errp)
{ {
GenericList *list = *listp; GenericList *list = *listp;
QmpOutputVisitor *qov = to_qov(v); QmpOutputVisitor *qov = to_qov(v);
@ -152,7 +152,7 @@ static GenericList *qmp_output_next_list(Visitor *v, GenericList **listp,
return list ? list->next : NULL; return list ? list->next : NULL;
} }
static void qmp_output_end_list(Visitor *v, Error **errp) static void qmp_output_end_list(Visitor *v)
{ {
QmpOutputVisitor *qov = to_qov(v); QmpOutputVisitor *qov = to_qov(v);
qmp_output_pop(qov); qmp_output_pop(qov);

8
qapi/string-input-visitor.c
View file

@ -1,7 +1,7 @@
/* /*
* String parsing visitor * String parsing visitor
* *
* Copyright Red Hat, Inc. 2012 * Copyright Red Hat, Inc. 2012-2016
* *
* Author: Paolo Bonzini <pbonzini@redhat.com> * Author: Paolo Bonzini <pbonzini@redhat.com>
* *
@ -139,8 +139,7 @@ start_list(Visitor *v, const char *name, Error **errp)
} }
} }
static GenericList * static GenericList *next_list(Visitor *v, GenericList **list)
next_list(Visitor *v, GenericList **list, Error **errp)
{ {
StringInputVisitor *siv = to_siv(v); StringInputVisitor *siv = to_siv(v);
GenericList **link; GenericList **link;
@ -178,8 +177,7 @@ next_list(Visitor *v, GenericList **list, Error **errp)
return *link; return *link;
} }
static void static void end_list(Visitor *v)
end_list(Visitor *v, Error **errp)
{ {
StringInputVisitor *siv = to_siv(v); StringInputVisitor *siv = to_siv(v);
siv->head = true; siv->head = true;

8
qapi/string-output-visitor.c
View file

@ -1,7 +1,7 @@
/* /*
* String printing Visitor * String printing Visitor
* *
* Copyright Red Hat, Inc. 2012 * Copyright Red Hat, Inc. 2012-2016
* *
* Author: Paolo Bonzini <pbonzini@redhat.com> * Author: Paolo Bonzini <pbonzini@redhat.com>
* *
@ -276,8 +276,7 @@ start_list(Visitor *v, const char *name, Error **errp)
sov->head = true; sov->head = true;
} }
static GenericList * static GenericList *next_list(Visitor *v, GenericList **list)
next_list(Visitor *v, GenericList **list, Error **errp)
{ {
StringOutputVisitor *sov = to_sov(v); StringOutputVisitor *sov = to_sov(v);
GenericList *ret = NULL; GenericList *ret = NULL;
@ -303,8 +302,7 @@ next_list(Visitor *v, GenericList **list, Error **errp)
return ret; return ret;
} }
static void static void end_list(Visitor *v)
end_list(Visitor *v, Error **errp)
{ {
StringOutputVisitor *sov = to_sov(v); StringOutputVisitor *sov = to_sov(v);

12
scripts/qapi-visit.py
View file

@ -62,7 +62,7 @@ def gen_visit_implicit_struct(typ):
visit_start_implicit_struct(v, (void **)obj, sizeof(%(c_type)s), &err); visit_start_implicit_struct(v, (void **)obj, sizeof(%(c_type)s), &err);
if (!err) { if (!err) {
visit_type_%(c_type)s_fields(v, obj, errp); visit_type_%(c_type)s_fields(v, obj, errp);
visit_end_implicit_struct(v, &err); visit_end_implicit_struct(v);
} }
error_propagate(errp, err); error_propagate(errp, err);
} }
@ -161,15 +161,13 @@ def gen_visit_list(name, element_type):
} }
for (prev = (GenericList **)obj; for (prev = (GenericList **)obj;
!err && (i = visit_next_list(v, prev, &err)) != NULL; !err && (i = visit_next_list(v, prev)) != NULL;
prev = &i) { prev = &i) {
%(c_name)s *native_i = (%(c_name)s *)i; %(c_name)s *native_i = (%(c_name)s *)i;
visit_type_%(c_elt_type)s(v, NULL, &native_i->value, &err); visit_type_%(c_elt_type)s(v, NULL, &native_i->value, &err);
} }
error_propagate(errp, err); visit_end_list(v);
err = NULL;
visit_end_list(v, &err);
out: out:
error_propagate(errp, err); error_propagate(errp, err);
} }
@ -230,9 +228,7 @@ def gen_visit_alternate(name, variants):
"%(name)s"); "%(name)s");
} }
out_obj: out_obj:
error_propagate(errp, err); visit_end_implicit_struct(v);
err = NULL;
visit_end_implicit_struct(v, &err);
out: out:
error_propagate(errp, err); error_propagate(errp, err);
} }