[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 23/26] qapi-commands: Inline gen_marshal_output_c
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH v2 23/26] qapi-commands: Inline gen_marshal_output_call() |
Date: |
Fri, 28 Aug 2015 18:46:03 +0200 |
Signed-off-by: Markus Armbruster <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/qapi-commands.py | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 3965ca8..6de5229 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -57,19 +57,15 @@ def gen_sync_call(name, args, ret_type):
name=c_name(name), args=arglist, retval=retval).rstrip()
if ret_type:
ret += "\n" + gen_err_check('local_err')
- ret += "\n" + mcgen('''
-%(marshal_output_call)s
+ ret += mcgen('''
+
+qmp_marshal_output_%(c_name)s(retval, ret, &local_err);
''',
- marshal_output_call=gen_marshal_output_call(name,
ret_type)).rstrip()
+ c_name=c_name(name))
pop_indent()
return ret.rstrip()
-def gen_marshal_output_call(name, ret_type):
- if not ret_type:
- return ""
- return "qmp_marshal_output_%s(retval, ret, &local_err);" % c_name(name)
-
def gen_visitor_input_containers_decl(args):
ret = ""
--
2.4.3
- [Qemu-devel] [PATCH v2 01/26] qapi: Clarify docs on including the same file multiple times, (continued)
- [Qemu-devel] [PATCH v2 01/26] qapi: Clarify docs on including the same file multiple times, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 03/26] qapi: Simplify guardname(), Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 02/26] qapi: Clean up cgen() and mcgen(), Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 11/26] qapi-visit: Fix two name arguments passed to visitors, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 08/26] qapi: Generate a nicer struct for flat unions, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 13/26] tests/qapi-schema: Document events with base don't work, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 07/26] qapi: Fix generated code when flat union has member 'kind', Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 16/26] qapi: Document flaws in checking of names, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 09/26] qapi-visit: Fix generated code when schema has forward refs, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 06/26] qapi: Drop unused and useless parameters and variables, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 23/26] qapi-commands: Inline gen_marshal_output_call(),
Markus Armbruster <=
- [Qemu-devel] [PATCH v2 17/26] tests/qapi-schema: Restore test case for flat union base bug, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 14/26] qapi: Document that input visitor semantics are prone to leaks, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 19/26] qapi-tests: New tests for union, alternate command arguments, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 25/26] qapi-commands: Drop useless initialization, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 18/26] tests/qapi-schema: Rename tests from data- to args-, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 15/26] qapi: Document shortcoming with union 'data' branch, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 21/26] qapi: Command returning anonymous type doesn't work, outlaw, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 26/26] qapi: Generated code cleanup, Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 22/26] qapi-commands: Fix gen_err_check(e) for e and e != 'local_err', Markus Armbruster, 2015/08/28
- [Qemu-devel] [PATCH v2 20/26] qapi: Fix to reject union command and event arguments, Markus Armbruster, 2015/08/28