From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtcCx-0008Hy-Up for qemu-devel@nongnu.org; Tue, 03 Nov 2015 09:05:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZtcCs-0005ao-4r for qemu-devel@nongnu.org; Tue, 03 Nov 2015 09:05:07 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55407) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZtcCr-0005aY-VU for qemu-devel@nongnu.org; Tue, 03 Nov 2015 09:05:02 -0500 From: Markus Armbruster Date: Tue, 3 Nov 2015 15:04:53 +0100 Message-Id: <1446559499-26984-1-git-send-email-armbru@redhat.com> In-Reply-To: <87611jjq98.fsf@blackfin.pond.sub.org> References: <87611jjq98.fsf@blackfin.pond.sub.org> Subject: [Qemu-devel] [PATCH 1/7] qapi: Drop obsolete tag value collision assertions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: mdroth@linux.vnet.ibm.com 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 --- scripts/qapi.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/qapi.py b/scripts/qapi.py index 84ac151..a303929 100644 --- a/scripts/qapi.py +++ b/scripts/qapi.py @@ -1059,8 +1059,7 @@ class QAPISchemaObjectTypeVariants(object): self.tag_member.check(schema, members, seen) 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.4.3