diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/qapi-types.py | 10 | ||||
| -rw-r--r-- | scripts/qapi-visit.py | 6 | ||||
| -rw-r--r-- | scripts/qapi.py | 8 |
3 files changed, 9 insertions, 15 deletions
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py index db872180c6..e400b03479 100644 --- a/scripts/qapi-types.py +++ b/scripts/qapi-types.py @@ -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")) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index 1be4d67d8a..41596bb95b 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -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: diff --git a/scripts/qapi.py b/scripts/qapi.py index 77d46aa995..2b5775d2af 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -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', |