[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/6] qapi: Tweak "command returns a nice type" check for clarity
From: |
Markus Armbruster |
Subject: |
[PULL 1/6] qapi: Tweak "command returns a nice type" check for clarity |
Date: |
Tue, 14 Jan 2020 11:20:50 +0100 |
Signed-off-by: Markus Armbruster <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
---
scripts/qapi/schema.py | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index cf0045f34e..cfb574c85d 100644
--- a/scripts/qapi/schema.py
+++ b/scripts/qapi/schema.py
@@ -711,10 +711,11 @@ class QAPISchemaCommand(QAPISchemaEntity):
self.ret_type = schema.resolve_type(
self._ret_type_name, self.info, "command's 'returns'")
if self.name not in self.info.pragma.returns_whitelist:
- if not (isinstance(self.ret_type, QAPISchemaObjectType)
- or (isinstance(self.ret_type, QAPISchemaArrayType)
- and isinstance(self.ret_type.element_type,
- QAPISchemaObjectType))):
+ typ = self.ret_type
+ if isinstance(typ, QAPISchemaArrayType):
+ typ = self.ret_type.element_type
+ assert typ
+ if not isinstance(typ, QAPISchemaObjectType):
raise QAPISemError(
self.info,
"command's 'returns' cannot take %s"
--
2.21.1
- [PULL 0/6] QAPI patches for 2020-01-14, Markus Armbruster, 2020/01/14
- [PULL 6/6] qapi: Simplify QAPISchemaModularCVisitor, Markus Armbruster, 2020/01/14
- [PULL 4/6] qapi: Proper intermediate representation for modules, Markus Armbruster, 2020/01/14
- [PULL 3/6] qapi: Generate command registration stuff into separate files, Markus Armbruster, 2020/01/14
- [PULL 1/6] qapi: Tweak "command returns a nice type" check for clarity,
Markus Armbruster <=
- [PULL 2/6] tests/Makefile.include: Fix missing test-qapi-emit-events.[ch], Markus Armbruster, 2020/01/14
- [PULL 5/6] qapi: Fix code generation for empty modules, Markus Armbruster, 2020/01/14
- Re: [PULL 0/6] QAPI patches for 2020-01-14, Peter Maydell, 2020/01/16