From: Markus Armbruster <armbru@redhat.com>
Date: Wed, 20 Nov 2019 18:25:46 +0000 (+0100)
Subject: qapi: Tweak "command returns a nice type" check for clarity
X-Git-Tag: v5.0.0-rc0~144^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7e9c1707e14e50d5447cc6c3d3b20a641331ad18;p=thirdparty%2Fqemu.git

qapi: Tweak "command returns a nice type" check for clarity

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20191120182551.23795-2-armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
---

diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py
index cf0045f34e5..cfb574c85d2 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"