From nobody Mon Feb 9 16:19:20 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1578997390; cv=none; d=zohomail.com; s=zohoarc; b=aH08fLquuqf6Rr1g2k86i6usvtEML2tFiqFzJR99JWphwhViWk7RzXf1n3q6A2mo7UCShc/igwwbPNHXTWLCvK9TqF8jS+ryyB6WGHO6tNKbEghEEvF4S4u41ZO7jBHpQC/UacthDG/pntPbCieDebvyFIp+fvCmmOqt2jBvz0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1578997390; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=CP9UPExDPMMsrTQ5ez/dcdM2GrYD9MdFqPwdDXiYSOg=; b=kxqELRIOKHDnBqDcVVnptCpQB/gsblXmc1FDr4rLwJYvuEnrIRPiRGEWVr3tepkQ7mW8CEq1A1DQNGSX9bDTm8Bh3q2NQlsRAOueX61Y6MW/yoFmQW6f3dISqMI8aztX4yUAxaCUboTeH7aEIAdupVnIexfiZaeQn27KMuUQ8jk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1578997390974772.0712021873793; Tue, 14 Jan 2020 02:23:10 -0800 (PST) Received: from localhost ([::1]:36374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irJLp-0003qE-Bz for importer@patchew.org; Tue, 14 Jan 2020 05:23:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40759) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1irJJo-0001oK-7d for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1irJJk-0006Rk-HR for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:04 -0500 Received: from us-smtp-2.mimecast.com ([207.211.31.81]:34173 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1irJJk-0006RD-Dm for qemu-devel@nongnu.org; Tue, 14 Jan 2020 05:21:00 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-423-ulB_PqY-NLGmdkkOq6moRg-1; Tue, 14 Jan 2020 05:20:58 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2E263802B7F for ; Tue, 14 Jan 2020 10:20:57 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-131.ams2.redhat.com [10.36.116.131]) by smtp.corp.redhat.com (Postfix) with ESMTPS id F390780F52; Tue, 14 Jan 2020 10:20:56 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 63BB41138619; Tue, 14 Jan 2020 11:20:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578997260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=CP9UPExDPMMsrTQ5ez/dcdM2GrYD9MdFqPwdDXiYSOg=; b=CzCCdjiY1+jlxb83YQHwpY5ffb5pLRGxFUY1wYwaqFefD7hqJC2SVTMIJd8U9jutAOVQu1 CTF+YEW1T1rqT6XoZN3OIhm7dj0Kgn6o4nBwoljibaRcV4hiDUk9WGQwkIWH4ED44UzgUp taqekRC8wCQ+jiWHkLrue5rqi3faloc= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 1/6] qapi: Tweak "command returns a nice type" check for clarity Date: Tue, 14 Jan 2020 11:20:50 +0100 Message-Id: <20200114102055.24058-2-armbru@redhat.com> In-Reply-To: <20200114102055.24058-1-armbru@redhat.com> References: <20200114102055.24058-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: ulB_PqY-NLGmdkkOq6moRg-1 X-Mimecast-Spam-Score: 0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Signed-off-by: Markus Armbruster Message-Id: <20191120182551.23795-2-armbru@redhat.com> Reviewed-by: Eric Blake --- 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 =3D 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 =3D self.ret_type + if isinstance(typ, QAPISchemaArrayType): + typ =3D self.ret_type.element_type + assert typ + if not isinstance(typ, QAPISchemaObjectType): raise QAPISemError( self.info, "command's 'returns' cannot take %s" --=20 2.21.1