Commit b52c4b9c authored by Eric Blake's avatar Eric Blake Committed by Markus Armbruster
Browse files

qapi: Simplify builtin type handling 



There was some redundancy between builtin_types[] and
builtin_type_qtypes{}.  Merge them into one.

Signed-off-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent e790e666

scripts/qapi-types.py

+5 −5
Original line number Diff line number Diff line
@@ -182,8 +182,8 @@ const int %(name)s_qtypes[QTYPE_MAX] = { 


    for key in members:

        qapi_type = members[key]

        if builtin_type_qtypes.has_key(qapi_type):

            qtype = builtin_type_qtypes[qapi_type]

        if builtin_types.has_key(qapi_type):

            qtype = builtin_types[qapi_type]

        elif find_struct(qapi_type):

            qtype = "QTYPE_QDICT"

        elif find_union(qapi_type):
@@ -398,7 +398,7 @@ exprs = parse_schema(input_file) 
exprs = filter(lambda expr: not expr.has_key('gen'), exprs)



fdecl.write(guardstart("QAPI_TYPES_BUILTIN_STRUCT_DECL"))

for typename in builtin_types:

for typename in builtin_types.keys():

    fdecl.write(generate_fwd_struct(typename, None, builtin_type=True))

fdecl.write(guardend("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
@@ -426,7 +426,7 @@ for expr in exprs: 
# to avoid header dependency hell, we always generate declarations

# for built-in types in our header files and simply guard them

fdecl.write(guardstart("QAPI_TYPES_BUILTIN_CLEANUP_DECL"))

for typename in builtin_types:

for typename in builtin_types.keys():

    fdecl.write(generate_type_cleanup_decl(typename + "List"))

fdecl.write(guardend("QAPI_TYPES_BUILTIN_CLEANUP_DECL"))
@@ -435,7 +435,7 @@ fdecl.write(guardend("QAPI_TYPES_BUILTIN_CLEANUP_DECL")) 
# over these cases

if do_builtins:

    fdef.write(guardstart("QAPI_TYPES_BUILTIN_CLEANUP_DEF"))

    for typename in builtin_types:

    for typename in builtin_types.keys():

        fdef.write(generate_type_cleanup(typename + "List"))

    fdef.write(guardend("QAPI_TYPES_BUILTIN_CLEANUP_DEF"))

scripts/qapi-visit.py

+3 −3
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ void visit_type_%(name)s(Visitor *m, %(name)s **obj, const char *name, Error **e 
    disc_type = '%sKind' % (name)



    for key in members:

        assert (members[key] in builtin_types

        assert (members[key] in builtin_types.keys()

            or find_struct(members[key])

            or find_union(members[key])

            or find_enum(members[key])), "Invalid anonymous union member"
@@ -538,7 +538,7 @@ exprs = parse_schema(input_file) 
# to avoid header dependency hell, we always generate declarations

# for built-in types in our header files and simply guard them

fdecl.write(guardstart("QAPI_VISIT_BUILTIN_VISITOR_DECL"))

for typename in builtin_types:

for typename in builtin_types.keys():

    fdecl.write(generate_declaration(typename, None, builtin_type=True))

fdecl.write(guardend("QAPI_VISIT_BUILTIN_VISITOR_DECL"))
@@ -546,7 +546,7 @@ fdecl.write(guardend("QAPI_VISIT_BUILTIN_VISITOR_DECL")) 
# have the functions defined, so we use -b option to provide control

# over these cases

if do_builtins:

    for typename in builtin_types:

    for typename in builtin_types.keys():

        fdef.write(generate_visit_list(typename, None))



for expr in exprs:

scripts/qapi.py

+1 −7
Original line number Diff line number Diff line
@@ -16,13 +16,7 @@ from ordereddict import OrderedDict 
import os

import sys



builtin_types = [

    'str', 'int', 'number', 'bool',

    'int8', 'int16', 'int32', 'int64',

    'uint8', 'uint16', 'uint32', 'uint64'

]



builtin_type_qtypes = {

builtin_types = {

    'str':      'QTYPE_QSTRING',

    'int':      'QTYPE_QINT',

    'number':   'QTYPE_QFLOAT',