Re: [Qemu-devel] [PATCH v2 01/54] qapi: fix type_seen key error

2017-08-28 Thread Markus Armbruster
Marc-André Lureau writes: > On Fri, Aug 25, 2017 at 2:57 PM Eduardo Habkost wrote: > >> On Fri, Aug 25, 2017 at 08:02:26AM +0200, Markus Armbruster wrote: >> > Conflicts with Eduardo's "[PATCH v2] qapi: Fix error handling code on >> > alternate

Re: [Qemu-devel] [PATCH v2 01/54] qapi: fix type_seen key error

2017-08-25 Thread Marc-André Lureau
On Fri, Aug 25, 2017 at 2:57 PM Eduardo Habkost wrote: > On Fri, Aug 25, 2017 at 08:02:26AM +0200, Markus Armbruster wrote: > > Conflicts with Eduardo's "[PATCH v2] qapi: Fix error handling code on > > alternate conflict". > > Message-Id:

Re: [Qemu-devel] [PATCH v2 01/54] qapi: fix type_seen key error

2017-08-25 Thread Eduardo Habkost
On Fri, Aug 25, 2017 at 08:02:26AM +0200, Markus Armbruster wrote: > Conflicts with Eduardo's "[PATCH v2] qapi: Fix error handling code on > alternate conflict". > Message-Id: <20170717180926.14924-1-ehabk...@redhat.com> > > Marc-André, could you have a look? You can rebase your fix on top of >

Re: [Qemu-devel] [PATCH v2 01/54] qapi: fix type_seen key error

2017-08-25 Thread Markus Armbruster
Conflicts with Eduardo's "[PATCH v2] qapi: Fix error handling code on alternate conflict". Message-Id: <20170717180926.14924-1-ehabk...@redhat.com> Marc-André, could you have a look? You can rebase your fix on top of Eduardo's, or merge the two into one commit. Marc-André Lureau

Re: [Qemu-devel] [PATCH v2 01/54] qapi: fix type_seen key error

2017-08-22 Thread Markus Armbruster
Marc-André Lureau writes: > Hi > > - Original Message - >> Marc-André Lureau writes: >> >> > The type_seen member can be of a different type than the 'qtype' being >> > checked, since a string create several conflicts. Lookup

Re: [Qemu-devel] [PATCH v2 01/54] qapi: fix type_seen key error

2017-08-22 Thread Marc-André Lureau
Hi - Original Message - > Marc-André Lureau writes: > > > 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

Re: [Qemu-devel] [PATCH v2 01/54] qapi: fix type_seen key error

2017-08-22 Thread Markus Armbruster
Marc-André Lureau writes: > 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

[Qemu-devel] [PATCH v2 01/54] qapi: fix type_seen key error

2017-08-22 Thread Marc-André Lureau
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