From fff5f231d5f96e8521761efcd35a12479594059a Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Wed, 18 Nov 2015 01:52:39 -0700 Subject: [PATCH] qapi: Drop obsolete tag value collision assertions Union tag values can't clash with member names in generated C anymore since commit e4ba22b, but QAPISchemaObjectTypeVariants.check() still asserts they don't. Drop it. Signed-off-by: Markus Armbruster Message-Id: <1446559499-26984-1-git-send-email-armbru@redhat.com> Signed-off-by: Eric Blake Message-Id: <1447836791-369-5-git-send-email-eblake@redhat.com> --- scripts/qapi.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 687d9dc..29377d6 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1057,8 +1057,7 @@ class QAPISchemaObjectTypeVariants(object): assert self.tag_member in seen.itervalues() assert isinstance(self.tag_member.type, QAPISchemaEnumType) for v in self.variants: - vseen = dict(seen) - v.check(schema, self.tag_member.type, vseen) + v.check(schema, self.tag_member.type, {}) class QAPISchemaObjectTypeVariant(QAPISchemaObjectTypeMember): -- 2.7.4