From nobody Mon Feb 9 10:50:21 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=1613749224; cv=none; d=zohomail.com; s=zohoarc; b=RHCd69NNpZYXmz5QSKQmd19YR6WGf8RLeITOll1ymNnqf9XmxxdAXhhPhChpH+DdsRvCfSf/7v99cHxgOfxCD6EnNs19ok9o6saZ2+Pp6S18cBAfOblxiSTiKs3l1pzBxScI44R9zlnD6mSmCzfAAgKAa3QTQ2Z8x2gsXHwpRwY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613749224; 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=Tz1BoVgdyudwnalNO9Lnr8YzIE3ksFbBSc9cpe2j8WU=; b=W7PynW+i5d+mNwpz9IpacGqPduFDtqBxPqhUA586EGVv66lkOB3MPU1Il6Tmk12CoWtA51VhNoR0qYL36g/p+quYTQYAzFp4m9qKBce+2uQDUuhEELo7ITsrbiSAeV1HVo8BijYovEzllFL0dFIgC1H3Il+5q3U1dPnGdFh6A8w= 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 1613749223627387.5458434473052; Fri, 19 Feb 2021 07:40:23 -0800 (PST) Received: from localhost ([::1]:53972 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lD7tG-0000bx-F1 for importer@patchew.org; Fri, 19 Feb 2021 10:40:22 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:35268) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lD76R-0004rf-WA for qemu-devel@nongnu.org; Fri, 19 Feb 2021 09:49:56 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:58018) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lD76L-0004hi-E1 for qemu-devel@nongnu.org; Fri, 19 Feb 2021 09:49:55 -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-544-PY6Z6HpaMsq-dOwszA33DA-1; Fri, 19 Feb 2021 09:49:43 -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 6C08256C95; 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 3C8011970D; Fri, 19 Feb 2021 14:49:42 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 66E431132BCE; 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=1613746186; 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=Tz1BoVgdyudwnalNO9Lnr8YzIE3ksFbBSc9cpe2j8WU=; b=A5RQPqSK+yzFC+kQTiAEgKhvymw/wWW0dw+xqXWhafh1167EW9zDPP2t8Y6SEiemQPUv6M ilWWBKExS8sw8usl+ZO/TB2J+Ign3+ZTC/uoKCK8Rv1NyqdTxDVayR6oviklvZ0VXzSgRS 5RurH5blP1a7GiE8NkYvCNlEvoqbG/M= X-MC-Unique: PY6Z6HpaMsq-dOwszA33DA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PULL 08/18] qapi/introspect.py: Always define all 'extra' dict keys Date: Fri, 19 Feb 2021 15:49:29 +0100 Message-Id: <20210219144939.604488-9-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.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 This mimics how a typed object works, where 'if' and 'comment' are always set, regardless of if they have a value set or not. It is safe to do this because of the way that _tree_to_qlit processes these values (using dict.get with a default of None), resulting in no change of output from _tree_to_qlit. There are no other users of this data. Signed-off-by: John Snow Message-Id: <20210216021809.134886-9-jsnow@redhat.com> Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- scripts/qapi/introspect.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index c4326d42cb..88af5383d5 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -27,11 +27,10 @@ from .schema import ( =20 =20 def _make_tree(obj, ifcond, comment=3DNone): - extra =3D {} - if ifcond: - extra['if'] =3D ifcond - if comment: - extra['comment'] =3D comment + extra =3D { + 'if': ifcond, + 'comment': comment + } return (obj, extra) =20 =20 --=20 2.26.2