From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37904) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dkBRa-00022k-5S for qemu-devel@nongnu.org; Tue, 22 Aug 2017 11:50:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dkBRW-0007eB-Tt for qemu-devel@nongnu.org; Tue, 22 Aug 2017 11:50:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:53576) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dkBRW-0007dw-LC for qemu-devel@nongnu.org; Tue, 22 Aug 2017 11:50:14 -0400 Date: Tue, 22 Aug 2017 11:50:13 -0400 (EDT) From: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau Message-ID: <494634424.1900896.1503417013134.JavaMail.zimbra@redhat.com> In-Reply-To: <87h8wz8x5u.fsf@dusky.pond.sub.org> References: <20170822132255.23945-1-marcandre.lureau@redhat.com> <20170822132255.23945-2-marcandre.lureau@redhat.com> <87h8wz8x5u.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH v2 01/54] qapi: fix type_seen key error List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Markus Armbruster Cc: qemu-devel@nongnu.org, Michael Roth Hi ----- Original Message ----- > Marc-Andr=C3=A9 Lureau writes: >=20 > > The type_seen member can be of a different type than the 'qtype' being > > checked, since a string create several conflicts. Lookup the real > > conflicting type in the conflict set, that one must be present in > > type_seen. > > > > This fixes the following error, reproducible with the modified test: > > > > Traceback (most recent call last): > > File "/home/elmarco/src/qq/tests/qapi-schema/test-qapi.py", line 56, = in > > > > schema =3D QAPISchema(sys.argv[1]) > > File "/home/elmarco/src/qq/scripts/qapi.py", line 1470, in __init__ > > self.exprs =3D check_exprs(parser.exprs) > > File "/home/elmarco/src/qq/scripts/qapi.py", line 959, in check_exprs > > check_alternate(expr, info) > > File "/home/elmarco/src/qq/scripts/qapi.py", line 831, in check_alter= nate > > % (name, key, types_seen[qtype])) > > KeyError: 'QTYPE_QSTRING' > > > > Signed-off-by: Marc-Andr=C3=A9 Lureau > > --- > > scripts/qapi.py | 6 ++++-- > > tests/qapi-schema/alternate-conflict-string.json | 4 ++-- > > 2 files changed, 6 insertions(+), 4 deletions(-) > > > > diff --git a/scripts/qapi.py b/scripts/qapi.py > > index 8aa2775f12..a3ac799535 100644 > > --- a/scripts/qapi.py > > +++ b/scripts/qapi.py > > @@ -825,10 +825,12 @@ def check_alternate(expr, info): > > else: > > conflicting.add('QTYPE_QNUM') > > conflicting.add('QTYPE_QBOOL') > > - if conflicting & set(types_seen): > > + conflict =3D conflicting & set(types_seen) > > + if conflict: > > + conflict_qtype =3D list(conflict)[0] >=20 > Converting from set to list just to extract an element is clumsly. > Let's use conflict.pop(), and eliminate the variable. Can do on commit. I didn't realize that. thanks >=20 > > raise QAPISemError(info, "Alternate '%s' member '%s' can't= " > > "be distinguished from member '%s'" > > - % (name, key, types_seen[qtype])) > > + % (name, key, types_seen[conflict_qtype= ])) > > for qt in conflicting: > > types_seen[qt] =3D key > > =20 > > diff --git a/tests/qapi-schema/alternate-conflict-string.json > > b/tests/qapi-schema/alternate-conflict-string.json > > index 85adbd4adc..bb2702978e 100644 > > --- a/tests/qapi-schema/alternate-conflict-string.json > > +++ b/tests/qapi-schema/alternate-conflict-string.json > > @@ -1,4 +1,4 @@ > > # alternate branches of 'str' type conflict with all scalar types > > { 'alternate': 'Alt', > > - 'data': { 'one': 'str', > > - 'two': 'int' } } > > + 'data': { 'one': 'int', > > + 'two': 'str' } } >=20 > Reviewed-by: Markus Armbruster >=20