From nobody Mon Feb 9 07:22:41 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=1612399550; cv=none; d=zohomail.com; s=zohoarc; b=XsnR4dWNNYSVno1rUwT3LfHQs4QNEsMN0jIm28WZAWBtyDBEp/h9x9uoG2abCWP7jLUqyGf/bxgqweITUHdlGcOiYIw5udTA80D+DyWyrHxMqXR1RD5V6iadmAiZklzbCd+RToNl6VbS2S0ShBRJzXur+0k/iFzcMUjFuM7wy0k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1612399550; 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=JxItRlDjeE03aSUCdeoWAjl1xlJSCd+Z/KaGv7sl7LY=; b=GuT2fCusNDcmdiReFq5b3s0318iWvXYlCu19SdYt8b3lzDa1Y1YpR0U8+i2UJJdQ9HX0SrHTFEASUMNdkgwL3ef0brzx6oB2W4cS16QsqPEpHl1+J5IsrJGv+LGqQw/a9OLx78oYSHAjhCtkLI/CGixTKZSUnQ7IvHyvw/pmQJU= 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 1612399550835495.36255599468575; Wed, 3 Feb 2021 16:45:50 -0800 (PST) Received: from localhost ([::1]:33840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7SmL-0005Yo-Fq for importer@patchew.org; Wed, 03 Feb 2021 19:45:49 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:56760) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7SZP-0001EE-8q for qemu-devel@nongnu.org; Wed, 03 Feb 2021 19:32:27 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:54002) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1l7SZE-0000cb-Mj for qemu-devel@nongnu.org; Wed, 03 Feb 2021 19:32:26 -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-160-0CBbiY3PN_2onTNaLTfyyQ-1; Wed, 03 Feb 2021 19:32:14 -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 AC09F108C279 for ; Thu, 4 Feb 2021 00:32:13 +0000 (UTC) Received: from scv.redhat.com (ovpn-112-247.rdu2.redhat.com [10.10.112.247]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1F40E100AE4E; Thu, 4 Feb 2021 00:32:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1612398736; 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=JxItRlDjeE03aSUCdeoWAjl1xlJSCd+Z/KaGv7sl7LY=; b=IQQUDS7SAZuP7PIjqluv8kuObNAliGBNAJ4G9dBdtFRZmq9AY9b3hVKBNLDg3djH8CHW7H yj/0gUHIt9m6C7WLF9HZJZ8Grp5/apD+AQkx3MXFFX0hyTkwoJJtwQHl7+7ZNbzMqri+zH SSQfLGWMHdqDDsafPRuvGwQW9KfsagI= X-MC-Unique: 0CBbiY3PN_2onTNaLTfyyQ-1 From: John Snow To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH v5 07/15] qapi/introspect.py: Always define all 'extra' dict keys Date: Wed, 3 Feb 2021 19:31:59 -0500 Message-Id: <20210204003207.2856909-8-jsnow@redhat.com> In-Reply-To: <20210204003207.2856909-1-jsnow@redhat.com> References: <20210204003207.2856909-1-jsnow@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=jsnow@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=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -32 X-Spam_score: -3.3 X-Spam_bar: --- X-Spam_report: (-3.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.539, 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: John Snow , Eduardo Habkost , Cleber Rosa Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" 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 --- 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 1655a21f85b..45231d2abc3 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -27,11 +27,10 @@ =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.29.2