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 D9E92C433E6 for ; Tue, 2 Feb 2021 09:18:00 +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 2205464E9C for ; Tue, 2 Feb 2021 09:18:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2205464E9C 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]:43902 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l6rot-0000yB-4K for qemu-devel@archiver.kernel.org; Tue, 02 Feb 2021 04:17:59 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35956) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l6rnx-00006U-K4 for qemu-devel@nongnu.org; Tue, 02 Feb 2021 04:17:01 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:30432) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l6rnv-0004it-RF for qemu-devel@nongnu.org; Tue, 02 Feb 2021 04:17:01 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612257417; 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=04/Rcc1YhgUx0ubtPolguUXv04plY4aCya7PreAEYIo=; b=UyAqhv7Eak+KRSalLFopfu/4dpgPFhyV16L5ItCIoALASw8vNzG4Q4Gpe8hW29IbdjbmGb g42f+sDcDuROal7IqNtMAYmW2hUXVxSluHUk7txf5NM4qcPk8Zh2f8goF71BdSxSQGl3YQ dM89EWU4hIbp0Y2L7f097SVzAlhSIZc= 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-534-0LcXmtRiN2msGwqGFmDxcw-1; Tue, 02 Feb 2021 04:16:56 -0500 X-MC-Unique: 0LcXmtRiN2msGwqGFmDxcw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 712D1802B44; Tue, 2 Feb 2021 09:16:55 +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 5A86D10013BD; Tue, 2 Feb 2021 09:16:52 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id E7F56113865F; Tue, 2 Feb 2021 10:16:50 +0100 (CET) From: Markus Armbruster To: John Snow Subject: Re: [PATCH v4 07/16] qapi: use explicitly internal module names References: <20210201193747.2169670-1-jsnow@redhat.com> <20210201193747.2169670-8-jsnow@redhat.com> Date: Tue, 02 Feb 2021 10:16:50 +0100 In-Reply-To: <20210201193747.2169670-8-jsnow@redhat.com> (John Snow's message of "Mon, 1 Feb 2021 14:37:38 -0500") Message-ID: <87pn1ig77h.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.84 on 10.5.11.22 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=63.128.21.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_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: 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: > Use ./emit and ./init explicitly instead of "emit" and "init" and adding > the prefix based on the specific method called, which later allows us to > coalesce the two different methods into one. "Bandwurmsatz" (literally "tapeworm sentence"). Perhaps something like: QAPISchemaModularCVisitor._add_system_module() prefixes './' to its name argument to make it a module name. Pass the module name instead. This will allow us to coalesce the methods to add modules later on. Happy to tweak the commit message in my tree. > 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=types)) > > 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" > > 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=types)) > > 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 aaed78eed5e..da9d4d2d373 100644 > --- a/scripts/qapi/gen.py > +++ b/scripts/qapi/gen.py > @@ -285,7 +285,8 @@ def _add_user_module(self, name: str, blurb: str) -> None: > self._add_module(name, blurb) > > 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) > > def write(self, output_dir: str, opt_builtins: bool = False) -> None: > for name in self._module: