[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v6 08/16] qapi-commands: Utilize implicit struct vis
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v6 08/16] qapi-commands: Utilize implicit struct visits |
Date: |
Thu, 17 Mar 2016 16:48:33 -0600 |
Rather than generate inline per-member visits, take advantage
of the 'visit_type_FOO_members()' function for command
marshalling. This is possible now that implicit structs can be
visited like any other. Generate call arguments from a stack-
allocated struct, rather than a list of local variables:
|@@ -57,26 +57,15 @@ void qmp_marshal_add_fd(QDict *args, QOb
| QmpInputVisitor *qiv = qmp_input_visitor_new_strict(QOBJECT(args));
| QapiDeallocVisitor *qdv;
| Visitor *v;
|- bool has_fdset_id = false;
|- int64_t fdset_id = 0;
|- bool has_opaque = false;
|- char *opaque = NULL;
|+ q_obj_add_fd_arg arg = {0};
|
| v = qmp_input_get_visitor(qiv);
|- if (visit_optional(v, "fdset-id", &has_fdset_id)) {
|- visit_type_int(v, "fdset-id", &fdset_id, &err);
|- if (err) {
|- goto out;
|- }
|- }
|- if (visit_optional(v, "opaque", &has_opaque)) {
|- visit_type_str(v, "opaque", &opaque, &err);
|- if (err) {
|- goto out;
|- }
|+ visit_type_q_obj_add_fd_arg_members(v, &arg, &err);
|+ if (err) {
|+ goto out;
| }
|
|- retval = qmp_add_fd(has_fdset_id, fdset_id, has_opaque, opaque, &err);
|+ retval = qmp_add_fd(arg.has_fdset_id, arg.fdset_id, arg.has_opaque,
arg.opaque, &err);
| if (err) {
| goto out;
| }
|@@ -88,12 +77,7 @@ out:
| qmp_input_visitor_cleanup(qiv);
| qdv = qapi_dealloc_visitor_new();
| v = qapi_dealloc_get_visitor(qdv);
|- if (visit_optional(v, "fdset-id", &has_fdset_id)) {
|- visit_type_int(v, "fdset-id", &fdset_id, NULL);
|- }
|- if (visit_optional(v, "opaque", &has_opaque)) {
|- visit_type_str(v, "opaque", &opaque, NULL);
|- }
|+ visit_type_q_obj_add_fd_arg_members(v, &arg, NULL);
| qapi_dealloc_visitor_cleanup(qdv);
| }
This also has the nice side effect of eliminating a chance of
collision between argument QMP names and local variables.
This patch also paves the way for some followup simplifications
in the generator, in subsequent patches.
Signed-off-by: Eric Blake <address@hidden>
---
v6: split into two patches, s/qapi/arg/
v5: move qapi.py:gen_struct_init() to qapi-event.py:gen_param_var(),
improve commit message
v4: new patch
---
scripts/qapi-commands.py | 28 ++++++++++++----------------
1 file changed, 12 insertions(+), 16 deletions(-)
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 3784f33..28b9cbe 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -33,8 +33,8 @@ def gen_call(name, arg_type, ret_type):
assert not arg_type.variants
for memb in arg_type.members:
if memb.optional:
- argstr += 'has_%s, ' % c_name(memb.name)
- argstr += '%s, ' % c_name(memb.name)
+ argstr += 'arg.has_%s, ' % c_name(memb.name)
+ argstr += 'arg.%s, ' % c_name(memb.name)
lhs = ''
if ret_type:
@@ -71,21 +71,10 @@ def gen_marshal_vars(arg_type, ret_type):
QmpInputVisitor *qiv = qmp_input_visitor_new_strict(QOBJECT(args));
QapiDeallocVisitor *qdv;
Visitor *v;
-''')
+ %(c_name)s arg = {0};
- for memb in arg_type.members:
- if memb.optional:
- ret += mcgen('''
- bool has_%(c_name)s = false;
''',
- c_name=c_name(memb.name))
- ret += mcgen('''
- %(c_type)s %(c_name)s = %(c_null)s;
-''',
- c_name=c_name(memb.name),
- c_type=memb.type.c_type(),
- c_null=memb.type.c_null())
- ret += '\n'
+ c_name=arg_type.c_name())
else:
ret += mcgen('''
@@ -107,17 +96,24 @@ def gen_marshal_input_visit(arg_type, dealloc=False):
qdv = qapi_dealloc_visitor_new();
v = qapi_dealloc_get_visitor(qdv);
''')
+ errp = 'NULL'
else:
ret += mcgen('''
v = qmp_input_get_visitor(qiv);
''')
+ errp = '&err'
- ret += gen_visit_members(arg_type.members, skiperr=dealloc)
+ ret += mcgen('''
+ visit_type_%(c_name)s_members(v, &arg, %(errp)s);
+''',
+ c_name=arg_type.c_name(), errp=errp)
if dealloc:
ret += mcgen('''
qapi_dealloc_visitor_cleanup(qdv);
''')
+ else:
+ ret += gen_err_check()
return ret
--
2.5.0
- [Qemu-devel] [PATCH v6 07/16] qapi-event: Utilize implicit struct visits, (continued)
- [Qemu-devel] [PATCH v6 07/16] qapi-event: Utilize implicit struct visits, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 09/16] qapi-commands: Inline single-use helpers of gen_marshal(), Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 13/16] qapi: Make BlockdevOptions doc example closer to reality, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 16/16] qapi: Consolidate object visitors, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 11/16] qapi: Drop unused c_null(), Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 04/16] qapi: Adjust names of implicit types, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 03/16] qapi: Make c_type() more OO-like, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 10/16] qapi: Inline gen_visit_members() into lone caller, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 05/16] qapi: Emit implicit structs in generated C, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 08/16] qapi-commands: Utilize implicit struct visits,
Eric Blake <=
- [Qemu-devel] [PATCH v6 14/16] qapi: Allow anonymous base for flat union, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 15/16] qapi: Use anonymous bases in QMP flat unions, Eric Blake, 2016/03/17
- [Qemu-devel] [PATCH v6 12/16] qapi: Don't special-case simple union wrappers, Eric Blake, 2016/03/17
- Re: [Qemu-devel] [PATCH v6 00/16] easier unboxed visits/qapi implicit types, Markus Armbruster, 2016/03/18