motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 20:33:54 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

qapi: Fix crash on redefinition with a different condition

Browse source 
QAPISchema._make_implicit_object_type() asserts that when an implicit
object type is used multiple times, @ifcond is the same for all uses.
It will be for legitimate uses, i.e. simple union branch wrapper
types.  A comment explains this.

The assertion fails when a command or event is redefined with a
different condition.  The redefinition is an error, but it's flagged
only later.

Fixing the assertion would complicate matters further.  Not
worthwhile, drop it instead.  We really need to get rid of simple
unions.

Tweak test case redefined-event to cover redefinition with a different
condition.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20210806120510.2367124-1-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Markus Armbruster 2021-08-06 14:05:10 +02:00
parent d8ae530ec0
commit b32abbb2f5
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

22
scripts/qapi/schema.py
View file

@ -997,18 +997,18 @@ class QAPISchema:
name = 'q_obj_%s-%s' % (name, role) name = 'q_obj_%s-%s' % (name, role)
typ = self.lookup_entity(name, QAPISchemaObjectType) typ = self.lookup_entity(name, QAPISchemaObjectType)
if typ: if typ:
# The implicit object type has multiple users. This can # The implicit object type has multiple users. This is
# happen only for simple unions' implicit wrapper types. # either a duplicate definition (which will be flagged
# Its ifcond should be the disjunction of its user's # later), or an implicit wrapper type used for multiple
# ifconds. Not implemented. Instead, we always pass the # simple unions. In the latter case, ifcond should be the
# wrapped type's ifcond, which is trivially the same for all # disjunction of its user's ifconds. Not implemented.
# users. It's also necessary for the wrapper to compile. # Instead, we always pass the wrapped type's ifcond, which
# But it's not tight: the disjunction need not imply it. We # is trivially the same for all users. It's also
# may end up compiling useless wrapper types. # necessary for the wrapper to compile. But it's not
# tight: the disjunction need not imply it. We may end up
# compiling useless wrapper types.
# TODO kill simple unions or implement the disjunction # TODO kill simple unions or implement the disjunction
pass
# pylint: disable=protected-access
assert (ifcond or []) == typ._ifcond
else: else:
self._def_entity(QAPISchemaObjectType( self._def_entity(QAPISchemaObjectType(
name, info, None, ifcond, None, None, members, None)) name, info, None, ifcond, None, None, members, None))

2
tests/qapi-schema/redefined-event.json
View file

@ -1,3 +1,3 @@
# we reject duplicate events # we reject duplicate events
{ 'event': 'EVENT_A', 'data': { 'myint': 'int' } } { 'event': 'EVENT_A', 'data': { 'myint': 'int' } }
{ 'event': 'EVENT_A', 'data': { 'myint': 'int' } } { 'event': 'EVENT_A', 'data': { 'myint': 'int' }, 'if': 'defined(FOO)' }