[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v8 06/16] qapi-event: Simplify visit of non-implicit
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v8 06/16] qapi-event: Simplify visit of non-implicit data |
Date: |
Sat, 2 Jul 2016 20:58:39 -0600 |
Commit 7ce106a9 documented why we don't generated a visit_type_FOO()
for implicit types; and therefore events with an anonymous type for
'data' have to open-code a visit. Note that the open-coded visit in
qapi-event.c is slightly different from what is done in
qapi-visit.c for normal types, in part because we don't have to
check for *obj being NULL or free things on error. But where the
type is not implicit, it is nicer to reuse the normal visit instead
of open-coding a duplicate.
At the moment, the only event with a non-implicit 'data' is in the
testsuite, where test-qapi-event.c changes as follows:
|@@ -155,6 +155,7 @@ void qapi_event_send___org_qemu_x_event(
| __org_qemu_x_Struct param = {
| __org_qemu_x_member1, (char *)__org_qemu_x_member2, has_q_wchar_t,
q_wchar_t
| };
|+ __org_qemu_x_Struct *arg = ¶m;
|
| emit = qmp_event_get_func_emit();
| if (!emit) {
|@@ -164,16 +165,7 @@ void qapi_event_send___org_qemu_x_event(
| qmp = qmp_event_build_dict("__ORG.QEMU_X-EVENT");
|
| v = qmp_output_visitor_new(&obj);
|-
|- visit_start_struct(v, "__ORG.QEMU_X-EVENT", NULL, 0, &err);
|- if (err) {
|- goto out;
|- }
|- visit_type___org_qemu_x_Struct_members(v, ¶m, &err);
|- if (!err) {
|- if (!err) {
|- visit_check_struct(v, &err);
|- }
|- visit_end_struct(v, NULL);
|+ visit_type___org_qemu_x_Struct(v, "__ORG.QEMU_X-EVENT", &arg, &err);
| if (err) {
| goto out;
| }
Signed-off-by: Eric Blake <address@hidden>
---
v8: new patch
---
scripts/qapi-event.py | 19 +++++++++++++++++--
1 file changed, 17 insertions(+), 2 deletions(-)
diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py
index 09c0a2a..ef4a320 100644
--- a/scripts/qapi-event.py
+++ b/scripts/qapi-event.py
@@ -49,6 +49,11 @@ def gen_param_var(typ):
};
''')
+ if not typ.is_implicit():
+ ret += mcgen('''
+ %(c_name)s *arg = ¶m;
+''',
+ c_name=typ.c_name())
return ret
@@ -91,6 +96,14 @@ def gen_event_send(name, arg_type):
if arg_type and not arg_type.is_empty():
ret += mcgen('''
v = qmp_output_visitor_new(&obj);
+''')
+ if not arg_type.is_implicit():
+ ret += mcgen('''
+ visit_type_%(c_name)s(v, "%(name)s", &arg, &err);
+''',
+ name=name, c_name=arg_type.c_name())
+ else:
+ ret += mcgen('''
visit_start_struct(v, "%(name)s", NULL, 0, &err);
if (err) {
@@ -101,14 +114,16 @@ def gen_event_send(name, arg_type):
visit_check_struct(v, &err);
}
visit_end_struct(v, NULL);
+''',
+ name=name, c_name=arg_type.c_name())
+ ret += mcgen('''
if (err) {
goto out;
}
visit_complete(v, &obj);
qdict_put_obj(qmp, "data", obj);
-''',
- name=name, c_name=arg_type.c_name())
+''')
ret += mcgen('''
emit(%(c_enum)s, qmp, &err);
--
2.5.5
- [Qemu-devel] [PATCH for-2.7 v8 00/16] qapi netdev_add introspection (post-introspection cleanups subset F), Eric Blake, 2016/07/02
- [Qemu-devel] [PATCH v8 02/16] qapi: Require all branches of flat union enum to be covered, Eric Blake, 2016/07/02
- [Qemu-devel] [PATCH v8 03/16] qapi: Hide tag_name data member of variants, Eric Blake, 2016/07/02
- [Qemu-devel] [PATCH v8 05/16] qapi: Drop useless gen_err_check(), Eric Blake, 2016/07/02
- [Qemu-devel] [PATCH v8 04/16] qapi: Add type.is_empty() helper, Eric Blake, 2016/07/02
- [Qemu-devel] [PATCH v8 01/16] net: use Netdev instead of NetClientOptions in client init, Eric Blake, 2016/07/02
- [Qemu-devel] [PATCH v8 06/16] qapi-event: Simplify visit of non-implicit data,
Eric Blake <=
- [Qemu-devel] [PATCH v8 13/16] net: Use correct type for bool flag, Eric Blake, 2016/07/02
- [Qemu-devel] [PATCH v8 14/16] net: Complete qapi-fication of netdev_add, Eric Blake, 2016/07/02
- [Qemu-devel] [PATCH v8 15/16] qapi: Allow anonymous branch types in flat union, Eric Blake, 2016/07/02
- [Qemu-devel] [PATCH v8 10/16] block: Simplify drive-mirror, Eric Blake, 2016/07/02
- [Qemu-devel] [PATCH v8 08/16] qapi: Implement boxed types for commands/events, Eric Blake, 2016/07/02