mirror of https://github.com/proxmox/mirror_qemu
qapi: Forbid 'type' in schema
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>master
parent
895a2a80e0
commit
3e391d3556
|
@ -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'])
|
||||||
|
|
Loading…
Reference in New Issue