From nobody Mon Nov 17 12:05:04 2025 Delivered-To: importer@patchew.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=1603743025; cv=none; d=zohomail.com; s=zohoarc; b=SSTJ6RRGHhwLBqoSYskgj15AbgWQy2TJios4pgakb6I9XLnEmTx3ZpsZZ5BIQmU+WHfzaK9ELLHsyabtaafNbtkyOj/CBeb3UeIpu/sF+b6kUMgZeorQw7g5sv+GDi8yIMMRUByn1dY3VFXm16Gbb4U+JXeb+whAi5zO7sf4JEs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1603743025; h=Content-Type:Content-Transfer-Encoding:Cc: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=7t+TOdJbR+kZy9WPkNJWw2EXuADY2daXwYBT0hG7Sy8=; b=LwCR/oK74jCQGQCDhulVPa40q+IISRZqA5ZiL8dW0ECoBu1qusYvf8TPgcw5T9HtnVh+rwTUGSK8h7Yi+5UKkjckE9RdZBmyLs0ggSLe0Vfw2iT0y/gYptnJBteU1YeuHiq7UQNlq+rEQrdvX/82uVSF3jFyotcRbk1ypE4dH2w= 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 1603743025225340.34499483795673; Mon, 26 Oct 2020 13:10:25 -0700 (PDT) Received: from localhost ([::1]:40600 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kX8oy-0003Sb-4P for importer@patchew.org; Mon, 26 Oct 2020 16:10:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33902) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kX8Ow-0006wE-1B for qemu-devel@nongnu.org; Mon, 26 Oct 2020 15:43:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:36691) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kX8Ou-0003Ay-13 for qemu-devel@nongnu.org; Mon, 26 Oct 2020 15:43:29 -0400 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-290-7d82Xk0nPqW5TFPPNtbBUQ-1; Mon, 26 Oct 2020 15:43:25 -0400 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 B9187AF9DA for ; Mon, 26 Oct 2020 19:43:13 +0000 (UTC) Received: from scv.redhat.com (ovpn-118-238.rdu2.redhat.com [10.10.118.238]) by smtp.corp.redhat.com (Postfix) with ESMTP id EED105B4BA; Mon, 26 Oct 2020 19:43:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603741407; 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=7t+TOdJbR+kZy9WPkNJWw2EXuADY2daXwYBT0hG7Sy8=; b=LVbBkQL08nyQqwsxjhKjB2QYmN1WuT5aGnBBPBe6RGZ/FYncCTC0P7WrmZzY5JnRGNEMUn vNGhYXkz9M3RA956NYAnxaKPTJMdf18SHWuZ3fiaHXs7PPbDFX/P+/m0KjC0GDqJGJXg85 kJ+RK9Obnb0FBGdlFfHjLUGQFEp1uDo= X-MC-Unique: 7d82Xk0nPqW5TFPPNtbBUQ-1 From: John Snow To: qemu-devel@nongnu.org, Markus Armbruster Subject: [PATCH v2 06/11] qapi/introspect.py: add _gen_features helper Date: Mon, 26 Oct 2020 15:42:46 -0400 Message-Id: <20201026194251.11075-7-jsnow@redhat.com> In-Reply-To: <20201026194251.11075-1-jsnow@redhat.com> References: <20201026194251.11075-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=jsnow@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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; Received-SPF: pass client-ip=63.128.21.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/25 21:03:19 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Cc: John Snow , Eduardo Habkost , Cleber Rosa 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" _make_tree might receive a dict or some other type. Adding features information should arguably be performed by the caller at such a time when we know the type of the object and don't have to re-interrogate it. Signed-off-by: John Snow Reviewed-by: Cleber Rosa --- scripts/qapi/introspect.py | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index 803288a64e7..16282f2634b 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -76,16 +76,12 @@ =20 =20 def _make_tree(obj: Union[_DObject, str], ifcond: List[str], - features: List[QAPISchemaFeature], extra: Optional[Annotations] =3D None ) -> TreeValue: if extra is None: extra =3D {} if ifcond: extra['if'] =3D ifcond - if features: - assert isinstance(obj, dict) - obj['features'] =3D [(f.name, {'if': f.ifcond}) for f in features] if extra: return (obj, extra) return obj @@ -221,6 +217,11 @@ def _use_type(self, typ: QAPISchemaType) -> str: return '[' + self._use_type(typ.element_type) + ']' return self._name(typ.name) =20 + @classmethod + def _gen_features(cls, + features: List[QAPISchemaFeature]) -> List[TreeValue= ]: + return [_make_tree(f.name, f.ifcond) for f in features] + def _gen_tree(self, name: str, mtype: str, obj: _DObject, ifcond: List[str], features: Optional[List[QAPISchemaFeature]]) -> None: @@ -233,7 +234,9 @@ def _gen_tree(self, name: str, mtype: str, obj: _DObjec= t, name =3D self._name(name) obj['name'] =3D name obj['meta-type'] =3D mtype - self._trees.append(_make_tree(obj, ifcond, features, extra)) + if features: + obj['features'] =3D self._gen_features(features) + self._trees.append(_make_tree(obj, ifcond, extra)) =20 def _gen_member(self, member: QAPISchemaObjectTypeMember) -> TreeValue: @@ -243,7 +246,9 @@ def _gen_member(self, } if member.optional: obj['default'] =3D None - return _make_tree(obj, member.ifcond, member.features) + if member.features: + obj['features'] =3D self._gen_features(member.features) + return _make_tree(obj, member.ifcond) =20 def _gen_variants(self, tag_name: str, variants: List[QAPISchemaVariant]) -> _DObject: @@ -255,7 +260,7 @@ def _gen_variant(self, variant: QAPISchemaVariant) -> T= reeValue: 'case': variant.name, 'type': self._use_type(variant.type) } - return _make_tree(obj, variant.ifcond, None) + return _make_tree(obj, variant.ifcond) =20 def visit_builtin_type(self, name: str, info: Optional[QAPISourceInfo], json_type: str) -> None: --=20 2.26.2