From nobody Sun Nov 24 17:38:01 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=1722535252; cv=none; d=zohomail.com; s=zohoarc; b=it7DEdBw42VSrXBL0I/Lw3fFusvQgg+dabvRep9947r6aDUSXLnZvCtqr3cc8qb8a+KLjkF3ly4paBybdrrFCIWFyPvTh/CvKldZzAWU+sfIi63B8X+8W2Cg90YmMIPzY8qCOc2lLL2XXFW/3YVxJiLvFWo3z3tFe7NVaeK+wcQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1722535252; 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=gjmXgGzTx2PPKb6vl+5P/ivLVpqgVC1jTbbAHudRTVw=; b=KYAv8wGpL7c3dSUxlDCk9Di8IyJ0A5bHIZzueen7O6iH/JBNns5XnsBHDiyYr1tt4NPTjsLyThu9yXhLZryFEsNFtZ/XbXjNIfCeOHDDZAH8ZaYS6XqDrBw+e+n3aMojzMvjXbUjXcDKo0UxTZqI0zA+InZEkrPqQ+n9AdOHvXk= 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 1722535252072912.4858658657431; Thu, 1 Aug 2024 11:00:52 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sZa5R-0001kO-UK; Thu, 01 Aug 2024 13:59:37 -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 1sZa5P-0001ZF-4h for qemu-devel@nongnu.org; Thu, 01 Aug 2024 13:59:35 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sZa5M-0005uM-59 for qemu-devel@nongnu.org; Thu, 01 Aug 2024 13:59:34 -0400 Received: from mx-prod-mc-02.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-526-2HESJ0tjPXi3Capv2bcuUg-1; Thu, 01 Aug 2024 13:59:28 -0400 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 8A1791955D45; Thu, 1 Aug 2024 17:59:27 +0000 (UTC) Received: from toolbox.redhat.com (unknown [10.42.28.17]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 908D1195605A; Thu, 1 Aug 2024 17:59:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722535171; 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=gjmXgGzTx2PPKb6vl+5P/ivLVpqgVC1jTbbAHudRTVw=; b=Jo7IguMd1Pq2yl5w3NqP69WX7c0zJUROxM6DsEunw4PRYbrNp5BEwEGg+fCuevlfmylyOM vGY47G/Yc4C5//wk13Ree4A45R0hfyb7p6HNWTEaMmmNBgoHZ/pThmFrxxhD78QrHqsO5K Wnaoki0zKIFaCtQhzNuB0RkkBm5PHgQ= X-MC-Unique: 2HESJ0tjPXi3Capv2bcuUg-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Cc: Markus Armbruster , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Thomas Huth , Paolo Bonzini , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Michael Roth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Subject: [PATCH 3/6] qapi: use "QAPI_FEATURE" as namespace for features Date: Thu, 1 Aug 2024 18:59:10 +0100 Message-ID: <20240801175913.669013-4-berrange@redhat.com> In-Reply-To: <20240801175913.669013-1-berrange@redhat.com> References: <20240801175913.669013-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.40 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.133.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.131, 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_H4=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: 1722535254156116600 This more clearly distinguishes the feature constants from other QAPI constants. Signed-off-by: Daniel P. Berrang=C3=A9 Reviewed-by: Markus Armbruster --- include/qapi/util.h | 4 ++-- qapi/qapi-util.c | 4 ++-- qapi/qobject-output-visitor.c | 4 ++-- scripts/qapi/gen.py | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/include/qapi/util.h b/include/qapi/util.h index b377cb9c70..a693cac9ea 100644 --- a/include/qapi/util.h +++ b/include/qapi/util.h @@ -12,8 +12,8 @@ #define QAPI_UTIL_H =20 typedef enum { - QAPI_DEPRECATED, - QAPI_UNSTABLE, + QAPI_FEATURE_DEPRECATED, + QAPI_FEATURE_UNSTABLE, } QapiFeature; =20 typedef struct QEnumLookup { diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c index 3d849fe034..48c8c867d3 100644 --- a/qapi/qapi-util.c +++ b/qapi/qapi-util.c @@ -43,13 +43,13 @@ bool compat_policy_input_ok(uint64_t features, const char *kind, const char *name, Error **errp) { - if ((features & 1u << QAPI_DEPRECATED) + if ((features & 1u << QAPI_FEATURE_DEPRECATED) && !compat_policy_input_ok1("Deprecated", policy->deprecated_input, error_class, kind, name, errp)) { return false; } - if ((features & (1u << QAPI_UNSTABLE)) + if ((features & (1u << QAPI_FEATURE_UNSTABLE)) && !compat_policy_input_ok1("Unstable", policy->unstable_input, error_class, kind, name, errp)) { diff --git a/qapi/qobject-output-visitor.c b/qapi/qobject-output-visitor.c index 8902287caa..b13c94d913 100644 --- a/qapi/qobject-output-visitor.c +++ b/qapi/qobject-output-visitor.c @@ -214,9 +214,9 @@ static bool qobject_output_policy_skip(Visitor *v, cons= t char *name, { CompatPolicy *pol =3D &v->compat_policy; =20 - return ((features & 1u << QAPI_DEPRECATED) + return ((features & 1u << QAPI_FEATURE_DEPRECATED) && pol->deprecated_output =3D=3D COMPAT_POLICY_OUTPUT_HIDE) - || ((features & 1u << QAPI_UNSTABLE) + || ((features & 1u << QAPI_FEATURE_UNSTABLE) && pol->unstable_output =3D=3D COMPAT_POLICY_OUTPUT_HIDE); } =20 diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py index e6c80cce23..0ff29dc776 100644 --- a/scripts/qapi/gen.py +++ b/scripts/qapi/gen.py @@ -41,7 +41,7 @@ =20 =20 def gen_features(features: Sequence[QAPISchemaFeature]) -> str: - features =3D [f"1u << QAPI_{feat.name.upper()}" + features =3D [f"1u << QAPI_FEATURE_{feat.name.upper()}" for feat in features if feat.is_special()] return ' | '.join(features) or '0' =20 --=20 2.45.2