From: Markus Armbruster Date: Fri, 27 Sep 2019 13:46:28 +0000 (+0200) Subject: qapi: Inline check_name() into check_union() X-Git-Tag: v4.2.0-rc0~74^2~11 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=77daece3d95dc7edaa5982fbbfd7afe3bc4121ac;p=thirdparty%2Fqemu.git qapi: Inline check_name() into check_union() 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 Reviewed-by: Eric Blake Message-Id: <20190927134639.4284-16-armbru@redhat.com> --- diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index 88945804dc0..9acff01d3eb 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -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,