[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 03/18] qapi-visit.py: Split off generate_visit_struc
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 03/18] qapi-visit.py: Split off generate_visit_struct_fields() |
Date: |
Tue, 23 Jul 2013 15:03:11 +0200 |
Signed-off-by: Kevin Wolf <address@hidden>
---
scripts/qapi-visit.py | 62 ++++++++++++++++++++++++++++-----------------------
1 file changed, 34 insertions(+), 28 deletions(-)
diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index 6cac05a..a337d80 100644
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -17,34 +17,9 @@ import os
import getopt
import errno
-def generate_visit_struct_body(field_prefix, name, members):
- ret = mcgen('''
-if (!error_is_set(errp)) {
-''')
- push_indent()
-
- if len(field_prefix):
- field_prefix = field_prefix + "."
- ret += mcgen('''
-Error **errp = &err; /* from outer scope */
-Error *err = NULL;
-visit_start_struct(m, NULL, "", "%(name)s", 0, &err);
-''',
- name=name)
- else:
- ret += mcgen('''
-Error *err = NULL;
-visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(name)s), &err);
-''',
- name=name)
+def generate_visit_struct_fields(field_prefix, members):
+ ret = ''
- ret += mcgen('''
-if (!err) {
- if (!obj || *obj) {
-''')
-
- push_indent()
- push_indent()
for argname, argentry, optional, structured in parse_args(members):
if optional:
ret += mcgen('''
@@ -72,9 +47,40 @@ visit_type_%(type)s(m, obj ? &(*obj)->%(c_prefix)s%(c_name)s
: NULL, "%(name)s",
visit_end_optional(m, &err);
''')
- pop_indent()
+ return ret
+
+
+def generate_visit_struct_body(field_prefix, name, members):
+ ret = mcgen('''
+if (!error_is_set(errp)) {
+''')
+ push_indent()
+
+ if len(field_prefix):
+ field_prefix = field_prefix + "."
+ ret += mcgen('''
+Error **errp = &err; /* from outer scope */
+Error *err = NULL;
+visit_start_struct(m, NULL, "", "%(name)s", 0, &err);
+''',
+ name=name)
+ else:
+ ret += mcgen('''
+Error *err = NULL;
+visit_start_struct(m, (void **)obj, "%(name)s", name, sizeof(%(name)s), &err);
+''',
+ name=name)
+
ret += mcgen('''
+if (!err) {
+ if (!obj || *obj) {
+''')
+ push_indent()
+ push_indent()
+ ret += generate_visit_struct_fields(field_prefix, members)
+ pop_indent()
+ ret += mcgen('''
error_propagate(errp, err);
err = NULL;
}
--
1.8.1.4
- [Qemu-devel] [PATCH 00/18] 'blockdev-add' QMP command, Kevin Wolf, 2013/07/23
- [Qemu-devel] [PATCH 01/18] qapi-types.py: Split off generate_struct_fields(), Kevin Wolf, 2013/07/23
- [Qemu-devel] [PATCH 03/18] qapi-visit.py: Split off generate_visit_struct_fields(),
Kevin Wolf <=
- [Qemu-devel] [PATCH 04/18] qapi-visit.py: Implement 'base' for unions, Kevin Wolf, 2013/07/23
- [Qemu-devel] [PATCH 02/18] qapi-types.py: Implement 'base' for unions, Kevin Wolf, 2013/07/23
- [Qemu-devel] [PATCH 06/18] qapi: Add visitor for implicit structs, Kevin Wolf, 2013/07/23
- [Qemu-devel] [PATCH 05/18] docs: Document QAPI union types, Kevin Wolf, 2013/07/23
- [Qemu-devel] [PATCH 07/18] qapi: Flat unions with arbitrary discriminator, Kevin Wolf, 2013/07/23