aboutsummaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2020-07-07 18:06:08 +0200
committerMarkus Armbruster <armbru@redhat.com>2020-07-10 15:18:08 +0200
commitcdd2b228b973d2a29edf7696ef6e8b08ec329019 (patch)
tree62589efa47ef8b41d83495b37d6311d084d87c6d /docs
parentb11a093c6025635b4504d79d30daa334a01279a5 (diff)
downloadqemu-cdd2b228b973d2a29edf7696ef6e8b08ec329019.zip
qemu-cdd2b228b973d2a29edf7696ef6e8b08ec329019.tar.gz
qemu-cdd2b228b973d2a29edf7696ef6e8b08ec329019.tar.bz2
qapi: Smooth visitor error checking in generated code
Use visitor functions' return values to check for failure. Eliminate error_propagate() that are now unnecessary. Delete @err that are now unused. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com> Message-Id: <20200707160613.848843-41-armbru@redhat.com>
Diffstat (limited to 'docs')
-rw-r--r--docs/devel/qapi-code-gen.txt60
1 files changed, 23 insertions, 37 deletions
diff --git a/docs/devel/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt
index 9bfc570..69eede6 100644
--- a/docs/devel/qapi-code-gen.txt
+++ b/docs/devel/qapi-code-gen.txt
@@ -1420,8 +1420,6 @@ Example:
bool visit_type_UserDefOne_members(Visitor *v, UserDefOne *obj, Error **errp)
{
- Error *err = NULL;
-
if (!visit_type_int(v, "integer", &obj->integer, errp)) {
return false;
}
@@ -1430,13 +1428,12 @@ Example:
return false;
}
}
- error_propagate(errp, err);
- return !err;
+ return true;
}
bool visit_type_UserDefOne(Visitor *v, const char *name, UserDefOne **obj, Error **errp)
{
- Error *err = NULL;
+ bool ok = false;
if (!visit_start_struct(v, name, (void **)obj, sizeof(UserDefOne), errp)) {
return false;
@@ -1446,24 +1443,22 @@ Example:
assert(visit_is_dealloc(v));
goto out_obj;
}
- visit_type_UserDefOne_members(v, *obj, &err);
- if (err) {
+ if (!visit_type_UserDefOne_members(v, *obj, errp)) {
goto out_obj;
}
- visit_check_struct(v, &err);
+ ok = visit_check_struct(v, errp);
out_obj:
visit_end_struct(v, (void **)obj);
- if (err && visit_is_input(v)) {
+ if (!ok && visit_is_input(v)) {
qapi_free_UserDefOne(*obj);
*obj = NULL;
}
- error_propagate(errp, err);
- return !err;
+ return ok;
}
bool visit_type_UserDefOneList(Visitor *v, const char *name, UserDefOneList **obj, Error **errp)
{
- Error *err = NULL;
+ bool ok = false;
UserDefOneList *tail;
size_t size = sizeof(**obj);
@@ -1473,33 +1468,27 @@ Example:
for (tail = *obj; tail;
tail = (UserDefOneList *)visit_next_list(v, (GenericList *)tail, size)) {
- visit_type_UserDefOne(v, NULL, &tail->value, &err);
- if (err) {
- break;
+ if (!visit_type_UserDefOne(v, NULL, &tail->value, errp)) {
+ goto out_obj;
}
}
- if (!err) {
- visit_check_list(v, &err);
- }
+ ok = visit_check_list(v, errp);
+ out_obj:
visit_end_list(v, (void **)obj);
- if (err && visit_is_input(v)) {
+ if (!ok && visit_is_input(v)) {
qapi_free_UserDefOneList(*obj);
*obj = NULL;
}
- error_propagate(errp, err);
- return !err;
+ return ok;
}
bool visit_type_q_obj_my_command_arg_members(Visitor *v, q_obj_my_command_arg *obj, Error **errp)
{
- Error *err = NULL;
-
if (!visit_type_UserDefOneList(v, "arg1", &obj->arg1, errp)) {
return false;
}
- error_propagate(errp, err);
- return !err;
+ return true;
}
[Uninteresting stuff omitted...]
@@ -1554,15 +1543,12 @@ Example:
static void qmp_marshal_output_UserDefOne(UserDefOne *ret_in, QObject **ret_out, Error **errp)
{
- Error *err = NULL;
Visitor *v;
v = qobject_output_visitor_new(ret_out);
- visit_type_UserDefOne(v, "unused", &ret_in, &err);
- if (!err) {
+ if (visit_type_UserDefOne(v, "unused", &ret_in, errp)) {
visit_complete(v, ret_out);
}
- error_propagate(errp, err);
visit_free(v);
v = qapi_dealloc_visitor_new();
visit_type_UserDefOne(v, "unused", &ret_in, NULL);
@@ -1572,33 +1558,32 @@ Example:
void qmp_marshal_my_command(QDict *args, QObject **ret, Error **errp)
{
Error *err = NULL;
+ bool ok = false;
Visitor *v;
UserDefOne *retval;
q_obj_my_command_arg arg = {0};
v = qobject_input_visitor_new(QOBJECT(args));
- visit_start_struct(v, NULL, NULL, 0, &err);
- if (err) {
+ if (!visit_start_struct(v, NULL, NULL, 0, errp)) {
goto out;
}
- visit_type_q_obj_my_command_arg_members(v, &arg, &err);
- if (!err) {
- visit_check_struct(v, &err);
+ if (visit_type_q_obj_my_command_arg_members(v, &arg, errp)) {
+ ok = visit_check_struct(v, errp);
}
visit_end_struct(v, NULL);
- if (err) {
+ if (!ok) {
goto out;
}
retval = qmp_my_command(arg.arg1, &err);
+ error_propagate(errp, err);
if (err) {
goto out;
}
- qmp_marshal_output_UserDefOne(retval, ret, &err);
+ qmp_marshal_output_UserDefOne(retval, ret, errp);
out:
- error_propagate(errp, err);
visit_free(v);
v = qapi_dealloc_visitor_new();
visit_start_struct(v, NULL, NULL, 0, NULL);
@@ -1606,6 +1591,7 @@ Example:
visit_end_struct(v, NULL);
visit_free(v);
}
+
[Uninteresting stuff omitted...]
$ cat qapi-generated/example-qapi-init-commands.h
[Uninteresting stuff omitted...]