[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 13/24] qapi: [trivial] Allow user to use 'args' a
From: |
Lluís Vilanova |
Subject: |
[Qemu-devel] [PATCH v3 13/24] qapi: [trivial] Allow user to use 'args' as an argument name |
Date: |
Sun, 21 Apr 2013 21:12:43 +0200 |
User-agent: |
StGit/0.16 |
Signed-off-by: Lluís Vilanova <address@hidden>
---
scripts/qapi-commands.py | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index fa16651..236a6ae 100644
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -207,7 +207,7 @@ def gen_marshal_input_decl(name, args, ret_type,
middle_mode):
if middle_mode:
return 'int qmp_marshal_input_%s(Monitor *mon, const QDict *qdict,
QObject **ret)' % c_fun(name)
else:
- return 'static void qmp_marshal_input_%s(QDict *args, QObject **ret,
Error **errp)' % c_fun(name)
+ return 'static void qmp_marshal_input_%s(QDict *args_, QObject **ret,
Error **errp)' % c_fun(name)
@@ -224,7 +224,7 @@ def gen_marshal_input(name, args, ret_type, middle_mode):
ret += mcgen('''
Error *local_err = NULL;
Error **errp = &local_err;
- QDict *args = (QDict *)qdict;
+ QDict *args_ = (QDict *)qdict;
''')
if ret_type:
@@ -247,10 +247,10 @@ def gen_marshal_input(name, args, ret_type, middle_mode):
''',
visitor_input_containers_decl=gen_visitor_input_containers_decl(args),
visitor_input_vars_decl=gen_visitor_input_vars_decl(args),
- visitor_input_block=gen_visitor_input_block(args,
"QOBJECT(args)"))
+ visitor_input_block=gen_visitor_input_block(args,
"QOBJECT(args_)"))
else:
ret += mcgen('''
- (void)args;
+ (void)args_;
''')
ret += mcgen('''
- [Qemu-devel] [PATCH v3 05/24] trace: Minimize inclusions of "qemu-common.h" to avoid inclusion loops, (continued)
- [Qemu-devel] [PATCH v3 05/24] trace: Minimize inclusions of "qemu-common.h" to avoid inclusion loops, Lluís Vilanova, 2013/04/21
- [Qemu-devel] [PATCH v3 06/24] instrument: [none] Add null instrumentation, Lluís Vilanova, 2013/04/21
- [Qemu-devel] [PATCH v3 07/24] system: [linux] Use absolute include path for linux-headers, Lluís Vilanova, 2013/04/21
- [Qemu-devel] [PATCH v3 08/24] instrument: [static] Call statically linked user-provided routines, Lluís Vilanova, 2013/04/21
- [Qemu-devel] [PATCH v3 09/24] build: Add variable 'tools-obj-y' for tool-only files, Lluís Vilanova, 2013/04/21
- [Qemu-devel] [PATCH v3 10/24] instrument: [dynamic] Call dynamically linked user-provided routines, Lluís Vilanova, 2013/04/21
- [Qemu-devel] [PATCH v3 11/24] qapi: Add a primitive to include other files from a QAPI schema file, Lluís Vilanova, 2013/04/21
- [Qemu-devel] [PATCH v3 12/24] qapi: [trivial] Set the input root directory when parsing QAPI files, Lluís Vilanova, 2013/04/21
- [Qemu-devel] [PATCH v3 13/24] qapi: [trivial] Allow user to use 'args' as an argument name,
Lluís Vilanova <=
- [Qemu-devel] [PATCH v3 14/24] instrument: Add internal control interface, Lluís Vilanova, 2013/04/21
- [Qemu-devel] [PATCH v3 15/24] instrument: [qmp, qapi] Add control interface, Lluís Vilanova, 2013/04/21
- [Qemu-devel] [PATCH v3 16/24] instrument: [hmp] Add control interface, Lluís Vilanova, 2013/04/21
- [Qemu-devel] [PATCH v3 17/24] Let makefiles add entries to the set of target architecture objects, Lluís Vilanova, 2013/04/21
- [Qemu-devel] [PATCH v3 18/24] instrument: Add commandline options to start with an instrumentation library, Lluís Vilanova, 2013/04/21
- [Qemu-devel] [PATCH v3 19/24] instrument: Add client-side API to enumerate events, Lluís Vilanova, 2013/04/21