From nobody Mon Feb 9 11:06:07 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=1613737288; cv=none; d=zohomail.com; s=zohoarc; b=DXutkTXrJTNkE60eoBw0P9qOBopdFb4x3vIdXK05PNy20biaZbBa2EAJcPMDzAw07ajBw3jgaDhhmxKhTWxKQwgn0g7EEnLNuzDJHKsJ9ba9bRhOAiEsaD//ebllx7EAMy0HW2IWXgd9ZDJZN9EIO+BW4np9wFTbof6o/gCE9pI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613737288; 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=LgTOc7jJu9Ixl4Y7gVHOfJoeXCTt4ZAhiCVBMo+tZoU=; b=TFQ5jdhsOtyiuHiVzWjrQhFH8ZStFrIfybX0yIYZVREmiQQshjW9pB6JpGWUfUut8fJ7DlJtbQ2OFeN6BdppdeWVSC99s4P+b6UD2l//e/DNGbi9u+YHrGOVA8GJL8AzBGHS0H77NFnzUWrQBCAQ8GChhxolKwzBtWfJkxdo4AM= 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 1613737288568600.8773763897751; Fri, 19 Feb 2021 04:21:28 -0800 (PST) Received: from localhost ([::1]:42406 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lD4ml-0000lr-EV for importer@patchew.org; Fri, 19 Feb 2021 07:21:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:53078) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lD4WU-0007QJ-R0 for qemu-devel@nongnu.org; Fri, 19 Feb 2021 07:04:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:50701) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lD4WN-000208-5B for qemu-devel@nongnu.org; Fri, 19 Feb 2021 07:04:38 -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-78-W1qemW2LNueH9kp9qpyXmw-1; Fri, 19 Feb 2021 07:04:27 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 752A0100A8EA; Fri, 19 Feb 2021 12:04:26 +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 43C8419C71; Fri, 19 Feb 2021 12:04:26 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 3014011329A9; Fri, 19 Feb 2021 13:04:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613736270; 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=LgTOc7jJu9Ixl4Y7gVHOfJoeXCTt4ZAhiCVBMo+tZoU=; b=YXybQ58p4K+oiSCweRkAPMCgsk5UG5I6WDwKnoBmhcgsXMTSyudzFALWfSSTZBUlz0IS4Z IXVkwBEa64i5pRNwRUSPeSk9gv6xiitGqXjXTfwTAkUBfM1sxkEZ3BmITih54HSJxdrkqU xpdJjIqsP8V65bS4Z24ARWn5WPAkUmo= X-MC-Unique: W1qemW2LNueH9kp9qpyXmw-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH 13/18] qapi/introspect.py: remove _gen_variants helper Date: Fri, 19 Feb 2021 13:04:17 +0100 Message-Id: <20210219120422.600850-14-armbru@redhat.com> In-Reply-To: <20210219120422.600850-1-armbru@redhat.com> References: <20210219120422.600850-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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=63.128.21.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_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: 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 It is easier to give a name to all of the dictly-typed objects we pass around in introspect.py by removing this helper, as it does not return an object that has any knowable type by itself. Inline it into its only caller instead. Signed-off-by: John Snow Message-Id: <20210216021809.134886-14-jsnow@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- scripts/qapi/introspect.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index 26e6f73e5d..da7bc8883c 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -242,10 +242,6 @@ def _gen_member(self, member): obj['features'] =3D self._gen_features(member.features) return Annotated(obj, member.ifcond) =20 - def _gen_variants(self, tag_name, variants): - return {'tag': tag_name, - 'variants': [self._gen_variant(v) for v in variants]} - def _gen_variant(self, variant): obj =3D {'case': variant.name, 'type': self._use_type(variant.type= )} return Annotated(obj, variant.ifcond) @@ -269,9 +265,8 @@ def visit_object_type_flat(self, name, info, ifcond, fe= atures, members, variants): obj =3D {'members': [self._gen_member(m) for m in members]} if variants: - obj.update(self._gen_variants(variants.tag_member.name, - variants.variants)) - + obj['tag'] =3D variants.tag_member.name + obj['variants'] =3D [self._gen_variant(v) for v in variants.va= riants] self._gen_tree(name, 'object', obj, ifcond, features) =20 def visit_alternate_type(self, name, info, ifcond, features, variants): --=20 2.26.2