From nobody Mon Feb 9 09:29:38 2026 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=1600809568; cv=none; d=zohomail.com; s=zohoarc; b=i+85qamZdo7whozyXVOFNhSr2ASEtxJmOco+2pFapUfPpHbkaNsT1wwKx90EENst8vTPLLMrXs5O8f4BaKgW1Y7DCFp6aDKwbqZCvlq3xErx2aizUKDQ6i+qMR06ZT8ucGSb2PPF5vOwqjIuOsnFhmlAyjvfbX0wB+e1tnGr08I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1600809568; 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=VoTXH1LT6mqnbGdmbNqN1uvPhns+MLUmlaxVx2YRzLk=; b=MGCNWYqerdVqhc5N3oFblvmFhJBfq4H5YFHT88BzlayclaJFFRHHsVMUWqNr1NGFalhZbALk1jx0y+se2hBfpTH50cYVZdLDMyr6uTRE8o75B+82RRQ0NWiwANrPUyDvlP1/rre3Sx8H71Ok8yVnT9Sf2E7QcMjeqmbJlsUuAC4= 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 1600809568507102.22878102135519; Tue, 22 Sep 2020 14:19:28 -0700 (PDT) Received: from localhost ([::1]:58432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kKph9-0008Pk-1p for importer@patchew.org; Tue, 22 Sep 2020 17:19:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37210) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kKpQ2-0002C0-4q for qemu-devel@nongnu.org; Tue, 22 Sep 2020 17:01:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:47897) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kKpPx-0004ZO-Vl for qemu-devel@nongnu.org; Tue, 22 Sep 2020 17:01:45 -0400 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-593-sHTpNouFNuG9uRJ6e8hgDw-1; Tue, 22 Sep 2020 17:01:29 -0400 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 7A0861005E5E; Tue, 22 Sep 2020 21:01:28 +0000 (UTC) Received: from scv.redhat.com (ovpn-119-140.rdu2.redhat.com [10.10.119.140]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4DE4B55765; Tue, 22 Sep 2020 21:01:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1600808492; 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=VoTXH1LT6mqnbGdmbNqN1uvPhns+MLUmlaxVx2YRzLk=; b=ZJi6rH3xDWCGF0vADIdnPfTezP6X+LillqVFxlEyJcFyveURPQY9GwWThSPXkFHctwy7yp iAnHe7mpsd02BJHe+rxuBmh3XZ6E0ti2S7YadvcuzHC6UHMS7+owMlU1rokJhVMZ9if0Ta VyBK8SyqVXTOwcqZidDQ/V/6oe6VaXg= X-MC-Unique: sHTpNouFNuG9uRJ6e8hgDw-1 From: John Snow To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH v2 15/38] qapi/common.py: move build_params into gen.py Date: Tue, 22 Sep 2020 17:00:38 -0400 Message-Id: <20200922210101.4081073-16-jsnow@redhat.com> In-Reply-To: <20200922210101.4081073-1-jsnow@redhat.com> References: <20200922210101.4081073-1-jsnow@redhat.com> MIME-Version: 1.0 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" 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=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/09/22 15:47:47 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.455, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=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: Peter Maydell , Eduardo Habkost , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Michael Roth , Cleber Rosa , John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) 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: Cleber Rosa Reviewed-by: Eduardo Habkost --- scripts/qapi/commands.py | 8 ++++++-- scripts/qapi/common.py | 23 ----------------------- scripts/qapi/events.py | 7 +++++-- scripts/qapi/gen.py | 34 ++++++++++++++++++++++++++++++++-- 4 files changed, 43 insertions(+), 29 deletions(-) diff --git a/scripts/qapi/commands.py b/scripts/qapi/commands.py index d9cda3b209..9b3f24b8ed 100644 --- a/scripts/qapi/commands.py +++ b/scripts/qapi/commands.py @@ -14,11 +14,15 @@ """ =20 from .common import ( - build_params, c_name, mcgen, ) -from .gen import QAPIGenCCode, QAPISchemaModularCVisitor, ifcontext +from .gen import ( + QAPIGenCCode, + QAPISchemaModularCVisitor, + build_params, + ifcontext, +) =20 =20 def gen_command_decl(name, arg_type, boxed, ret_type): diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index 730283722a..50c3d36e27 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=3Difc) return ret - - -def build_params(arg_type, - boxed: bool, - extra: Optional[str] =3D None) -> str: - ret =3D '' - sep =3D '' - if boxed: - assert arg_type - ret +=3D '%s arg' % arg_type.c_param_type() - sep =3D ', ' - elif arg_type: - assert not arg_type.variants - for memb in arg_type.members: - ret +=3D sep - sep =3D ', ' - if memb.optional: - ret +=3D 'bool has_%s, ' % c_name(memb.name) - ret +=3D '%s %s' % (memb.type.c_param_type(), - c_name(memb.name)) - if extra: - ret +=3D sep + extra - return ret if ret else 'void' diff --git a/scripts/qapi/events.py b/scripts/qapi/events.py index 6b3afa14d7..69a0ac5471 100644 --- a/scripts/qapi/events.py +++ b/scripts/qapi/events.py @@ -13,12 +13,15 @@ """ =20 from .common import ( - build_params, c_enum_const, c_name, mcgen, ) -from .gen import QAPISchemaModularCVisitor, ifcontext +from .gen import ( + QAPISchemaModularCVisitor, + build_params, + ifcontext, +) from .schema import QAPISchemaEnumMember from .types import gen_enum, gen_enum_lookup =20 diff --git a/scripts/qapi/gen.py b/scripts/qapi/gen.py index 11472ba043..9898d513ae 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=C3=A9 Lureau # @@ -15,16 +17,21 @@ import errno import os import re +from typing import Optional =20 from .common import ( c_fname, + c_name, gen_endif, gen_if, guardend, guardstart, mcgen, ) -from .schema import QAPISchemaVisitor +from .schema import ( + QAPISchemaObjectType, + QAPISchemaVisitor, +) =20 =20 class QAPIGen: @@ -90,6 +97,29 @@ def _wrap_ifcond(ifcond, before, after): return out =20 =20 +def build_params(arg_type: Optional[QAPISchemaObjectType], + boxed: bool, + extra: Optional[str] =3D None) -> str: + ret =3D '' + sep =3D '' + if boxed: + assert arg_type + ret +=3D '%s arg' % arg_type.c_param_type() + sep =3D ', ' + elif arg_type: + assert not arg_type.variants + for memb in arg_type.members: + ret +=3D sep + sep =3D ', ' + if memb.optional: + ret +=3D 'bool has_%s, ' % c_name(memb.name) + ret +=3D '%s %s' % (memb.type.c_param_type(), + c_name(memb.name)) + if extra: + ret +=3D sep + extra + return ret if ret else 'void' + + class QAPIGenCCode(QAPIGen): =20 def __init__(self, fname): --=20 2.26.2