yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-02 10:51:06 +00:00
Code Issues Packages Projects Releases Wiki 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'.

Backports commit 3e391d355644b2bff7c9f187759aadb46c6e051f from qemu
This commit is contained in:
Eric Blake 2018-02-19 14:23:19 -05:00 committed by Lioncash
parent 341f4a437a
commit 2d6d612c61
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 0 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
qemu/scripts/qapi.py
View file

@ -617,20 +617,6 @@ def parse_schema(input_file):
for expr_elem in schema.exprs:
expr = expr_elem['expr']
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'):
check_keys(expr_elem, 'enum', ['data'])
add_enum(expr['enum'], info, expr['data'])