From nobody Fri Nov 14 03:47:34 2025 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=1584446453; cv=none; d=zohomail.com; s=zohoarc; b=FKjQGrm0mloVHCebpQwJw+pOndxStC8Xl87RdgrOAZhUj2qCQFZoIhqPJ4qtba7UV5i5PRzEGLOHqxeUrUwM7hksh+fxHYa6wmdZb8Sf82anZUcY06tY4pBxZebhZShMlHj1u7FZ5iA89zIP1xmSwWwPHNdlVXzP/MYwLWDqEkI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1584446453; 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=deHWtMLcOFVqmfety9mvhUjyvqnRYqCfdMv/VU5iTRQ=; b=PaxftexDlF3HA3P2ElCykqd6qvjejcfX20Mqd4UNk6VX5uaQ1kAbz6+QvIf6ApvKoZEJwgSZ3EFtAvxIQ/opk6Cx0U+DWugVebzFQMHoIQxGawZ3vKMVI+5Q3lKag/UwPRzD3Vrtz2PL7CqwriPHImH34ezOPlQrbhBmqHIL44M= 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 1584446453208945.3156916951208; Tue, 17 Mar 2020 05:00:53 -0700 (PDT) Received: from localhost ([::1]:59702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAtt-00085B-5L for importer@patchew.org; Tue, 17 Mar 2020 08:00:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56731) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jEAoV-000831-Ki for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:55:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jEAoU-0006K7-22 for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:55:15 -0400 Received: from us-smtp-delivery-74.mimecast.com ([216.205.24.74]:52802) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1jEAoT-0006H3-Sl for qemu-devel@nongnu.org; Tue, 17 Mar 2020 07:55:13 -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-363-cL444LzyOvCr-0-BUk0Clg-1; Tue, 17 Mar 2020 07:55:12 -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 EB7CA1034B05; Tue, 17 Mar 2020 11:55:10 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-130.ams2.redhat.com [10.36.112.130]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B3CCB9129A; Tue, 17 Mar 2020 11:55:09 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 47C831135A59; Tue, 17 Mar 2020 12:55:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584446113; 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=deHWtMLcOFVqmfety9mvhUjyvqnRYqCfdMv/VU5iTRQ=; b=ZqrjliA070QOckY++isPr0JQ3F/3I4iX/Am2EFesZuNyiyFS8Pctr2z10uI7KZ4ClXKJkm PZXQUyE8+B2coU8dES4fbt6cHseybl+pJZAGdaUVuDHJ9slSzowPEiMeppaXflJ3T7gDhv CgLz+yCurkzW5RDCI3cnJOJ9mmNPT7w= X-MC-Unique: cL444LzyOvCr-0-BUk0Clg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v4 16/34] qapi/schema: Change _make_features() to a take feature list Date: Tue, 17 Mar 2020 12:54:41 +0100 Message-Id: <20200317115459.31821-17-armbru@redhat.com> In-Reply-To: <20200317115459.31821-1-armbru@redhat.com> References: <20200317115459.31821-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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: 216.205.24.74 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: marcandre.lureau@gmail.com, mdroth@linux.vnet.ibm.com 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" QAPISchema._make_features() takes a definition expression, and extracts its 'features' member. The other ._make_FOO() leave destructuring expressions to their callers. Change ._make_features() to match them. Signed-off-by: Markus Armbruster Reviewed-by: Eric Blake --- scripts/qapi/schema.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index 958756ecd6..4d8ad67303 100644 --- a/scripts/qapi/schema.py +++ b/scripts/qapi/schema.py @@ -904,8 +904,9 @@ class QAPISchema: self._def_entity(QAPISchemaEnumType('QType', None, None, None, Non= e, qtype_values, 'QTYPE')) =20 - def _make_features(self, expr, info): - features =3D expr.get('features', []) + def _make_features(self, features, info): + if features is None: + return [] return [QAPISchemaFeature(f['name'], info, f.get('if')) for f in features] =20 @@ -955,7 +956,7 @@ class QAPISchema: data =3D expr['data'] prefix =3D expr.get('prefix') ifcond =3D expr.get('if') - features =3D self._make_features(expr, info) + features =3D self._make_features(expr.get('features'), info) self._def_entity(QAPISchemaEnumType( name, info, doc, ifcond, features, self._make_enum_members(data, info), prefix)) @@ -979,7 +980,7 @@ class QAPISchema: base =3D expr.get('base') data =3D expr['data'] ifcond =3D expr.get('if') - features =3D self._make_features(expr, info) + features =3D self._make_features(expr.get('features'), info) self._def_entity(QAPISchemaObjectType( name, info, doc, ifcond, features, base, self._make_members(data, info), @@ -1002,7 +1003,7 @@ class QAPISchema: data =3D expr['data'] base =3D expr.get('base') ifcond =3D expr.get('if') - features =3D self._make_features(expr, info) + features =3D self._make_features(expr.get('features'), info) tag_name =3D expr.get('discriminator') tag_member =3D None if isinstance(base, dict): @@ -1032,7 +1033,7 @@ class QAPISchema: name =3D expr['alternate'] data =3D expr['data'] ifcond =3D expr.get('if') - features =3D self._make_features(expr, info) + features =3D self._make_features(expr.get('features'), info) variants =3D [self._make_variant(key, value['type'], value.get('if= '), info) for (key, value) in data.items()] @@ -1052,7 +1053,7 @@ class QAPISchema: allow_oob =3D expr.get('allow-oob', False) allow_preconfig =3D expr.get('allow-preconfig', False) ifcond =3D expr.get('if') - features =3D self._make_features(expr, info) + features =3D self._make_features(expr.get('features'), info) if isinstance(data, OrderedDict): data =3D self._make_implicit_object_type( name, info, ifcond, @@ -1070,7 +1071,7 @@ class QAPISchema: data =3D expr.get('data') boxed =3D expr.get('boxed', False) ifcond =3D expr.get('if') - features =3D self._make_features(expr, info) + features =3D self._make_features(expr.get('features'), info) if isinstance(data, OrderedDict): data =3D self._make_implicit_object_type( name, info, ifcond, --=20 2.21.1