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=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 8A8A3C433DB for ; Tue, 2 Feb 2021 09:17:58 +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 BD02764E9E for ; Tue, 2 Feb 2021 09:17:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BD02764E9E 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]:43714 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6roq-0000tT-BN for qemu-devel@archiver.kernel.org; Tue, 02 Feb 2021 04:17:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35942) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6rnu-00004q-U8 for qemu-devel@nongnu.org; Tue, 02 Feb 2021 04:16:58 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:39132) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l6rns-0004hd-0l for qemu-devel@nongnu.org; Tue, 02 Feb 2021 04:16:58 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612257414; 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=6pNsKswh0CGGicTC5V86LMRb8zIXPHLfo1ZlflmoWcI=; b=IGVYxwMMYu6blHP/AkySXdLrN8QHZDvYlnYGy5hnzxJBtnCfjWzeDirgfS8iE4gY6WfmnL oQZUWH2XSUOPnt9JkgZ/qQrjlVe/qbtRmX6i+a0sRLjtqlwRGtIx+H1XBSvulu8xjsn5/6 cYAY0uhBTb9jxYxTtmw5nJ+FtxIDZ6M= 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-401-n8o6DyDjMN-VXgOniRuBgQ-1; Tue, 02 Feb 2021 04:16:41 -0500 X-MC-Unique: n8o6DyDjMN-VXgOniRuBgQ-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A7F1A10766C2; Tue, 2 Feb 2021 09:16:40 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-115-51.ams2.redhat.com [10.36.115.51]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6BC2660BE5; Tue, 2 Feb 2021 09:16:37 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id F389B113865F; Tue, 2 Feb 2021 10:16:35 +0100 (CET) From: Markus Armbruster To: John Snow Subject: Re: [PATCH v4 05/16] qapi: centralize is_[user|system|builtin]_module methods References: <20210201193747.2169670-1-jsnow@redhat.com> <20210201193747.2169670-6-jsnow@redhat.com> Date: Tue, 02 Feb 2021 10:16:35 +0100 In-Reply-To: <20210201193747.2169670-6-jsnow@redhat.com> (John Snow's message of "Mon, 1 Feb 2021 14:37:36 -0500") Message-ID: <87r1lyg77w.fsf@dusky.pond.sub.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.1 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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=216.205.24.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.351, 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_H3=0.001, RCVD_IN_MSPIKE_WL=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: Michael Roth , Cleber Rosa , qemu-devel@nongnu.org, =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , Eduardo Habkost Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" John Snow writes: > Define what a module is and define what kind of a module it is once and > for all, in one place. > > Signed-off-by: John Snow > --- > scripts/qapi/gen.py | 25 +++++++++++-------------- > scripts/qapi/schema.py | 31 +++++++++++++++++++++++++++++-- > 2 files changed, 40 insertions(+), 16 deletions(-) > > diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py > index 3d81b90ab71..2aec6d34365 100644 > --- a/scripts/qapi/gen.py > +++ b/scripts/qapi/gen.py > @@ -31,7 +31,11 @@ > guardstart, > mcgen, > ) > -from .schema import QAPISchemaObjectType, QAPISchemaVisitor > +from .schema import ( > + QAPISchemaModule, > + QAPISchemaObjectType, > + QAPISchemaVisitor, > +) > from .source import QAPISourceInfo > > > @@ -246,21 +250,14 @@ def __init__(self, > self._main_module: Optional[str] = None > > @staticmethod > - def _is_user_module(name: Optional[str]) -> bool: > - return bool(name and not name.startswith('./')) > - > - @staticmethod > - def _is_builtin_module(name: Optional[str]) -> bool: > - return not name > - > - def _module_dirname(self, name: Optional[str]) -> str: > - if self._is_user_module(name): > + def _module_dirname(name: Optional[str]) -> str: > + if QAPISchemaModule.is_user_module(name): > return os.path.dirname(name) > return '' > > def _module_basename(self, what: str, name: Optional[str]) -> str: > - ret = '' if self._is_builtin_module(name) else self._prefix > - if self._is_user_module(name): > + ret = '' if QAPISchemaModule.is_builtin_module(name) else self._prefix > + if QAPISchemaModule.is_user_module(name): > basename = os.path.basename(name) > ret += what > if name != self._main_module: > @@ -282,7 +279,7 @@ def _add_module(self, name: Optional[str], blurb: str) -> None: > self._genc, self._genh = self._module[name] > > def _add_user_module(self, name: str, blurb: str) -> None: > - assert self._is_user_module(name) > + assert QAPISchemaModule.is_user_module(name) > if self._main_module is None: > self._main_module = name > self._add_module(name, blurb) > @@ -292,7 +289,7 @@ def _add_system_module(self, name: Optional[str], blurb: str) -> None: > > def write(self, output_dir: str, opt_builtins: bool = False) -> None: > for name in self._module: > - if self._is_builtin_module(name) and not opt_builtins: > + if QAPISchemaModule.is_builtin_module(name) and not opt_builtins: > continue > (genc, genh) = self._module[name] > genc.write(output_dir) > diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py > index 720449feee4..e80d9320eda 100644 > --- a/scripts/qapi/schema.py > +++ b/scripts/qapi/schema.py > @@ -141,6 +141,33 @@ def __init__(self, name): > self.name = name > self._entity_list = [] > > + @staticmethod > + def is_system_module(name: Optional[str]) -> bool: > + """ > + System modules are internally defined modules. > + > + Their names start with the "./" prefix. > + """ > + return name is None or name.startswith('./') > + > + @classmethod > + def is_user_module(cls, name: Optional[str]) -> bool: > + """ > + User modules are those defined by the user in qapi JSON files. > + > + They do not start with the "./" prefix. > + """ > + return not cls.is_system_module(name) > + > + @staticmethod > + def is_builtin_module(name: Optional[str]) -> bool: > + """ > + The built-in module is a single System module for the built-in types. > + > + It is presently always the value 'None'. > + """ > + return name is None > + > def add_entity(self, ent): > self._entity_list.append(ent) > Putting these functions into a class feels awkward. But it does the job. > @@ -871,8 +898,8 @@ def resolve_type(self, name, info, what): > return typ > > def _module_name(self, fname): > - if fname is None: > - return None > + if QAPISchemaModule.is_system_module(fname): > + return fname > return os.path.relpath(fname, self._schema_dir) > > def _make_module(self, fname):