From nobody Mon Feb 9 11:51:28 2026 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=1612815907; cv=none; d=zohomail.com; s=zohoarc; b=lOtNxmbyQwkpMSGB2lGqRkrjgDCMUqtyhdYX0bnRc4YoxkydP+395hiXwhs0s3XYBE3NcJ0C2EjruqJhU7lpP2mEjN86c2JRSabI2GCsGf+d28i5iGTNZgqLlswy3qEfk/vO8OMnd/m4Yi2f5g8qr3zyXEAfShIZlVe4mDHFqHQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612815907; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=yx2KdFKFJXy+auIFa0SIFenoTRP01v3Xdi8GhMvXbvM=; b=XoCRi4mN+ulfUzAS1N+ncK4P5aiDZAYNzygXhRMdP+TAvgtfAozY7VoEkqqbmnsVK5FwyapHeEJCvlLb9g25+Im5WgCLS6PliyU4/j8iNAJlr/PVGdk3/X3L/ko38etjhgILngkB9yEfzBAcfXmrHeAtYa4v3kK8k3KwxM/KupI= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1612815907148432.26264141056606; Mon, 8 Feb 2021 12:25:07 -0800 (PST) Received: from localhost ([::1]:44236 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l9D5l-00034u-Tw for importer@patchew.org; Mon, 08 Feb 2021 15:25:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:51904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l974i-0005gW-JY for qemu-devel@nongnu.org; Mon, 08 Feb 2021 08:59:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:24119) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l9745-0001dW-D8 for qemu-devel@nongnu.org; Mon, 08 Feb 2021 08:59:29 -0500 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-216-xM6A2wDiM56brOMxV6gJAQ-1; Mon, 08 Feb 2021 08:58:51 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id BC58E79EC0; Mon, 8 Feb 2021 13:58:49 +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 8C1C4189A5; Mon, 8 Feb 2021 13:58:49 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 70F8211329B3; Mon, 8 Feb 2021 14:58:46 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612792736; 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=yx2KdFKFJXy+auIFa0SIFenoTRP01v3Xdi8GhMvXbvM=; b=gwMRwnKAn1RmtJd0EZwdgAg/nHY6BrpTAhBpx3NSR6NSdG9ZxXLlhBb2R1rvfi6IzqW8Ho CIySvRnpOsWX6BId6dI/PI3X23UciJhz3BTkiELixC477sKVurTUCfiYkn7wi3VUncOOfb svqjhS3SYIaIYd7MEbbjv2eqX0sUzQk= X-MC-Unique: xM6A2wDiM56brOMxV6gJAQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 10/16] qapi: centralize the built-in module name definition Date: Mon, 8 Feb 2021 14:58:40 +0100 Message-Id: <20210208135846.3707170-11-armbru@redhat.com> In-Reply-To: <20210208135846.3707170-1-armbru@redhat.com> References: <20210208135846.3707170-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.57, 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_H4=0.001, RCVD_IN_MSPIKE_WL=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: peter.maydell@linaro.org, John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: John Snow Use a constant to make it obvious we're referring to a very specific thing. Signed-off-by: John Snow Message-Id: <20210201193747.2169670-11-jsnow@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- scripts/qapi/schema.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index 14cf9da784..353e8020a2 100644 --- a/scripts/qapi/schema.py +++ b/scripts/qapi/schema.py @@ -68,7 +68,7 @@ class QAPISchemaEntity: =20 def _set_module(self, schema, info): assert self._checked - fname =3D info.fname if info else './builtin' + fname =3D info.fname if info else QAPISchemaModule.BUILTIN_MODULE_= NAME self._module =3D schema.module_by_fname(fname) self._module.add_entity(self) =20 @@ -138,6 +138,9 @@ class QAPISchemaVisitor: =20 =20 class QAPISchemaModule: + + BUILTIN_MODULE_NAME =3D './builtin' + def __init__(self, name): self.name =3D name self._entity_list =3D [] @@ -160,14 +163,14 @@ class QAPISchemaModule: """ return not cls.is_system_module(name) =20 - @staticmethod - def is_builtin_module(name: str) -> bool: + @classmethod + def is_builtin_module(cls, name: str) -> bool: """ The built-in module is a single System module for the built-in typ= es. =20 It is always "./builtin". """ - return name =3D=3D './builtin' + return name =3D=3D cls.BUILTIN_MODULE_NAME =20 def add_entity(self, ent): self._entity_list.append(ent) @@ -853,7 +856,7 @@ class QAPISchema: self._entity_dict =3D {} self._module_dict =3D OrderedDict() self._schema_dir =3D os.path.dirname(fname) - self._make_module('./builtin') + self._make_module(QAPISchemaModule.BUILTIN_MODULE_NAME) self._make_module(fname) self._predefining =3D True self._def_predefineds() --=20 2.26.2