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

qapi: Reuse code for flat union base validation

Browse source 
Rather than open-code the check for a valid base type, we
should reuse the common functionality. This allows for
consistent error messages, and also makes it easier for a
later patch to turn on support for inline anonymous base
structures.

Test flat-union-inline is updated to test only one feature
(anonymous branch dictionaries), which can be implemented
independently (test flat-union-bad-base already covers the
idea of an anonymous base dictionary).

Backports commit 376863ef4895ae709aadb6f26365a5973310ef09 from qemu
This commit is contained in:
Eric Blake 2018-02-19 18:10:23 -05:00 committed by Lioncash
parent c09db972fe
commit 4294815ee3
No known key found for this signature in database
GPG key ID: 4E3C3CC1031BA9C7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
qemu/scripts/qapi.py
View file

@ -557,15 +557,15 @@ def check_union(expr, expr_info):
# Else, it's a flat union. # Else, it's a flat union.
else: else:
# The object must have a string member 'base'. # The object must have a string member 'base'.
if not isinstance(base, str): check_type(expr_info, "'base' for union '%s'" % name,
base, allow_metas=['struct'])
if not base:
raise QAPIExprError(expr_info, raise QAPIExprError(expr_info,
"Flat union '%s' must have a string base field" "Flat union '%s' must have a base"
% name) % name)
base_fields = find_base_fields(base) base_fields = find_base_fields(base)
if not base_fields: assert base_fields
raise QAPIExprError(expr_info,
"Base '%s' is not a valid struct"
% base)
# The value of member 'discriminator' must name a non-optional # The value of member 'discriminator' must name a non-optional
# member of the base struct. # member of the base struct.
check_name(expr_info, "Discriminator of flat union '%s'" % name, check_name(expr_info, "Discriminator of flat union '%s'" % name,