mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi: Inline check_name() into check_union()

Browse Source 
check_name() consists of check_name_is_str() and check_name_str().
check_union() relies on the latter to catch optional discriminators.
The next commit will replace that by a more straightforward check.
Inlining check_name() into check_union() now should make that easier
to review.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <20190927134639.4284-16-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2019-09-27 15:46:28 +02:00
parent e6f9678da5
commit 77daece3d9
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/qapi/common.py
View File

@ -897,8 +897,10 @@ def check_union(expr, info):
# The value of member 'discriminator' must name a non-optional
# member of the base struct.
check_name(discriminator, info,
"discriminator of flat union '%s'" % name)
check_name_is_str(discriminator, info,
"discriminator of flat union '%s'" % name)
check_name_str(discriminator, info,
"discriminator of flat union '%s'" % name)
discriminator_value = base_members.get(discriminator)
if not discriminator_value:
raise QAPISemError(info,