qapi: De-duplicate parameter list generation

Generated qapi-event.[ch] lose line breaks.  No change otherwise.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1442401589-24189-18-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2015-09-16 13:06:20 +02:00
parent 7fad30f06e
commit 03b4367a55
3 changed files with 21 additions and 24 deletions

View File

@ -17,19 +17,12 @@ import re
def gen_command_decl(name, arg_type, ret_type):
argstr = ''
if arg_type:
for memb in arg_type.members:
if memb.optional:
argstr += 'bool has_%s, ' % c_name(memb.name)
argstr += '%s %s, ' % (memb.type.c_type(is_param=True),
c_name(memb.name))
return mcgen('''
%(c_type)s qmp_%(c_name)s(%(args)sError **errp);
%(c_type)s qmp_%(c_name)s(%(params)s);
''',
c_type=(ret_type and ret_type.c_type()) or 'void',
c_name=c_name(name),
args=argstr)
params=gen_params(arg_type, 'Error **errp'))
def gen_err_check(err):

View File

@ -15,21 +15,9 @@ from qapi import *
def gen_event_send_proto(name, arg_type):
api_name = "void qapi_event_send_%s(" % c_name(name).lower()
l = len(api_name)
if arg_type:
for m in arg_type.members:
if m.optional:
api_name += "bool has_%s,\n" % c_name(m.name)
api_name += "".ljust(l)
api_name += "%s %s,\n" % (m.type.c_type(is_param=True),
c_name(m.name))
api_name += "".ljust(l)
api_name += "Error **errp)"
return api_name
return 'void qapi_event_send_%(c_name)s(%(param)s)' % {
'c_name': c_name(name.lower()),
'param': gen_params(arg_type, 'Error **errp')}
def gen_event_send_decl(name, arg_type):

View File

@ -1469,6 +1469,22 @@ extern const char *const %(c_name)s_lookup[];
c_name=c_name(name))
return ret
def gen_params(arg_type, extra):
if not arg_type:
return extra
assert not arg_type.variants
ret = ''
sep = ''
for memb in arg_type.members:
ret += sep
sep = ', '
if memb.optional:
ret += 'bool has_%s, ' % c_name(memb.name)
ret += '%s %s' % (memb.type.c_type(is_param=True), c_name(memb.name))
if extra:
ret += sep + extra
return ret
#
# Common command line parsing
#