[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 15/31] qapi: Track all failures between visit_start/s
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 15/31] qapi: Track all failures between visit_start/stop |
Date: |
Tue, 9 Feb 2016 12:37:47 +0100 |
From: Eric Blake <address@hidden>
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 <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
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 <address@hidden>
@@ -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
- [Qemu-devel] [PULL 12/31] vl: Ensure qapi visitor properly ends struct visit, (continued)
- [Qemu-devel] [PULL 12/31] vl: Ensure qapi visitor properly ends struct visit, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 13/31] balloon: Improve use of qapi visitor, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 16/31] qapi-visit: Kill unused visit_end_union(), Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 14/31] qapi: Improve generated event use of qapi visitor, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 17/31] qapi: Prefer type_int64 over type_int in visitors, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 27/31] qapi: Drop unused error argument for list and implicit struct, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 25/31] qapi: Drop unused 'kind' for struct/enum visit, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 23/31] qom: Swap 'name' next to visitor in ObjectPropertyAccessor, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 04/31] tests: Use Python 2.6 "except E as ..." syntax, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 22/31] qapi: Swap visit_* arguments for consistent 'name' placement, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 15/31] qapi: Track all failures between visit_start/stop,
Markus Armbruster <=
- [Qemu-devel] [PULL 11/31] hmp: Cache use of qapi visitor, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 21/31] qom: Use typedef for Visitor, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 24/31] qapi: Swap 'name' in visit_* callbacks to match public API, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 06/31] qapi: Avoid use of misnamed DO_UPCAST(), Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 19/31] qapi: Consolidate visitor small integer callbacks, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 18/31] qapi: Make all visitors supply uint64 callbacks, Markus Armbruster, 2016/02/09
- [Qemu-devel] [PULL 31/31] qapi: Add missing JSON files in build dependencies, Markus Armbruster, 2016/02/09
- Re: [Qemu-devel] [PULL 00/31] QAPI patches for 2016-02-09, Peter Maydell, 2016/02/09