mirror of https://gitee.com/openkylin/qemu.git
qapi-types: Drop unused members parameters
Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
4f35680023
commit
ae0a7a1090
|
@ -12,7 +12,7 @@
|
||||||
from ordereddict import OrderedDict
|
from ordereddict import OrderedDict
|
||||||
from qapi import *
|
from qapi import *
|
||||||
|
|
||||||
def generate_fwd_struct(name, members, builtin_type=False):
|
def generate_fwd_struct(name, builtin_type=False):
|
||||||
if builtin_type:
|
if builtin_type:
|
||||||
return mcgen('''
|
return mcgen('''
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ def generate_fwd_struct(name, members, builtin_type=False):
|
||||||
''',
|
''',
|
||||||
name=c_name(name))
|
name=c_name(name))
|
||||||
|
|
||||||
def generate_fwd_enum_struct(name, members):
|
def generate_fwd_enum_struct(name):
|
||||||
return mcgen('''
|
return mcgen('''
|
||||||
typedef struct %(name)sList
|
typedef struct %(name)sList
|
||||||
{
|
{
|
||||||
|
@ -332,26 +332,26 @@ def generate_type_cleanup(name):
|
||||||
|
|
||||||
fdecl.write(guardstart("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
|
fdecl.write(guardstart("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
|
||||||
for typename in builtin_types.keys():
|
for typename in builtin_types.keys():
|
||||||
fdecl.write(generate_fwd_struct(typename, None, builtin_type=True))
|
fdecl.write(generate_fwd_struct(typename, builtin_type=True))
|
||||||
fdecl.write(guardend("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
|
fdecl.write(guardend("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
|
||||||
|
|
||||||
for expr in exprs:
|
for expr in exprs:
|
||||||
ret = "\n"
|
ret = "\n"
|
||||||
if expr.has_key('struct'):
|
if expr.has_key('struct'):
|
||||||
ret += generate_fwd_struct(expr['struct'], expr['data'])
|
ret += generate_fwd_struct(expr['struct'])
|
||||||
elif expr.has_key('enum'):
|
elif expr.has_key('enum'):
|
||||||
ret += generate_enum(expr['enum'], expr['data']) + "\n"
|
ret += generate_enum(expr['enum'], expr['data']) + "\n"
|
||||||
ret += generate_fwd_enum_struct(expr['enum'], expr['data'])
|
ret += generate_fwd_enum_struct(expr['enum'])
|
||||||
fdef.write(generate_enum_lookup(expr['enum'], expr['data']))
|
fdef.write(generate_enum_lookup(expr['enum'], expr['data']))
|
||||||
elif expr.has_key('union'):
|
elif expr.has_key('union'):
|
||||||
ret += generate_fwd_struct(expr['union'], expr['data']) + "\n"
|
ret += generate_fwd_struct(expr['union']) + "\n"
|
||||||
enum_define = discriminator_find_enum_define(expr)
|
enum_define = discriminator_find_enum_define(expr)
|
||||||
if not enum_define:
|
if not enum_define:
|
||||||
ret += generate_enum('%sKind' % expr['union'], expr['data'].keys())
|
ret += generate_enum('%sKind' % expr['union'], expr['data'].keys())
|
||||||
fdef.write(generate_enum_lookup('%sKind' % expr['union'],
|
fdef.write(generate_enum_lookup('%sKind' % expr['union'],
|
||||||
expr['data'].keys()))
|
expr['data'].keys()))
|
||||||
elif expr.has_key('alternate'):
|
elif expr.has_key('alternate'):
|
||||||
ret += generate_fwd_struct(expr['alternate'], expr['data']) + "\n"
|
ret += generate_fwd_struct(expr['alternate']) + "\n"
|
||||||
ret += generate_enum('%sKind' % expr['alternate'], expr['data'].keys())
|
ret += generate_enum('%sKind' % expr['alternate'], expr['data'].keys())
|
||||||
fdef.write(generate_enum_lookup('%sKind' % expr['alternate'],
|
fdef.write(generate_enum_lookup('%sKind' % expr['alternate'],
|
||||||
expr['data'].keys()))
|
expr['data'].keys()))
|
||||||
|
|
Loading…
Reference in New Issue