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=-11.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, NICE_REPLY_A,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_SANE_1 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 2FF48C4727E for ; Wed, 7 Oct 2020 15:28:51 +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 708DE21707 for ; Wed, 7 Oct 2020 15:28:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Qa3IaJwA" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 708DE21707 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]:60570 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQBN3-00025W-6D for qemu-devel@archiver.kernel.org; Wed, 07 Oct 2020 11:28:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:55172) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQBLA-0001KB-Qa for qemu-devel@nongnu.org; Wed, 07 Oct 2020 11:26:52 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:24614) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kQBL8-0004Oy-R4 for qemu-devel@nongnu.org; Wed, 07 Oct 2020 11:26:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602084410; 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=Yt90E9ORPybtYj5mAEJsoHrjN1uX/BFyEAydOAg21xw=; b=Qa3IaJwApbtqK/i+Fog1oUf3pNIywabPdNpuLbl6Zu0k6ZebPFeyL1kKr16a84MMCsvVkJ RxCCo1PnKsvuRPXHZfnH1SnoozLq16jsrrUcafTcNUr27TT8O6leDRiksoz5DEDotRLg9p XaUbBGM8Gjb5v5jpW78Ey2Xs1XbFjmQ= 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-503-TsqyOTBiMV2CwJbNRaUnDA-1; Wed, 07 Oct 2020 11:26:48 -0400 X-MC-Unique: TsqyOTBiMV2CwJbNRaUnDA-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2D568801AF5 for ; Wed, 7 Oct 2020 15:26:47 +0000 (UTC) Received: from [10.10.120.38] (ovpn-120-38.rdu2.redhat.com [10.10.120.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 916773782; Wed, 7 Oct 2020 15:26:46 +0000 (UTC) Subject: Re: [PATCH v5 17/36] qapi/common.py: move build_params into gen.py To: Markus Armbruster References: <20201005195158.2348217-1-jsnow@redhat.com> <20201005195158.2348217-18-jsnow@redhat.com> <87tuv6gzm8.fsf@dusky.pond.sub.org> From: John Snow Message-ID: <1afc5c27-c37b-7368-dd4f-ddcb2431ab65@redhat.com> Date: Wed, 7 Oct 2020 11:26:45 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.11.0 MIME-Version: 1.0 In-Reply-To: <87tuv6gzm8.fsf@dusky.pond.sub.org> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 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-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=216.205.24.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/07 00:54:30 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.742, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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: qemu-devel@nongnu.org, Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 10/7/20 5:21 AM, Markus Armbruster wrote: > John Snow writes: > >> Including it in common.py creates a circular import dependency; schema >> relies on common, but common.build_params requires a type annotation >> from schema. To type this properly, it needs to be moved outside the >> cycle. >> >> Signed-off-by: John Snow >> Reviewed-by: Eduardo Habkost >> Reviewed-by: Cleber Rosa >> --- >> scripts/qapi/commands.py | 9 +++++++-- >> scripts/qapi/common.py | 23 ----------------------- >> scripts/qapi/events.py | 9 ++------- >> scripts/qapi/gen.py | 31 +++++++++++++++++++++++++++++-- >> 4 files changed, 38 insertions(+), 34 deletions(-) >> >> diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py >> index 5dc2f5a9fa8..f67393f8713 100644 >> --- a/scripts/qapi/commands.py >> +++ b/scripts/qapi/commands.py >> @@ -13,8 +13,13 @@ >> See the COPYING file in the top-level directory. >> """ >> >> -from .common import build_params, c_name, mcgen >> -from .gen import QAPIGenCCode, QAPISchemaModularCVisitor, ifcontext >> +from .common import c_name, mcgen >> +from .gen import ( >> + QAPIGenCCode, >> + QAPISchemaModularCVisitor, >> + build_params, >> + ifcontext, >> +) >> >> >> def gen_command_decl(name, arg_type, boxed, ret_type): >> diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py >> index 0ef38ea5fe0..9ab0685cc51 100644 >> --- a/scripts/qapi/common.py >> +++ b/scripts/qapi/common.py >> @@ -209,26 +209,3 @@ def gen_endif(ifcond: Sequence[str]) -> str: >> #endif /* %(cond)s */ >> ''', cond=ifc) >> return ret >> - >> - >> -def build_params(arg_type, >> - boxed: bool, >> - extra: Optional[str] = None) -> str: >> - ret = '' >> - sep = '' >> - if boxed: >> - assert arg_type >> - ret += '%s arg' % arg_type.c_param_type() >> - sep = ', ' >> - elif arg_type: >> - assert not arg_type.variants >> - for memb in arg_type.members: >> - ret += sep >> - sep = ', ' >> - if memb.optional: >> - ret += 'bool has_%s, ' % c_name(memb.name) >> - ret += '%s %s' % (memb.type.c_param_type(), >> - c_name(memb.name)) >> - if extra: >> - ret += sep + extra >> - return ret if ret else 'void' >> diff --git a/scripts/qapi/events.py b/scripts/qapi/events.py >> index 6b3afa14d72..f840a62ed92 100644 >> --- a/scripts/qapi/events.py >> +++ b/scripts/qapi/events.py >> @@ -12,13 +12,8 @@ >> See the COPYING file in the top-level directory. >> """ >> >> -from .common import ( >> - build_params, >> - c_enum_const, >> - c_name, >> - mcgen, >> -) >> -from .gen import QAPISchemaModularCVisitor, ifcontext >> +from .common import c_enum_const, c_name, mcgen >> +from .gen import QAPISchemaModularCVisitor, build_params, ifcontext >> from .schema import QAPISchemaEnumMember >> from .types import gen_enum, gen_enum_lookup >> >> diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py >> index 1fed712b43b..f2e2746fea5 100644 >> --- a/scripts/qapi/gen.py >> +++ b/scripts/qapi/gen.py >> @@ -2,9 +2,11 @@ >> # >> # QAPI code generation >> # >> -# Copyright (c) 2018-2019 Red Hat Inc. >> +# Copyright IBM, Corp. 2011 >> +# Copyright (c) 2013-2019 Red Hat Inc. >> # >> # Authors: >> +# Anthony Liguori >> # Markus Armbruster >> # Marc-André Lureau >> # > > The code you move into this file is actually Red Hat's: > > $ git-log -L174,193:scripts/qapi/common.py master| egrep 'Author|Date' > Author: Markus Armbruster > Date: Wed Aug 15 21:37:36 2018 +0800 > Author: Marc-André Lureau > Date: Thu Jun 1 16:41:41 2017 +0400 > Author: Eric Blake > Date: Wed Jul 13 21:50:20 2016 -0600 > Author: Eric Blake > Date: Wed Jul 13 21:50:19 2016 -0600 > Author: Eric Blake > Date: Thu Mar 17 16:48:28 2016 -0600 > Author: Markus Armbruster > Date: Wed Sep 16 13:06:20 2015 +0200 > > So the correct update is simply > > # > # QAPI code generation > # > -# Copyright (c) 2018-2019 Red Hat Inc. > +# Copyright (c) 2015-2019 Red Hat Inc. > # > # Authors: > # Markus Armbruster > # Marc-André Lureau > # > OK, thank you. I did the dumbest possibly correct thing. My appetite for doing line ownership analysis is ... low. >> @@ -15,16 +17,18 @@ >> import errno >> import os >> import re >> +from typing import Optional >> >> from .common import ( >> c_fname, >> + c_name, >> gen_endif, >> gen_if, >> guardend, >> guardstart, >> mcgen, >> ) >> -from .schema import QAPISchemaVisitor >> +from .schema import QAPISchemaObjectType, QAPISchemaVisitor >> >> >> class QAPIGen: >> @@ -90,6 +94,29 @@ def _wrap_ifcond(ifcond, before, after): >> return out >> >> >> +def build_params(arg_type: Optional[QAPISchemaObjectType], >> + boxed: bool, >> + extra: Optional[str] = None) -> str: >> + ret = '' >> + sep = '' >> + if boxed: >> + assert arg_type >> + ret += '%s arg' % arg_type.c_param_type() >> + sep = ', ' >> + elif arg_type: >> + assert not arg_type.variants >> + for memb in arg_type.members: >> + ret += sep >> + sep = ', ' >> + if memb.optional: >> + ret += 'bool has_%s, ' % c_name(memb.name) >> + ret += '%s %s' % (memb.type.c_param_type(), >> + c_name(memb.name)) >> + if extra: >> + ret += sep + extra >> + return ret if ret else 'void' >> + >> + >> class QAPIGenCCode(QAPIGen): >> >> def __init__(self, fname):