commit 99e75d8c2a9fd13e8a2c0eb0718359b06445d38b
author Markus Armbruster <armbru@redhat.com> Fri Mar 15 16:23:00 2024 +0100
committer Markus Armbruster <armbru@redhat.com> Wed Apr 24 10:03:54 2024 +0200
tree d46d2f859f3e1ccf7929e13f46a8df92b1583a10
parent 8d413dbd5d369edd4b16e341dafbdde843397660

qapi: Tighten check whether implicit object type already exists

Entities with names starting with q_obj_ are implicit object types.
Therefore, QAPISchema._make_implicit_object_type()'s .lookup_entity()
can only return a QAPISchemaObjectType.  Assert that.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240315152301.3621858-25-armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: John Snow <jsnow@redhat.com>

scripts/qapi/schema.py

diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index e52930a..a6180f9 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -1297,8 +1297,9 @@
             return None
         # See also QAPISchemaObjectTypeMember.describe()
         name = 'q_obj_%s-%s' % (name, role)
-        typ = self.lookup_entity(name, QAPISchemaObjectType)
+        typ = self.lookup_entity(name)
         if typ:
+            assert(isinstance(typ, QAPISchemaObjectType))
             # The implicit object type has multiple users.  This can
             # only be a duplicate definition, which will be flagged
             # later.