[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 20/20] qapi: Generate simpler marshalling code when no arguments
From: |
Markus Armbruster |
Subject: |
[PULL 20/20] qapi: Generate simpler marshalling code when no arguments |
Date: |
Thu, 30 Apr 2020 07:31:04 +0200 |
When command FOO has no arguments, its generated qmp_marshal_FOO() is
a bit confusing. Make it simpler:
visit_start_struct(v, NULL, NULL, 0, &err);
if (err) {
goto out;
}
-
- if (!err) {
- visit_check_struct(v, &err);
- }
+ visit_check_struct(v, &err);
visit_end_struct(v, NULL);
if (err) {
goto out;
}
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/qapi/commands.py | 40 ++++++++++++++++++++++++----------------
1 file changed, 24 insertions(+), 16 deletions(-)
diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py
index f545903567..6809b0fb6e 100644
--- a/scripts/qapi/commands.py
+++ b/scripts/qapi/commands.py
@@ -115,14 +115,10 @@ def gen_marshal(name, arg_type, boxed, ret_type):
c_type=ret_type.c_type())
if have_args:
- visit_members = ('visit_type_%s_members(v, &arg, &err);'
- % arg_type.c_name())
ret += mcgen('''
%(c_name)s arg = {0};
''',
c_name=arg_type.c_name())
- else:
- visit_members = ''
ret += mcgen('''
@@ -131,16 +127,27 @@ def gen_marshal(name, arg_type, boxed, ret_type):
if (err) {
goto out;
}
- %(visit_members)s
+''')
+
+ if have_args:
+ ret += mcgen('''
+ visit_type_%(c_arg_type)s_members(v, &arg, &err);
if (!err) {
visit_check_struct(v, &err);
}
+''',
+ c_arg_type=arg_type.c_name())
+ else:
+ ret += mcgen('''
+ visit_check_struct(v, &err);
+''')
+
+ ret += mcgen('''
visit_end_struct(v, NULL);
if (err) {
goto out;
}
-''',
- visit_members=visit_members)
+''')
ret += gen_call(name, arg_type, boxed, ret_type)
@@ -151,20 +158,21 @@ out:
visit_free(v);
''')
- if have_args:
- visit_members = ('visit_type_%s_members(v, &arg, NULL);'
- % arg_type.c_name())
- else:
- visit_members = ''
-
ret += mcgen('''
v = qapi_dealloc_visitor_new();
visit_start_struct(v, NULL, NULL, 0, NULL);
- %(visit_members)s
+''')
+
+ if have_args:
+ ret += mcgen('''
+ visit_type_%(c_arg_type)s_members(v, &arg, NULL);
+''',
+ c_arg_type=arg_type.c_name())
+
+ ret += mcgen('''
visit_end_struct(v, NULL);
visit_free(v);
-''',
- visit_members=visit_members)
+''')
ret += mcgen('''
}
--
2.21.1
- [PULL 00/20] QAPI patches for 2020-04-30, Markus Armbruster, 2020/04/30
- [PULL 01/20] qobject: Clean up QLIST_FOREACH_ENTRY(), Markus Armbruster, 2020/04/30
- [PULL 03/20] qobject: Eliminate qlist_iter(), use QLIST_FOREACH_ENTRY() instead, Markus Armbruster, 2020/04/30
- [PULL 02/20] qobject: Factor out helper json_pretty_newline(), Markus Armbruster, 2020/04/30
- [PULL 08/20] qapi: Fix typo in visit_start_list()'s contract, Markus Armbruster, 2020/04/30
- [PULL 09/20] qapi: Document @errp usage more thoroughly in visitor.h, Markus Armbruster, 2020/04/30
- [PULL 12/20] qapi: Fix Visitor contract for start_alternate(), Markus Armbruster, 2020/04/30
- [PULL 11/20] qapi: Assert incomplete object occurs only in dealloc visitor, Markus Armbruster, 2020/04/30
- [PULL 10/20] qapi: Polish prose in visitor.h, Markus Armbruster, 2020/04/30
- [PULL 14/20] qapi: Assert non-input visitors see only valid narrow integers, Markus Armbruster, 2020/04/30
- [PULL 20/20] qapi: Generate simpler marshalling code when no arguments,
Markus Armbruster <=
- [PULL 04/20] qobject: Eliminate qdict_iter(), use qdict_first(), qdict_next(), Markus Armbruster, 2020/04/30
- [PULL 05/20] qemu-option: Clean up after the previous commit, Markus Armbruster, 2020/04/30
- [PULL 06/20] qapi: Belatedly update visitor.h's big comment for QAPI modules, Markus Armbruster, 2020/04/30
- [PULL 13/20] qapi: Assert output visitors see only valid enum values, Markus Armbruster, 2020/04/30
- [PULL 18/20] qom: Simplify object_property_get_enum(), Markus Armbruster, 2020/04/30
- [PULL 16/20] qapi: Assert non-input visitors see only valid alternate tags, Markus Armbruster, 2020/04/30
- [PULL 15/20] qapi: Clean up visitor's recovery from input with invalid type, Markus Armbruster, 2020/04/30
- [PULL 07/20] qapi: Fix the virtual walk example in visitor.h's big comment, Markus Armbruster, 2020/04/30
- [PULL 19/20] qapi: Disallow qmp_marshal_FOO(NULL, ...), Markus Armbruster, 2020/04/30
- [PULL 17/20] qapi: Only input visitors can actually fail, Markus Armbruster, 2020/04/30