qapi: Inline check_name() into check_union()

qemu with hax to log dma reads & writes jcs.org/2018/11/12/vfio

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>

Markus Armbruster 6 years ago 77daece3 e6f9678d

+4 -2

1 changed file

expand all

scripts

qapi

common.py

+4 -2

scripts/qapi/common.py

··· 897 897 898 898 # The value of member 'discriminator' must name a non-optional 899 899 # member of the base struct. 900 - check_name(discriminator, info, 901 - "discriminator of flat union '%s'" % name) 900 + check_name_is_str(discriminator, info, 901 + "discriminator of flat union '%s'" % name) 902 + check_name_str(discriminator, info, 903 + "discriminator of flat union '%s'" % name) 902 904 discriminator_value = base_members.get(discriminator) 903 905 if not discriminator_value: 904 906 raise QAPISemError(info,