yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-07-23 08:18:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Pseudo-type '**' is now unused, drop it

Browse source 
'gen': false needs to stay for now, because netdev_add is still using
it.

Backports commit 2d21291ae645955fcc4652ebfec81ad338169ac6 from qemu
This commit is contained in:
Markus Armbruster 2018-02-19 17:49:43 -05:00 committed by Lioncash
parent e9dac6908f
commit 8115f998e9
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
qemu/scripts/qapi.py
View file

@ -428,15 +428,12 @@ def is_enum(name):
def check_type(expr_info, source, value, allow_array = False, def check_type(expr_info, source, value, allow_array = False,
allow_dict = False, allow_optional = False, allow_dict = False, allow_optional = False,
allow_star = False, allow_metas = []): allow_metas = []):
global all_names global all_names
if value is None: if value is None:
return return
if allow_star and value == '**':
return
# Check if array type for value is okay # Check if array type for value is okay
if isinstance(value, list): if isinstance(value, list):
if not allow_array: if not allow_array:
@ -450,10 +447,6 @@ def check_type(expr_info, source, value, allow_array = False,
# Check if type name for value is okay # Check if type name for value is okay
if isinstance(value, str): if isinstance(value, str):
if value == '**':
raise QAPIExprError(expr_info,
"%s uses '**' but did not request 'gen':false"
% source)
if not value in all_names: if not value in all_names:
raise QAPIExprError(expr_info, raise QAPIExprError(expr_info,
"%s uses unknown type '%s'" "%s uses unknown type '%s'"
@ -478,7 +471,7 @@ def check_type(expr_info, source, value, allow_array = False,
# Todo: allow dictionaries to represent default values of # Todo: allow dictionaries to represent default values of
# an optional argument. # an optional argument.
check_type(expr_info, "Member '%s' of %s" % (key, source), arg, check_type(expr_info, "Member '%s' of %s" % (key, source), arg,
allow_array=True, allow_star=allow_star, allow_array=True,
allow_metas=['built-in', 'union', 'alternate', 'struct', allow_metas=['built-in', 'union', 'alternate', 'struct',
'enum']) 'enum'])
@ -498,18 +491,16 @@ def check_member_clash(expr_info, base_name, data, source = ""):
def check_command(expr, expr_info): def check_command(expr, expr_info):
name = expr['command'] name = expr['command']
allow_star = expr.has_key('gen')
check_type(expr_info, "'data' for command '%s'" % name, check_type(expr_info, "'data' for command '%s'" % name,
expr.get('data'), allow_dict=True, allow_optional=True, expr.get('data'), allow_dict=True, allow_optional=True,
allow_metas=['struct'], allow_star=allow_star) allow_metas=['struct'])
returns_meta = ['union', 'struct'] returns_meta = ['union', 'struct']
if name in returns_whitelist: if name in returns_whitelist:
returns_meta += ['built-in', 'alternate', 'enum'] returns_meta += ['built-in', 'alternate', 'enum']
check_type(expr_info, "'returns' for command '%s'" % name, check_type(expr_info, "'returns' for command '%s'" % name,
expr.get('returns'), allow_array=True, expr.get('returns'), allow_array=True,
allow_optional=True, allow_metas=returns_meta, allow_optional=True, allow_metas=returns_meta)
allow_star=allow_star)
def check_event(expr, expr_info): def check_event(expr, expr_info):
global events global events
@ -1119,7 +1110,6 @@ class QAPISchema(object):
('bool', 'boolean', 'bool', 'false'), ('bool', 'boolean', 'bool', 'false'),
('any', 'value', 'QObject' + pointer_suffix, 'NULL')]: ('any', 'value', 'QObject' + pointer_suffix, 'NULL')]:
self._def_builtin_type(*t) self._def_builtin_type(*t)
self._entity_dict['**'] = self.lookup_type('any') # TODO drop this alias
def _make_implicit_enum_type(self, name, values): def _make_implicit_enum_type(self, name, values):
name = name + 'Kind' name = name + 'Kind'
@ -1269,8 +1259,6 @@ class QAPISchema(object):
def visit(self, visitor): def visit(self, visitor):
visitor.visit_begin(self) visitor.visit_begin(self)
for name in sorted(self._entity_dict.keys()): for name in sorted(self._entity_dict.keys()):
if self._entity_dict[name].name != name:
continue # ignore alias TODO drop alias and remove
self._entity_dict[name].visit(visitor) self._entity_dict[name].visit(visitor)
visitor.visit_end() visitor.visit_end()