[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 24/25] qapi: Tighten check whether implicit object type alread
From: |
Markus Armbruster |
Subject: |
[PATCH v5 24/25] qapi: Tighten check whether implicit object type already exists |
Date: |
Fri, 15 Mar 2024 16:23:00 +0100 |
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>
---
scripts/qapi/schema.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index e52930a48a..a6180f93c6 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -1297,8 +1297,9 @@ def _make_implicit_object_type(
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.
--
2.44.0
- Re: [PATCH v5 25/25] qapi: Dumb down QAPISchema.lookup_entity(), (continued)
- [PATCH v5 11/25] qapi/schema: assert resolve_type has 'info' and 'what' args on error, Markus Armbruster, 2024/03/15
- [PATCH v5 18/25] qapi/schema: assert inner type of QAPISchemaVariants in check_clash(), Markus Armbruster, 2024/03/15
- [PATCH v5 21/25] qapi/schema: add type hints, Markus Armbruster, 2024/03/15
- [PATCH v5 23/25] qapi/schema: remove unnecessary asserts, Markus Armbruster, 2024/03/15
- [PATCH v5 05/25] qapi: create QAPISchemaDefinition, Markus Armbruster, 2024/03/15
- [PATCH v5 01/25] qapi/parser: fix typo - self.returns.info => self.errors.info, Markus Armbruster, 2024/03/15
- [PATCH v5 07/25] qapi/schema: declare type for QAPISchemaArrayType.element_type, Markus Armbruster, 2024/03/15
- [PATCH v5 02/25] qapi/parser: shush up pylint, Markus Armbruster, 2024/03/15
- [PATCH v5 24/25] qapi: Tighten check whether implicit object type already exists,
Markus Armbruster <=
- Re: [PATCH v5 00/25] qapi: statically type schema.py, Markus Armbruster, 2024/03/19