yuzu/unicorn
1
0
Fork 0
mirror of https://github.com/yuzu-emu/unicorn.git synced 2025-02-02 10:21:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

qapi: Remove obsolete tests for MAX collision

Browse source 
Now that we no longer collide with an implicit _MAX enum member,
we no longer need to reject it in the ad hoc parser, and can
remove several tests that are no longer needed.

Backports commit 04e0639d4e77b6d55491d396c8aa13929ee8ed9a from qemu
This commit is contained in:
Eric Blake 2018-02-19 20:36:34 -05:00 committed by Lioncash
parent 9ca55f4ba5
commit 9a2b48ebc3
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
qemu/scripts/qapi.py
View file

@ -539,8 +539,6 @@ def check_event(expr, expr_info):
global events
name = expr['event']
if name.upper() == 'MAX':
raise QAPIExprError(expr_info, "Event name 'MAX' cannot be created")
events.append(name)
check_type(expr_info, "'data' for event '%s'" % name,
expr.get('data'), allow_dict=True, allow_optional=True,
@ -552,7 +550,7 @@ def check_union(expr, expr_info):
base = expr.get('base')
discriminator = expr.get('discriminator')
members = expr['data']
values = {'MAX': '(automatic)'}
values = {}
# Two types of unions, determined by discriminator.
@ -631,7 +629,7 @@ def check_union(expr, expr_info):
def check_alternate(expr, expr_info):
name = expr['alternate']
members = expr['data']
values = {'MAX': '(automatic)'}
values = {}
types_seen = {}
# Check every branch
@ -664,7 +662,7 @@ def check_enum(expr, expr_info):
name = expr['enum']
members = expr.get('data')
prefix = expr.get('prefix')
values = {'MAX': '(automatic)'}
values = {}
if not isinstance(members, list):
raise QAPIExprError(expr_info,