From 85ef0801831580e9fd6759e820e878a690cdd94b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 19 Feb 2018 20:07:44 -0500 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. Backports commit fff5f231d5f96e8521761efcd35a12479594059a from qemu --- qemu/scripts/qapi.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/qemu/scripts/qapi.py b/qemu/scripts/qapi.py index 03d62a12..c14ecae6 100644 --- a/qemu/scripts/qapi.py +++ b/qemu/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): def __init__(self, name, typ):