From nobody Tue Nov 18 16:51:34 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1611080777; cv=none; d=zohomail.com; s=zohoarc; b=eVVLKRF4bMwRJL82yQbHIwoVov81HXbigJ7BjRH4yf5o16J4H1nNDnW47Kb5dPUHLxenu8n+g6Uuq0RJHH+ZmfPr7+IqBSORR9SY6mQU+3tmIoZ07T5HSLledYlzrbuMeIId1B70utExZn3Xg/Xf0XQZqgMNC95fZj9aOuL9JMI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611080777; 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=+4djVAJuJxG9JDMBfsIoZrWqekj/Y5ucXQee7MNLfE8=; b=jYJxNQVuHTI2GOlv3giZOsXso/9C06tx4vCxUSEO63e8JaW2aQA3JlpL5VjDs7KEZ94ihnNq45olmChQDV6ILL3zmSWVRLmX76ynjuN03wcmYxIjJtolxTgkGVHdQ6gP6dNy/LiqH6dR7Twt+RbcSOV4iWUGOLJx3j7xtmFVL1E= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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=fail 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 1611080777302462.7899626753373; Tue, 19 Jan 2021 10:26:17 -0800 (PST) Received: from localhost ([::1]:43848 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1vho-0003TD-5o for importer@patchew.org; Tue, 19 Jan 2021 13:26:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42654) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1vLW-0007kw-RG for qemu-devel@nongnu.org; Tue, 19 Jan 2021 13:03:16 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:28109) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l1vLT-0005RM-KQ for qemu-devel@nongnu.org; Tue, 19 Jan 2021 13:03:14 -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-130-VNGToKc7Mu68pcAZDYOqFw-1; Tue, 19 Jan 2021 13:03:08 -0500 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 DFE71BBEE1 for ; Tue, 19 Jan 2021 18:03:07 +0000 (UTC) Received: from scv.redhat.com (ovpn-120-151.rdu2.redhat.com [10.10.120.151]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1C94B5D9DD; Tue, 19 Jan 2021 18:03:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611079390; 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=+4djVAJuJxG9JDMBfsIoZrWqekj/Y5ucXQee7MNLfE8=; b=gXgIUsrbq8jLbb1K06xGFv0fQ0o+wUlC97/zjL+dqqRdMrrzBnV702sPRiE0COsnSFTUiJ 0wpunrR0Bywcign6rQsuYR7WBlTSSmBniBXfe+TTU4nAbODj3XAQ/xWQ1SqAwwmZRTkhya +bBBhudj6ZEFlhG+ges8T0b7QUVutSY= X-MC-Unique: VNGToKc7Mu68pcAZDYOqFw-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v3 11/17] qapi: centralize the built-in module name definition Date: Tue, 19 Jan 2021 13:02:36 -0500 Message-Id: <20210119180242.1570753-12-jsnow@redhat.com> In-Reply-To: <20210119180242.1570753-1-jsnow@redhat.com> References: <20210119180242.1570753-1-jsnow@redhat.com> 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=jsnow@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=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.195, 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=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: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , John Snow , Markus Armbruster , Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Use a constant to make it obvious we're referring to a very specific thing. Signed-off-by: John Snow --- scripts/qapi/schema.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index c519c18a5ec..887a1c82c6f 100644 --- a/scripts/qapi/schema.py +++ b/scripts/qapi/schema.py @@ -68,7 +68,7 @@ def check_doc(self): =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 @@ def visit_event(self, name, info, ifcond, features, arg= _type, boxed): =20 =20 class QAPISchemaModule: + + BUILTIN_MODULE_NAME =3D './builtin' + def __init__(self, name): self.name =3D name self._entity_list =3D [] @@ -152,7 +155,7 @@ def is_user_module(cls, name: str) -> bool: =20 @classmethod def is_builtin_module(cls, name: str) -> bool: - return name =3D=3D './builtin' + return name =3D=3D cls.BUILTIN_MODULE_NAME =20 @property def system_module(self) -> bool: @@ -850,7 +853,7 @@ def __init__(self, fname): self._entity_dict =3D {} self._module_dict =3D OrderedDict() self._schema_dir =3D os.path.dirname(fname) - self._make_module('./builtin') # built-ins + self._make_module(QAPISchemaModule.BUILTIN_MODULE_NAME) # built-i= ns self._make_module(fname) self._predefining =3D True self._def_predefineds() --=20 2.26.2