motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 12:23:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

scripts: use build_ prefix for string not piped through cgen()

Browse source 
The gen_ prefix is awkward.  Generated C should go through cgen()
exactly once (see commit 1f9a7a1).  The common way to get this wrong is
passing a foo=gen_foo() keyword argument to mcgen().  I'd like us to
adopt a naming convention where gen_ means "something that's been piped
through cgen(), and thus must not be passed to cgen() or mcgen()".
Requires renaming gen_params(), gen_marshal_proto() and
gen_event_send_proto().

Suggested-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20170601124143.10915-1-marcandre.lureau@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Marc-André Lureau 2017-06-01 16:41:41 +04:00 • committed by Markus Armbruster
parent 8a4613a0ab
commit 086ee7a620
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scripts/qapi-commands.py
View file

@ -21,7 +21,7 @@ def gen_command_decl(name, arg_type, boxed, ret_type):
''',
c_type=(ret_type and ret_type.c_type()) or 'void',
c_name=c_name(name),
params=gen_params(arg_type, boxed, 'Error **errp'))
params=build_params(arg_type, boxed, 'Error **errp'))
def gen_call(name, arg_type, boxed, ret_type):
@ -82,7 +82,7 @@ static void qmp_marshal_output_%(c_name)s(%(c_type)s ret_in, QObject **ret_out,
c_type=ret_type.c_type(), c_name=ret_type.c_name())
def gen_marshal_proto(name):
def build_marshal_proto(name):
return ('void qmp_marshal_%s(QDict *args, QObject **ret, Error **errp)'
% c_name(name))
@ -91,7 +91,7 @@ def gen_marshal_decl(name):
return mcgen('''
%(proto)s;
''',
proto=gen_marshal_proto(name))
proto=build_marshal_proto(name))
def gen_marshal(name, arg_type, boxed, ret_type):
@ -103,7 +103,7 @@ def gen_marshal(name, arg_type, boxed, ret_type):
{
Error *err = NULL;
''',
proto=gen_marshal_proto(name))
proto=build_marshal_proto(name))
if ret_type:
ret += mcgen('''