From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNWANTED_LANGUAGE_BODY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D71EC10DCE for ; Sun, 15 Mar 2020 15:02:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 2C005206B1 for ; Sun, 15 Mar 2020 15:02:24 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="JHHi3k4G" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2C005206B1 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54880 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDUmV-0001T0-6Q for qemu-devel@archiver.kernel.org; Sun, 15 Mar 2020 11:02:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:40348) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jDUXf-0005X6-Dj for qemu-devel@nongnu.org; Sun, 15 Mar 2020 10:47:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1jDUXd-0002Ic-Fn for qemu-devel@nongnu.org; Sun, 15 Mar 2020 10:47:03 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:52043 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 1jDUXd-0002Gl-9D for qemu-devel@nongnu.org; Sun, 15 Mar 2020 10:47:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1584283620; 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=JHHi3k4GlcQncm/+RgUSaP7+V5eHbTbk+N5ZkfNpeMCLVaFM3kHb9XkbyrjspKlwAb6Ne5 fUtyLHRX4Db4RVmdUbNgiNWMiz5z5bWETKzWcDMwe9NqJ/bMDm/JcxmmBDBQUazPfL7IbV Tu5/bzLdtIWJdvEjgnYcRw06Thjl1HY= 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-31-YxXh6AHdMdSfbIAiNnfsng-1; Sun, 15 Mar 2020 10:46:59 -0400 X-MC-Unique: YxXh6AHdMdSfbIAiNnfsng-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 439C2189D6C3; Sun, 15 Mar 2020 14:46:58 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-49.ams2.redhat.com [10.36.116.49]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1489D5C1B2; Sun, 15 Mar 2020 14:46:58 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id A7FA51135A59; Sun, 15 Mar 2020 15:46:53 +0100 (CET) From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v3 16/34] qapi/schema: Change _make_features() to a take feature list Date: Sun, 15 Mar 2020 15:46:35 +0100 Message-Id: <20200315144653.22660-17-armbru@redhat.com> In-Reply-To: <20200315144653.22660-1-armbru@redhat.com> References: <20200315144653.22660-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII 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: , Cc: mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- 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