From nobody Tue Nov 18 16:51:35 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=1611080204; cv=none; d=zohomail.com; s=zohoarc; b=hO5lDRguxGvhMl7GjNoFm2MqGYsnR+PZ59Mx4bosielmJeZFwNC7jpp9mGZ6aRytDwQlLkU1rqj2JRj+unllPZQyTTak6kiLYRrTvdimzS6F445YNiEQ7/BprRD6nofol7wqSAo+GxCiGxpc5+Lw6IBH+JwSo0FH3ZQ1C0qpVwI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611080204; 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=NVTzjiFRodxmIdATxFHaTkf+ppb0zaHWEF0Y7bI4Ops=; b=klbSw6z2JBbwd9GUO3fbZGlGOVwuAgQuiIja+wc1n8DzVkRs4nEKFPKBQwM1IYCi2G+uYBpoL402Hy9gzw0f6CfvhLS6bLUyCd2Jmdrq2nRvOTpnsA07UOYwjm2ZNyjLOhfcaCzmJ1m4V0ccJvhQWz9HCqiYPREsoOTt2pU0YT0= 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 1611080204942680.5363360975255; Tue, 19 Jan 2021 10:16:44 -0800 (PST) Received: from localhost ([::1]:54434 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l1vYY-0002Ja-Pc for importer@patchew.org; Tue, 19 Jan 2021 13:16:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42548) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l1vLS-0007gU-Vd for qemu-devel@nongnu.org; Tue, 19 Jan 2021 13:03:11 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:47374) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l1vLQ-0005QR-H2 for qemu-devel@nongnu.org; Tue, 19 Jan 2021 13:03:10 -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-280-tgapuW6ePN2RC7y5X9ObfQ-1; Tue, 19 Jan 2021 13:03:05 -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 EE6221005504 for ; Tue, 19 Jan 2021 18:03:04 +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 54EC95D9DD; Tue, 19 Jan 2021 18:02:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611079387; 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=NVTzjiFRodxmIdATxFHaTkf+ppb0zaHWEF0Y7bI4Ops=; b=FjqF93ez1jv3/ZflaoikTaZUfeobm2OkTRR2UL25W1WRye4EhS6y5FLqCgkCPkM5Hb1Yzg 0G91jVJIljWIT/1Owyj7vEcsNVk/Qj5HiQH8VJXxZlFjlNQ6ECiq1RZa/12C7IbcUrpXMw RoLczuZzsLPc5x7iE9iswbOA6r0DvwI= X-MC-Unique: tgapuW6ePN2RC7y5X9ObfQ-1 From: John Snow To: qemu-devel@nongnu.org Subject: [PATCH v3 08/17] qapi: use explicitly internal module names Date: Tue, 19 Jan 2021 13:02:33 -0500 Message-Id: <20210119180242.1570753-9-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 ./emit and ./init explicitly instead of "emit" and "init". Add assertions that enforce this. Signed-off-by: John Snow --- scripts/qapi/commands.py | 2 +- scripts/qapi/events.py | 2 +- scripts/qapi/gen.py | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py index 71744f48a35..fc5fe27c472 100644 --- a/scripts/qapi/commands.py +++ b/scripts/qapi/commands.py @@ -286,7 +286,7 @@ def _begin_user_module(self, name: str) -> None: types=3Dtypes)) =20 def visit_end(self) -> None: - self._add_system_module('init', ' * QAPI Commands initialization') + self._add_system_module('./init', ' * QAPI Commands initialization= ') self._genh.add(mcgen(''' #include "qapi/qmp/dispatch.h" =20 diff --git a/scripts/qapi/events.py b/scripts/qapi/events.py index 9851653b9d1..26faa829898 100644 --- a/scripts/qapi/events.py +++ b/scripts/qapi/events.py @@ -191,7 +191,7 @@ def _begin_user_module(self, name: str) -> None: types=3Dtypes)) =20 def visit_end(self) -> None: - self._add_system_module('emit', ' * QAPI Events emission') + self._add_system_module('./emit', ' * QAPI Events emission') self._genc.preamble_add(mcgen(''' #include "qemu/osdep.h" #include "%(prefix)sqapi-emit-events.h" diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py index 9f850d23646..18b72dd06c8 100644 --- a/scripts/qapi/gen.py +++ b/scripts/qapi/gen.py @@ -285,7 +285,8 @@ def _add_user_module(self, name: str, blurb: str) -> No= ne: self._add_module(name, blurb) =20 def _add_system_module(self, name: Optional[str], blurb: str) -> None: - self._add_module(name and './' + name, blurb) + assert QAPISchemaModule.is_system_module(name) + self._add_module(name, blurb) =20 def write(self, output_dir: str, opt_builtins: bool =3D False) -> None: for name in self._module: --=20 2.26.2