From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 15/31] qapi: Track all failures between visit_start/stop
Date: Tue, 9 Feb 2016 12:37:47 +0100 [thread overview]
Message-ID: <1455017883-25867-16-git-send-email-armbru@redhat.com> (raw)
In-Reply-To: <1455017883-25867-1-git-send-email-armbru@redhat.com>
From: Eric Blake <eblake@redhat.com>
Inside the generated code between visit_start_struct() and
visit_end_struct(), we were blindly setting the error into
the caller's errp parameter. But a future patch to split
visit_end_struct() will require that we take action based
on whether an error has occurred, which requires us to track
all actions through a local err. Rewrite the visits to be
more in line with the other generated calls.
Generated code changes look like:
| visit_start_struct(v, (void **)obj, "Abort", name, sizeof(Abort), &err);
|- if (!err) {
|- if (*obj) {
|- visit_type_Abort_fields(v, obj, errp);
|- }
|- visit_end_struct(v, &err);
|+ if (err) {
|+ goto out;
| }
|+ if (!*obj) {
|+ goto out_obj;
|+ }
|+ visit_type_Abort_fields(v, obj, &err);
|+ error_propagate(errp, err);
|+ err = NULL;
|+out_obj:
|+ visit_end_struct(v, &err);
|+out:
| error_propagate(errp, err);
| }
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1454075341-13658-12-git-send-email-eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
scripts/qapi-visit.py | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index b93690b..ec16e36 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -2,7 +2,7 @@
# QAPI visitor generator
#
# Copyright IBM, Corp. 2011
-# Copyright (C) 2014-2015 Red Hat, Inc.
+# Copyright (C) 2014-2016 Red Hat, Inc.
#
# Authors:
# Anthony Liguori <aliguori@us.ibm.com>
@@ -123,12 +123,18 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error
Error *err = NULL;
visit_start_struct(v, (void **)obj, "%(name)s", name, sizeof(%(c_name)s), &err);
- if (!err) {
- if (*obj) {
- visit_type_%(c_name)s_fields(v, obj, errp);
- }
- visit_end_struct(v, &err);
+ if (err) {
+ goto out;
}
+ if (!*obj) {
+ goto out_obj;
+ }
+ visit_type_%(c_name)s_fields(v, obj, &err);
+ error_propagate(errp, err);
+ err = NULL;
+out_obj:
+ visit_end_struct(v, &err);
+out:
error_propagate(errp, err);
}
''',
--
2.4.3
next prev parent reply other threads:[~2016-02-09 11:38 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-09 11:37 [Qemu-devel] [PULL 00/31] QAPI patches for 2016-02-09 Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 01/31] qapi: Use Python 2.6 "except E as ..." syntax Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 02/31] scripts/qmp: " Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 03/31] Revert "tracetool: use Python 2.4-compatible exception handling syntax" Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 04/31] tests: Use Python 2.6 "except E as ..." syntax Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 05/31] qobject: Document more shortcomings in our number handling Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 06/31] qapi: Avoid use of misnamed DO_UPCAST() Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 07/31] qapi: Drop dead dealloc visitor variable Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 08/31] qapi: Dealloc visitor does not need a type_size() Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 09/31] qapi: Drop dead parameter in gen_params() Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 10/31] hmp: Drop pointless allocation during qapi visit Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 11/31] hmp: Cache use of qapi visitor Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 12/31] vl: Ensure qapi visitor properly ends struct visit Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 13/31] balloon: Improve use of qapi visitor Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 14/31] qapi: Improve generated event " Markus Armbruster
2016-02-09 11:37 ` Markus Armbruster [this message]
2016-02-09 11:37 ` [Qemu-devel] [PULL 16/31] qapi-visit: Kill unused visit_end_union() Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 17/31] qapi: Prefer type_int64 over type_int in visitors Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 18/31] qapi: Make all visitors supply uint64 callbacks Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 19/31] qapi: Consolidate visitor small integer callbacks Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 20/31] qapi: Don't cast Enum* to int* Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 21/31] qom: Use typedef for Visitor Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 22/31] qapi: Swap visit_* arguments for consistent 'name' placement Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 23/31] qom: Swap 'name' next to visitor in ObjectPropertyAccessor Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 24/31] qapi: Swap 'name' in visit_* callbacks to match public API Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 25/31] qapi: Drop unused 'kind' for struct/enum visit Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 26/31] qapi: Tighten qmp_input_end_list() Markus Armbruster
2016-02-09 11:37 ` [Qemu-devel] [PULL 27/31] qapi: Drop unused error argument for list and implicit struct Markus Armbruster
2016-02-09 11:38 ` [Qemu-devel] [PULL 28/31] qmp: Fix reference-counting of qnull on empty output visit Markus Armbruster
2016-02-09 11:38 ` [Qemu-devel] [PULL 29/31] qmp: Don't abuse stack to track qmp-output root Markus Armbruster
2016-02-09 11:38 ` [Qemu-devel] [PULL 30/31] qapi: Fix compilation failure on MIPS and SPARC Markus Armbruster
2016-02-09 11:38 ` [Qemu-devel] [PULL 31/31] qapi: Add missing JSON files in build dependencies Markus Armbruster
2016-02-09 13:08 ` [Qemu-devel] [PULL 00/31] QAPI patches for 2016-02-09 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455017883-25867-16-git-send-email-armbru@redhat.com \
--to=armbru@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).