]> git.proxmox.com Git - mirror_qemu.git/commit
qapi: Split visit_end_struct() into pieces
authorEric Blake <eblake@redhat.com>
Thu, 28 Apr 2016 21:45:27 +0000 (15:45 -0600)
committerMarkus Armbruster <armbru@redhat.com>
Thu, 12 May 2016 07:47:55 +0000 (09:47 +0200)
commit15c2f669e3fb2bc97f7b42d1871f595c0ac24af8
treed5baa8f103d90e6d13d51d351b869b6cde427413
parent56a6f02b8ce1fe41a2a9077593e46eca7d98267d
qapi: Split visit_end_struct() into pieces

As mentioned in previous patches, we want to call visit_end_struct()
functions unconditionally, so that visitors can release resources
tied up since the matching visit_start_struct() without also having
to worry about error priority if more than one error occurs.

Even though error_propagate() can be safely used to ignore a second
error during cleanup caused by a first error, it is simpler if the
cleanup cannot set an error.  So, split out the error checking
portion (basically, input visitors checking for unvisited keys) into
a new function visit_check_struct(), which can be safely skipped if
any earlier errors are encountered, and leave the cleanup portion
(which never fails, but must be called unconditionally if
visit_start_struct() succeeded) in visit_end_struct().

Generated code in qapi-visit.c has diffs resembling:

|@@ -59,10 +59,12 @@ void visit_type_ACPIOSTInfo(Visitor *v,
|         goto out_obj;
|     }
|     visit_type_ACPIOSTInfo_members(v, obj, &err);
|-    error_propagate(errp, err);
|-    err = NULL;
|+    if (err) {
|+        goto out_obj;
|+    }
|+    visit_check_struct(v, &err);
| out_obj:
|-    visit_end_struct(v, &err);
|+    visit_end_struct(v);
| out:

and in qapi-event.c:

@@ -47,7 +47,10 @@ void qapi_event_send_acpi_device_ost(ACP
|         goto out;
|     }
|     visit_type_q_obj_ACPI_DEVICE_OST_arg_members(v, &param, &err);
|-    visit_end_struct(v, err ? NULL : &err);
|+    if (!err) {
|+        visit_check_struct(v, &err);
|+    }
|+    visit_end_struct(v);
|     if (err) {
|         goto out;

Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1461879932-9020-20-git-send-email-eblake@redhat.com>
[Conflict with a doc fixup resolved]
Signed-off-by: Markus Armbruster <armbru@redhat.com>
18 files changed:
block/crypto.c
docs/qapi-code-gen.txt
hw/ppc/spapr_drc.c
hw/virtio/virtio-balloon.c
include/qapi/visitor-impl.h
include/qapi/visitor.h
qapi/opts-visitor.c
qapi/qapi-dealloc-visitor.c
qapi/qapi-visit-core.c
qapi/qmp-input-visitor.c
qapi/qmp-output-visitor.c
qom/object.c
qom/object_interfaces.c
scripts/qapi-commands.py
scripts/qapi-event.py
scripts/qapi-visit.py
tests/test-qmp-input-visitor.c
tests/test-qmp-output-visitor.c