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

qapi: Drop one of two "simple union must not have base" checks

Browse source 
The first check ensures the second one can't trigger. Drop the first
one, because the second one is in a more logical place, and emits a
nicer error message.

Backports commit 65fbe125451da9421070ab03944c9600a264eefc from qemu
This commit is contained in:
Markus Armbruster 2018-02-19 16:29:56 -05:00 committed by Lioncash
parent 46cf5ed6ae
commit 16619a738e
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
qemu/scripts/qapi.py
View file

@ -526,14 +526,6 @@ def check_union(expr, expr_info):
members = expr['data'] members = expr['data']
values = { 'MAX': '(automatic)' } values = { 'MAX': '(automatic)' }
# If the object has a member 'base', its value must name a struct,
# and there must be a discriminator.
if base is not None:
if discriminator is None:
raise QAPIExprError(expr_info,
"Union '%s' requires a discriminator to go "
"along with base" %name)
# Two types of unions, determined by discriminator. # Two types of unions, determined by discriminator.
# With no discriminator it is a simple union. # With no discriminator it is a simple union.