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 9243BC433F5 for ; Tue, 26 Oct 2021 08:52:06 +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 E328B60E73 for ; Tue, 26 Oct 2021 08:52:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E328B60E73 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]:57158 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mfIBg-0006tT-WC for qemu-devel@archiver.kernel.org; Tue, 26 Oct 2021 04:52:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58544) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfI8O-0003Wm-6J for qemu-devel@nongnu.org; Tue, 26 Oct 2021 04:48:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:54830) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mfI8K-0004fx-JV for qemu-devel@nongnu.org; Tue, 26 Oct 2021 04:48:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1635238116; 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=2Z4XImYDyDcvviYdBqdbtdKmDQDjBJjuagUUPZYvcKQ=; b=QHpmhBg6gUZtgocDUwRvVnj3H3atVdqhRbtTnPkVnZAZxe5eEk1SjG3Rkc3/LURYspPLmf L7FJIikXpWa3nLqy2KmgkEgRYlb5rHm/eWljlQJzDn6Mqr4rhdEDQsSBCyS7MoQyXs3OiF 3qwUdJ3krxcFzL9y1+0iKgWbE043Iz4= 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-446-_u_bsma4NpCyuAFX-Z7NTw-1; Tue, 26 Oct 2021 04:48:32 -0400 X-MC-Unique: _u_bsma4NpCyuAFX-Z7NTw-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C11FE1006AA6; Tue, 26 Oct 2021 08:48:31 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-7.ams2.redhat.com [10.36.112.7]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 24AAD5DD68; Tue, 26 Oct 2021 08:48:07 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id AC0E711380A7; Tue, 26 Oct 2021 10:48:05 +0200 (CEST) From: Markus Armbruster To: John Snow Subject: Re: [PATCH 4/9] qapi: Tools for sets of special feature flags in generated code References: <20211025052532.3859634-1-armbru@redhat.com> <20211025052532.3859634-5-armbru@redhat.com> Date: Tue, 26 Oct 2021 10:48:05 +0200 In-Reply-To: (John Snow's message of "Mon, 25 Oct 2021 15:21:43 -0400") Message-ID: <87sfwo5fzu.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Received-SPF: pass client-ip=170.10.133.124; envelope-from=armbru@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, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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?Q?Marc-Andr=C3=A9?= Lureau , Eric Blake , libguestfs@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" John Snow writes: > On Mon, Oct 25, 2021 at 1:25 AM Markus Armbruster wrote: > >> New enum QapiSpecialFeature enumerates the special feature flags. >> >> New helper gen_special_features() returns code to represent a >> collection of special feature flags as a bitset. >> >> The next few commits will put them to use. >> >> Signed-off-by: Markus Armbruster >> --- >> include/qapi/util.h | 4 ++++ >> scripts/qapi/gen.py | 13 +++++++++++++ >> scripts/qapi/schema.py | 3 +++ >> 3 files changed, 20 insertions(+) >> >> diff --git a/include/qapi/util.h b/include/qapi/util.h >> index 257c600f99..7a8d5c7d72 100644 >> --- a/include/qapi/util.h >> +++ b/include/qapi/util.h >> @@ -11,6 +11,10 @@ >> #ifndef QAPI_UTIL_H >> #define QAPI_UTIL_H >> >> +typedef enum { >> + QAPI_DEPRECATED, >> +} QapiSpecialFeature; >> + >> /* QEnumLookup flags */ >> #define QAPI_ENUM_DEPRECATED 1 >> >> diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py >> index 2ec1e7b3b6..9d07b88cf6 100644 >> --- a/scripts/qapi/gen.py >> +++ b/scripts/qapi/gen.py >> @@ -29,6 +29,7 @@ >> mcgen, >> ) >> from .schema import ( >> + QAPISchemaFeature, >> QAPISchemaIfCond, >> QAPISchemaModule, >> QAPISchemaObjectType, >> @@ -37,6 +38,18 @@ >> from .source import QAPISourceInfo >> >> >> +def gen_special_features(features: QAPISchemaFeature): >> + ret = '' >> + sep = '' >> + >> + for feat in features: >> + if feat.is_special(): >> + ret += ('%s1u << QAPI_%s' % (sep, feat.name.upper())) >> > > Building the constant name here "feels" fragile, but I'll trust that the > test suite and/or the compiler will catch us if we accidentally goof up > this mapping. In the interest of simplicity, then, "sure, why not." It relies on .is_special() remaining consistent with enum QapiSpecialFeature. The C compiler should catch any screwups. > >> + sep = ' | ' >> + >> > + return ret or '0' >> + >> > > Subjectively more pythonic: > > special_features = [f"1u << QAPI_{feat.name.upper()}" for feat in features > if feat.is_special()] > ret = ' | '.join(special_features) > return ret or '0' > > A bit more dense, but more functional. Up to you, but I find join() easier > to read and reason about for the presence of separators. Sold! >> + >> class QAPIGen: >> def __init__(self, fname: str): >> self.fname = fname >> diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py >> index 6d5f46509a..55f82d7389 100644 >> --- a/scripts/qapi/schema.py >> +++ b/scripts/qapi/schema.py >> @@ -725,6 +725,9 @@ def connect_doc(self, doc): >> class QAPISchemaFeature(QAPISchemaMember): >> role = 'feature' >> >> + def is_special(self): >> + return self.name in ('deprecated') >> + >> > > alrighty. > > (Briefly wondered: is it worth naming special features as a property of the > class, but with only two names, it's probably fine enough to leave it > embedded in the method logic. Only a style thing and doesn't have any > actual impact that I can imagine, so ... nevermind.) Let's keep it simple. >> class QAPISchemaObjectTypeMember(QAPISchemaMember): >> def __init__(self, name, info, typ, optional, ifcond=None, >> features=None): >> -- >> 2.31.1 >> >> > Well, either way: > > Reviewed-by: John Snow Thanks!