From nobody Wed Oct 23 01:38:23 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1729246710; cv=none; d=zohomail.com; s=zohoarc; b=jKK0PCV8xSFIEis2FAtO9tzbqUodKqHcH8Xf7J8YP2A1hCH6Ml2HyE7D1yIo6XnbhPMBPpGDOaiBCv1R8yUahmp+4p1g4+3GI6310ZTqbK4U/eMHpajzEEFKuxvr4p+idPrOeqtFaTFg8PUr5DIKu/v0TJIVnKqverfYcE0W4+0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729246710; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CkLzGXbL10ME44xYiKetF9sjtGYpOyHnVzv2rUiLui4=; b=kYInKMgK2t8FEQ8MONMqpVQfU16phI9aSZk9gku/gKhMWX3B7EaQcEY81VKn4owt4sphD9hQkIrZIXiuwPeWOJWTBHBdVz4M7LL0t1djtlZTnvjQAn4/Yey0YM+NmMZpDYejhWGC6PmzNgTd3+P2DoQg+16KyhJ6DslvMXO3Krw= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1729246710744436.9146229377236; Fri, 18 Oct 2024 03:18:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t1k3T-00019x-SJ; Fri, 18 Oct 2024 06:17:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1k3S-00019l-La for qemu-devel@nongnu.org; Fri, 18 Oct 2024 06:17:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t1k3R-0005T9-5m for qemu-devel@nongnu.org; Fri, 18 Oct 2024 06:17:58 -0400 Received: from mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-661-ogScm4zPOK-yjGRfYoRa2A-1; Fri, 18 Oct 2024 06:17:38 -0400 Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 2A9461955F25; Fri, 18 Oct 2024 10:17:37 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.61]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id D9C4E19560A3; Fri, 18 Oct 2024 10:17:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729246676; 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=CkLzGXbL10ME44xYiKetF9sjtGYpOyHnVzv2rUiLui4=; b=BfBLyt/kDDcaLweoqtBRYMK3ac5VCZTDpEb7MF//Fap/c4eE6WaLHSPC7zuRxxn0clZPhR i8u8DhK7ZPhJ5ntb7sFnPANXFZOSpZl6tvLAh/2WIub5AZAfQn9mSPrWZok+p5WBAOPsg6 7s9Q8TVzzMw5xtXT7UbtJUrkXzdO678= X-MC-Unique: ogScm4zPOK-yjGRfYoRa2A-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Michael Roth , Markus Armbruster , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Subject: [PATCH v2 3/4] qapi: rename 'special_features' to 'features' Date: Fri, 18 Oct 2024 11:17:23 +0100 Message-ID: <20241018101724.1221152-4-berrange@redhat.com> In-Reply-To: <20241018101724.1221152-1-berrange@redhat.com> References: <20241018101724.1221152-1-berrange@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 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=170.10.129.124; envelope-from=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.068, 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_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=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.29 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-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1729246711557116600 This updates the QAPI code generation to refer to 'features' instead of 'special_features', in preparation for generalizing their exposure. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- scripts/qapi/commands.py | 4 ++-- scripts/qapi/gen.py | 6 +++--- scripts/qapi/types.py | 10 +++++----- scripts/qapi/visit.py | 14 +++++++------- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py index 79951a841f..d629d2d97e 100644 --- a/scripts/qapi/commands.py +++ b/scripts/qapi/commands.py @@ -25,7 +25,7 @@ QAPIGenC, QAPISchemaModularCVisitor, build_params, - gen_special_features, + gen_features, ifcontext, ) from .schema import ( @@ -298,7 +298,7 @@ def gen_register_command(name: str, ''', name=3Dname, c_name=3Dc_name(name), opts=3D' | '.join(options) or 0, - feats=3Dgen_special_features(features)) + feats=3Dgen_features(features)) return ret =20 =20 diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py index c53ca72950..aba1a982f6 100644 --- a/scripts/qapi/gen.py +++ b/scripts/qapi/gen.py @@ -41,10 +41,10 @@ from .source import QAPISourceInfo =20 =20 -def gen_special_features(features: Sequence[QAPISchemaFeature]) -> str: - special_features =3D [f"1u << {c_enum_const('qapi', feat.name)}" +def gen_features(features: Sequence[QAPISchemaFeature]) -> str: + features =3D [f"1u << {c_enum_const('qapi', feat.name)}" for feat in features if feat.is_special()] - return ' | '.join(special_features) or '0' + return ' | '.join(features) or '0' =20 =20 class QAPIGen: diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py index 7bc3f8241f..ade6b7a3d7 100644 --- a/scripts/qapi/types.py +++ b/scripts/qapi/types.py @@ -18,7 +18,7 @@ from .common import c_enum_const, c_name, mcgen from .gen import ( QAPISchemaModularCVisitor, - gen_special_features, + gen_features, ifcontext, ) from .schema import ( @@ -61,12 +61,12 @@ def gen_enum_lookup(name: str, index=3Dindex, name=3Dmemb.name) ret +=3D memb.ifcond.gen_endif() =20 - special_features =3D gen_special_features(memb.features) - if special_features !=3D '0': + features =3D gen_features(memb.features) + if features !=3D '0': feats +=3D mcgen(''' - [%(index)s] =3D %(special_features)s, + [%(index)s] =3D %(features)s, ''', - index=3Dindex, special_features=3Dspecial_featu= res) + index=3Dindex, features=3Dfeatures) =20 if feats: ret +=3D mcgen(''' diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py index 12f92e429f..8dbf4ef1c3 100644 --- a/scripts/qapi/visit.py +++ b/scripts/qapi/visit.py @@ -23,7 +23,7 @@ ) from .gen import ( QAPISchemaModularCVisitor, - gen_special_features, + gen_features, ifcontext, ) from .schema import ( @@ -103,15 +103,15 @@ def gen_visit_object_members(name: str, ''', name=3Dmemb.name, has=3Dhas) indent.increase() - special_features =3D gen_special_features(memb.features) - if special_features !=3D '0': + features =3D gen_features(memb.features) + if features !=3D '0': ret +=3D mcgen(''' - if (visit_policy_reject(v, "%(name)s", %(special_features)s, errp)) { + if (visit_policy_reject(v, "%(name)s", %(features)s, errp)) { return false; } - if (!visit_policy_skip(v, "%(name)s", %(special_features)s)) { + if (!visit_policy_skip(v, "%(name)s", %(features)s)) { ''', - name=3Dmemb.name, special_features=3Dspecial_feat= ures) + name=3Dmemb.name, features=3Dfeatures) indent.increase() ret +=3D mcgen(''' if (!visit_type_%(c_type)s(v, "%(name)s", &obj->%(c_name)s, errp)) { @@ -120,7 +120,7 @@ def gen_visit_object_members(name: str, ''', c_type=3Dmemb.type.c_name(), name=3Dmemb.name, c_name=3Dc_name(memb.name)) - if special_features !=3D '0': + if features !=3D '0': indent.decrease() ret +=3D mcgen(''' } --=20 2.46.0