OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

qapi: Forbid 'type' in schema

Browse Source 
Referring to "type" as both a meta-type (built-in, enum, union,
alternate, or struct) and a specific type (the name that the
schema uses for declaring structs) is confusing.  Finish up the
conversion to using "struct" in qapi schema by removing the hack
in the generator that allowed 'type'.

Signed-off-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Eric Blake 2015-05-04 09:05:28 -06:00 committed by Markus Armbruster
parent 895a2a80e0
commit 3e391d3556
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/qapi.py
View File

@ -617,20 +617,6 @@ def parse_schema(input_file):
for expr_elem in schema.exprs: for expr_elem in schema.exprs:
expr = expr_elem['expr'] expr = expr_elem['expr']
info = expr_elem['info'] info = expr_elem['info']
# back-compat hack until all schemas have been converted;
# preserve the ordering of the original expression
if expr.has_key('type'):
seen_type = False
for (key, value) in expr.items():
if key == 'type':
seen_type = True
del expr['type']
expr['struct'] = value
elif seen_type:
del expr[key]
expr[key] = value
if expr.has_key('enum'): if expr.has_key('enum'):
check_keys(expr_elem, 'enum', ['data']) check_keys(expr_elem, 'enum', ['data'])
add_enum(expr['enum'], info, expr['data']) add_enum(expr['enum'], info, expr['data'])