From nobody Mon Feb 9 22:02:47 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=1576570610; cv=none; d=zohomail.com; s=zohoarc; b=QXiNW1Ov245QH5SflBQbQrHFjwAYsLcSQsuQ/dKJfvRZlUn56TEfHREthB69ixx9ykQNS01W71YiQsBMe+M+LjzFJDMWER+Wb3TcKiuhyP7eCTt+VxzWHS6hR6YCFsX/631WKai+pO8oZSW+Zux8x8XRJiZ5Bw6vfqIIwXuBgKA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1576570610; 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=m6f38h/JZmQi/Jx/m8vw6AzgPHxby1Rs0H+SHVuoO1A=; b=nofdXWGiLXoDhwv86/XBiGrutaxoAxCNndtn7flzn/eFwpSe3F+l65Xx6PRBmbIdCEqcuhRdqtKYp7P9+bhphH71qxYt8rIeBF4WQMr4ury7Ix8vsnZj8tZZNmDw9PInAwF9T4GO5zr+I72f9zEsvXvx+TsBDhAX/hw8z68pb60= 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 1576570610866933.8202834418565; Tue, 17 Dec 2019 00:16:50 -0800 (PST) Received: from localhost ([::1]:37500 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ih82D-0002mQ-3u for importer@patchew.org; Tue, 17 Dec 2019 03:16:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48511) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ih80U-0001Ak-VS for qemu-devel@nongnu.org; Tue, 17 Dec 2019 03:15:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ih80S-0003Fg-2E for qemu-devel@nongnu.org; Tue, 17 Dec 2019 03:15:01 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:24583 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ih80R-0003Ca-HQ for qemu-devel@nongnu.org; Tue, 17 Dec 2019 03:14:59 -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-194-Y68QiBOeMKKJJh6Nr16HsA-1; Tue, 17 Dec 2019 03:14:57 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 9EA838024EA for ; Tue, 17 Dec 2019 08:14:56 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-42.ams2.redhat.com [10.36.116.42]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6A9F17D9D9; Tue, 17 Dec 2019 08:14:56 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id D4A4811385EE; Tue, 17 Dec 2019 09:14:54 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1576570498; 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=m6f38h/JZmQi/Jx/m8vw6AzgPHxby1Rs0H+SHVuoO1A=; b=Qta64TbIkNcE00yCnE3tlOBfw66LcFc6uq+l0AZ5q4mTGoyPgqSf69n7n1mYg5q63VaY1N t4dhame0XLXIhWI86OkEEPD1hH6puYuURZF6zClCkjfQkaBLI2Jx1s8pi6xDCpOgcCKMMG Llr52fp1CxoyVvILsdtVbR+Q8xCgplQ= From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 1/6] qapi: Tweak "command returns a nice type" check for clarity Date: Tue, 17 Dec 2019 09:14:49 +0100 Message-Id: <20191217081454.8072-2-armbru@redhat.com> In-Reply-To: <20191217081454.8072-1-armbru@redhat.com> References: <20191217081454.8072-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-MC-Unique: Y68QiBOeMKKJJh6Nr16HsA-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: 205.139.110.120 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.0