From nobody Mon Feb 9 04:03:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1613748017; cv=none; d=zohomail.com; s=zohoarc; b=Yjjs/z9XXaO+QppdCbYgujrQ7R1GoDhRMu+Ov5HZccMAJ4zxWcjd0JdUOGG3bZpks3G0VCF1filTWfLRyE0zbmZOUYwbOkLnbMkw/f3miEQTUddKEP7mKkvMYRGpL7gdXnF93jH0q1cszPXUfZjxWlVjE7FbiRqMxoBF3nOu7HM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613748017; 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=Y6s5De957ndfIjSccxJ/JckAz5b81HflxdPH5EbzcmM=; b=bdhiljh8TnN4ZSyr9wQcOqMSHjsLuky9+/mHXs5ha51tgFLxdO/VxRS7LXJEfP/DhNxQEW2HVHupotq2unZ8SXw1hwXRxmRPkaCJMttRI7BW6uNlbCJdQPxmpjnhGCmatnfzuGhX3+Vk6MsNuhx9h1b8TY51B8lDJXKVxw2Q6Mg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass 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 1613748016335189.72562085827133; Fri, 19 Feb 2021 07:20:16 -0800 (PST) Received: from localhost ([::1]:45260 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lD7Zm-0004RL-E8 for importer@patchew.org; Fri, 19 Feb 2021 10:20:14 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35298) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lD76Z-00051p-Q6 for qemu-devel@nongnu.org; Fri, 19 Feb 2021 09:50:03 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:51599) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lD76U-0004lv-7h for qemu-devel@nongnu.org; Fri, 19 Feb 2021 09:50:03 -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-249-gRN9nYKtOhuSV59M4x2bCw-1; Fri, 19 Feb 2021 09:49:43 -0500 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 6952D804023; Fri, 19 Feb 2021 14:49:42 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-115-79.ams2.redhat.com [10.36.115.79]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3A1F410016F6; Fri, 19 Feb 2021 14:49:42 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 63B011132BCA; Fri, 19 Feb 2021 15:49:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613746197; 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=Y6s5De957ndfIjSccxJ/JckAz5b81HflxdPH5EbzcmM=; b=iDX8HIzH0JK0O8i05utEDg7uYqFZiwighvDxl9WDSLW6JmQAX7nSX4sbQ9Iyvo+9FWMZ/Q /MdHH7x06LVDTEseJbgQT4D+5W3iNcUNNI1/F1OCbREbZfoQAdpuGOVfzbzqFygRYDjsyG 6uZcyly3oscbUgfi0HOxgqeZhrR43Qg= X-MC-Unique: gRN9nYKtOhuSV59M4x2bCw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 07/18] qapi/introspect.py: replace 'extra' dict with 'comment' argument Date: Fri, 19 Feb 2021 15:49:28 +0100 Message-Id: <20210219144939.604488-8-armbru@redhat.com> In-Reply-To: <20210219144939.604488-1-armbru@redhat.com> References: <20210219144939.604488-1-armbru@redhat.com> 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-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=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com 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.001, 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_H3=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@linaro.org, John Snow Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: John Snow This is only used to pass in a dictionary with a comment already set, so skip the runaround and just accept the (optional) comment. Signed-off-by: John Snow Message-Id: <20210216021809.134886-8-jsnow@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- scripts/qapi/introspect.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index 7cce0de975..c4326d42cb 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -10,6 +10,8 @@ This work is licensed under the terms of the GNU GPL, ver= sion 2. See the COPYING file in the top-level directory. """ =20 +from typing import Optional + from .common import ( c_name, gen_endif, @@ -24,11 +26,12 @@ from .schema import ( ) =20 =20 -def _make_tree(obj, ifcond, extra=3DNone): - if extra is None: - extra =3D {} +def _make_tree(obj, ifcond, comment=3DNone): + extra =3D {} if ifcond: extra['if'] =3D ifcond + if comment: + extra['comment'] =3D comment return (obj, extra) =20 =20 @@ -175,18 +178,18 @@ const QLitObject %(c_name)s =3D %(c_string)s; return [_make_tree(f.name, f.ifcond) for f in features] =20 def _gen_tree(self, name, mtype, obj, ifcond, features): - extra =3D None + comment: Optional[str] =3D None if mtype not in ('command', 'event', 'builtin', 'array'): if not self._unmask: # Output a comment to make it easy to map masked names # back to the source when reading the generated output. - extra =3D {'comment': '"%s" =3D %s' % (self._name(name), n= ame)} + comment =3D f'"{self._name(name)}" =3D {name}' name =3D self._name(name) obj['name'] =3D name obj['meta-type'] =3D mtype if features: obj['features'] =3D self._gen_features(features) - self._trees.append(_make_tree(obj, ifcond, extra)) + self._trees.append(_make_tree(obj, ifcond, comment)) =20 def _gen_member(self, member): obj =3D {'name': member.name, 'type': self._use_type(member.type)} --=20 2.26.2