Eric Blake <ebl...@redhat.com> writes: > From: Markus Armbruster <arm...@redhat.com> > > Union tag values can't clash with member names in generated C anymore > since commit e4ba22b, but QAPISchemaObjectTypeVariant.check() still > asserts they don't. Drop it. > > Signed-off-by: Markus Armbruster <arm...@redhat.com> > Message-Id: <1446559499-26984-1-git-send-email-arm...@redhat.com> > [A later patch will still need to pass vseen from Variants.check() > to Variant.check(), so to avoid churn, change the cleanup to occur > lower in Variant.check()]
Leaves QAPISchemaObjectTypeVariant.check() parameter seen temporarily unused. Okay, as long as we get in the patch that again uses it in the same batch. > Signed-off-by: Eric Blake <ebl...@redhat.com> > > --- > v9: new patch > --- > scripts/qapi.py | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/qapi.py b/scripts/qapi.py > index a814e20..145dbfe 100644 > --- a/scripts/qapi.py > +++ b/scripts/qapi.py > @@ -1067,7 +1067,7 @@ class > QAPISchemaObjectTypeVariant(QAPISchemaObjectTypeMember): > QAPISchemaObjectTypeMember.__init__(self, name, typ, False) > > def check(self, schema, tag_type, seen): > - QAPISchemaObjectTypeMember.check(self, schema, [], seen) > + QAPISchemaObjectTypeMember.check(self, schema, [], {}) > assert self.name in tag_type.values > > # This function exists to support ugly simple union special cases