From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41304) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwPFr-0006B9-NG for qemu-devel@nongnu.org; Wed, 11 Nov 2015 01:51:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZwPFn-0005b0-UL for qemu-devel@nongnu.org; Wed, 11 Nov 2015 01:51:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:45188) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZwPFn-0005au-Os for qemu-devel@nongnu.org; Wed, 11 Nov 2015 01:51:35 -0500 From: Eric Blake Date: Tue, 10 Nov 2015 23:51:06 -0700 Message-Id: <1447224690-9743-5-git-send-email-eblake@redhat.com> In-Reply-To: <1447224690-9743-1-git-send-email-eblake@redhat.com> References: <1447224690-9743-1-git-send-email-eblake@redhat.com> Subject: [Qemu-devel] [PATCH v11 04/28] 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: armbru@redhat.com, Michael Roth From: Markus Armbruster 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 --- v11: no change v10: redo closer to Markus' original proposal v9: new patch --- 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.4.3