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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D1284C433F5 for ; Mon, 25 Oct 2021 19:41:16 +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 6110761179 for ; Mon, 25 Oct 2021 19:41:16 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6110761179 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:58214 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mf5qN-0007rV-Cx for qemu-devel@archiver.kernel.org; Mon, 25 Oct 2021 15:41:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46680) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mf5m8-0001VX-8t for qemu-devel@nongnu.org; Mon, 25 Oct 2021 15:36:53 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:59023) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mf5m5-0003aa-Qh for qemu-devel@nongnu.org; Mon, 25 Oct 2021 15:36:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635190609; 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: in-reply-to:in-reply-to:references:references; bh=uX+goL07w3axmSPkvgVSXdozPc5tYbISgpU5BnA8V5g=; b=J1F6QwV7xyrCVs6l+OExWGEo24fd0qZe1qLNDuVERbwnaRJ+Dzm15wlOA/K7kQAlgr/Rrz BTl+cnEM0eF0oGPj6HBu+kZYlDsLGvdqTjX7zLpqnJ8uVpZF2WYPmLdkuKuEe6miPQ9W4y ZGbp4YZNTOtYwDIlrgdFlli/f/F1jwI= Received: from mail-ua1-f71.google.com (mail-ua1-f71.google.com [209.85.222.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-272-dJUB7i8aONO9VnnDgvWoUA-1; Mon, 25 Oct 2021 15:36:42 -0400 X-MC-Unique: dJUB7i8aONO9VnnDgvWoUA-1 Received: by mail-ua1-f71.google.com with SMTP id m2-20020a9f3fc2000000b002cb74488fdaso4225788uaj.18 for ; Mon, 25 Oct 2021 12:36:42 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=uX+goL07w3axmSPkvgVSXdozPc5tYbISgpU5BnA8V5g=; b=CQTTmX5LibgupW+QycgrOFszydJEdIBojhqnt8GdrOjB+Vd6EakinC4UqAvemdIh1w ndVLp7nq0N4738fXCxFERswaC/3nnk7JTIvWwZQnSb/Cw73nHeEIYNL0ExsEpWfnQmdl TIjuNVQf9b9YUahCMd0YPCavQpJautfGZNGmpSvsgys1edIA4QojoP20+SGgVqOueDJ5 NBIFrQEotyFgugJ/+9/330el+9D5tB4nAuqAZV2nKcSnV95Hk5QJlaalim0kYBD3a30a qDDlaazh+pVC0xkK0Zc/VNrValuWERQKxw1iLCle+fBcrm5yoyOpzQ/eiubqnsfcThm/ F2jg== X-Gm-Message-State: AOAM531HpOzLcWApxYwqh5StbtYx9Cpsx0O4lL8S8v/YLZDOZYOi0ydE LQSIEy0I71S0iRByES37ujCG56TDcqNJ9Shga4Tar0/tAanAljguKy8BkPkh6X9f3xubJ0qhMA0 feWi2h5vTQl8HXQHz+3zV72R0d+Cst6Q= X-Received: by 2002:a05:6102:390b:: with SMTP id e11mr606517vsu.27.1635190601877; Mon, 25 Oct 2021 12:36:41 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyTQwaIyAx9u1m0UK5fRFp763ihJDgexO417vb1HPxPk728iicQW3yP34p+bVoWfqqwoGVX6sr/rqNZjEbZ1bw= X-Received: by 2002:a05:6102:390b:: with SMTP id e11mr606478vsu.27.1635190601659; Mon, 25 Oct 2021 12:36:41 -0700 (PDT) MIME-Version: 1.0 References: <20211025052532.3859634-1-armbru@redhat.com> <20211025052532.3859634-8-armbru@redhat.com> In-Reply-To: <20211025052532.3859634-8-armbru@redhat.com> From: John Snow Date: Mon, 25 Oct 2021 15:36:31 -0400 Message-ID: Subject: Re: [PATCH 7/9] qapi: Generalize enum member policy checking To: Markus Armbruster 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-Type: multipart/alternative; boundary="000000000000f3ccb505cf327ac0" Received-SPF: pass client-ip=170.10.133.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-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: Kevin Wolf , pkrempa@redhat.com, Daniel Berrange , Eduardo Habkost , qemu-block@nongnu.org, Juan Quintela , libvir-list@redhat.com, qemu-devel , mdroth@linux.vnet.ibm.com, "Dr. David Alan Gilbert" , Paolo Bonzini , =?UTF-8?B?TWFyYy1BbmRyw6kgTHVyZWF1?= , Eric Blake , libguestfs@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --000000000000f3ccb505cf327ac0 Content-Type: text/plain; charset="UTF-8" On Mon, Oct 25, 2021 at 1:26 AM Markus Armbruster wrote: > The code to check enumeration value policy can see special feature > flag 'deprecated' in QEnumLookup member flags[value]. I want to make > feature flag 'unstable' visible there as well, so I can add policy for > it. > > Instead of extending flags[], replace it by @special_features (a > bitset of QapiSpecialFeature), because that's how special features get > passed around elsewhere. > > Signed-off-by: Markus Armbruster > --- > include/qapi/util.h | 5 +---- > qapi/qapi-visit-core.c | 3 ++- > scripts/qapi/types.py | 22 ++++++++++++---------- > 3 files changed, 15 insertions(+), 15 deletions(-) > > diff --git a/include/qapi/util.h b/include/qapi/util.h > index 7a8d5c7d72..0cc98db9f9 100644 > --- a/include/qapi/util.h > +++ b/include/qapi/util.h > @@ -15,12 +15,9 @@ typedef enum { > QAPI_DEPRECATED, > } QapiSpecialFeature; > > -/* QEnumLookup flags */ > -#define QAPI_ENUM_DEPRECATED 1 > - > typedef struct QEnumLookup { > const char *const *array; > - const unsigned char *const flags; > + const unsigned char *const special_features; > const int size; > } QEnumLookup; > > diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c > index b4a81f1757..5572d90efb 100644 > --- a/qapi/qapi-visit-core.c > +++ b/qapi/qapi-visit-core.c > @@ -407,7 +407,8 @@ static bool input_type_enum(Visitor *v, const char > *name, int *obj, > return false; > } > > - if (lookup->flags && (lookup->flags[value] & QAPI_ENUM_DEPRECATED)) { > + if (lookup->special_features > + && (lookup->special_features[value] & QAPI_DEPRECATED)) { > switch (v->compat_policy.deprecated_input) { > case COMPAT_POLICY_INPUT_ACCEPT: > break; > diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py > index ab2441adc9..3013329c24 100644 > --- a/scripts/qapi/types.py > +++ b/scripts/qapi/types.py > @@ -16,7 +16,7 @@ > from typing import List, Optional > > from .common import c_enum_const, c_name, mcgen > -from .gen import QAPISchemaModularCVisitor, ifcontext > +from .gen import QAPISchemaModularCVisitor, gen_special_features, > ifcontext > from .schema import ( > QAPISchema, > QAPISchemaEnumMember, > @@ -39,7 +39,7 @@ def gen_enum_lookup(name: str, > members: List[QAPISchemaEnumMember], > prefix: Optional[str] = None) -> str: > max_index = c_enum_const(name, '_MAX', prefix) > - flags = '' > + feats = '' > ret = mcgen(''' > > const QEnumLookup %(c_name)s_lookup = { > @@ -54,19 +54,21 @@ def gen_enum_lookup(name: str, > ''', > index=index, name=memb.name) > ret += memb.ifcond.gen_endif() > - if 'deprecated' in (f.name for f in memb.features): > - flags += mcgen(''' > - [%(index)s] = QAPI_ENUM_DEPRECATED, > -''', > - index=index) > > - if flags: > + special_features = gen_special_features(memb.features) > + if special_features != '0': > Though, I have to admit the common reoccurrence of this pattern suggests to me that gen_special_features really ought to be returning something false-y in these cases. Something about testing for the empty case with something that represents, but isn't empty, gives me a brief pause. Not willing to wage war over it. > + feats += mcgen(''' > + [%(index)s] = %(special_features)s, > +''', > + index=index, special_features=special_features) > + > + if feats: > ret += mcgen(''' > }, > - .flags = (const unsigned char[%(max_index)s]) { > + .special_features = (const unsigned char[%(max_index)s]) { > ''', > max_index=max_index) > - ret += flags > + ret += feats > > ret += mcgen(''' > }, > -- > 2.31.1 > > Python bits: Acked-by: John Snow --000000000000f3ccb505cf327ac0 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Mon, Oct 25, 2021 at 1:26 AM Marku= s Armbruster <armbru@redhat.com= > wrote:
The = code to check enumeration value policy can see special feature
flag 'deprecated' in QEnumLookup member flags[value].=C2=A0 I want = to make
feature flag 'unstable' visible there as well, so I can add policy = for
it.

Instead of extending flags[], replace it by @special_features (a
bitset of QapiSpecialFeature), because that's how special features get<= br> passed around elsewhere.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
=C2=A0include/qapi/util.h=C2=A0 =C2=A0 |=C2=A0 5 +----
=C2=A0qapi/qapi-visit-core.c |=C2=A0 3 ++-
=C2=A0scripts/qapi/types.py=C2=A0 | 22 ++++++++++++----------
=C2=A03 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/include/qapi/util.h b/include/qapi/util.h
index 7a8d5c7d72..0cc98db9f9 100644
--- a/include/qapi/util.h
+++ b/include/qapi/util.h
@@ -15,12 +15,9 @@ typedef enum {
=C2=A0 =C2=A0 =C2=A0QAPI_DEPRECATED,
=C2=A0} QapiSpecialFeature;

-/* QEnumLookup flags */
-#define QAPI_ENUM_DEPRECATED 1
-
=C2=A0typedef struct QEnumLookup {
=C2=A0 =C2=A0 =C2=A0const char *const *array;
-=C2=A0 =C2=A0 const unsigned char *const flags;
+=C2=A0 =C2=A0 const unsigned char *const special_features;
=C2=A0 =C2=A0 =C2=A0const int size;
=C2=A0} QEnumLookup;

diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
index b4a81f1757..5572d90efb 100644
--- a/qapi/qapi-visit-core.c
+++ b/qapi/qapi-visit-core.c
@@ -407,7 +407,8 @@ static bool input_type_enum(Visitor *v, const char *nam= e, int *obj,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0return false;
=C2=A0 =C2=A0 =C2=A0}

-=C2=A0 =C2=A0 if (lookup->flags && (lookup->flags[value] &am= p; QAPI_ENUM_DEPRECATED)) {
+=C2=A0 =C2=A0 if (lookup->special_features
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 && (lookup->special_features[value]= & QAPI_DEPRECATED)) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0switch (v->compat_policy.deprecated_in= put) {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0case COMPAT_POLICY_INPUT_ACCEPT:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0break;
diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py
index ab2441adc9..3013329c24 100644
--- a/scripts/qapi/types.py
+++ b/scripts/qapi/types.py
@@ -16,7 +16,7 @@
=C2=A0from typing import List, Optional

=C2=A0from .common import c_enum_const, c_name, mcgen
-from .gen import QAPISchemaModularCVisitor, ifcontext
+from .gen import QAPISchemaModularCVisitor, gen_special_features, ifcontex= t
=C2=A0from .schema import (
=C2=A0 =C2=A0 =C2=A0QAPISchema,
=C2=A0 =C2=A0 =C2=A0QAPISchemaEnumMember,
@@ -39,7 +39,7 @@ def gen_enum_lookup(name: str,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0members: List[QAPISchemaEnumMember],
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0prefix: Optional[str] =3D None) -> str:
=C2=A0 =C2=A0 =C2=A0max_index =3D c_enum_const(name, '_MAX', prefix= )
-=C2=A0 =C2=A0 flags =3D ''
+=C2=A0 =C2=A0 feats =3D ''
=C2=A0 =C2=A0 =C2=A0ret =3D mcgen('''

=C2=A0const QEnumLookup %(c_name)s_lookup =3D {
@@ -54,19 +54,21 @@ def gen_enum_lookup(name: str,
=C2=A0''',
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 index=3Dindex, name=3Dmemb.name)
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ret +=3D memb.ifcond.gen_endif()
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 if 'deprecated' in (f.name for f in memb.featu= res):
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 flags +=3D mcgen('''=
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 [%(index)s] =3D QAPI_ENUM_DEPRECATED,
-''',
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0index=3Dindex)

-=C2=A0 =C2=A0 if flags:
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 special_features =3D gen_special_features(memb= .features)
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 if special_features !=3D '0':

Though, I have to admit the common reoccurrence= of this pattern suggests to me that gen_special_features really ought to b= e returning something false-y in these cases. Something about testing for t= he empty case with something that represents, but isn't empty, gives me= a brief pause.

Not willing to wage war over it.
=C2=A0
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 feats +=3D mcgen('''=
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 [%(index)s] =3D %(special_features)s,
+''',
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0index=3Dindex, special_features=3Dspecial_features)=
+
+=C2=A0 =C2=A0 if feats:
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0ret +=3D mcgen('''
=C2=A0 =C2=A0 =C2=A0},
-=C2=A0 =C2=A0 .flags =3D (const unsigned char[%(max_index)s]) {
+=C2=A0 =C2=A0 .special_features =3D (const unsigned char[%(max_index)s]) {=
=C2=A0''',
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 max_index=3Dmax_index)
-=C2=A0 =C2=A0 =C2=A0 =C2=A0 ret +=3D flags
+=C2=A0 =C2=A0 =C2=A0 =C2=A0 ret +=3D feats

=C2=A0 =C2=A0 =C2=A0ret +=3D mcgen('''
=C2=A0 =C2=A0 =C2=A0},
--
2.31.1


Python bits: Acked-by: John Snow <<= a href=3D"mailto:jsnow@redhat.com">jsnow@redhat.com>

=
--000000000000f3ccb505cf327ac0--