From nobody Tue Nov 18 07:20:13 2025 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=1608170304; cv=none; d=zohomail.com; s=zohoarc; b=aac2tcndIKJKRquPf6GGJGfs7oRa64HIXcqlcVaqDVMsZ7RokHMIeYFFVdoYbZVbM4ouBp1y6R/czOhHGK1n28i3J5PqRz96Vx8wyHiN4YaFQyN20gxyKQKwDkIkGogmdIAw+eqvCFGbmPh3n/Rxup78x86+SaNOUpxLdW2pYSw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1608170304; 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=vR6/tBT6aYwaD0uN4EPKsDga6xc6SKZ5E5FRcjytRzs=; b=mk+6zTHuiyCKEBv30/4ObimXQarlE4MF+0zdOxX5zsFr2LENE45apbGMceeGCLFyEBMJsP4jZAeei4pZBfZTDTqp6VK7XjDCHTQNqyISoXFTeVQ28ZFR+QaY393YpLHvZB4tOymnZ5zi/2wkTyJAl2GqKblnR6IsV6tWojU0Hug= 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 1608170304706289.5808030525942; Wed, 16 Dec 2020 17:58:24 -0800 (PST) Received: from localhost ([::1]:37356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kpiYh-0000LT-MM for importer@patchew.org; Wed, 16 Dec 2020 20:58:23 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52274) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kpiUN-0003v4-C1 for qemu-devel@nongnu.org; Wed, 16 Dec 2020 20:53:55 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59119) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kpiUJ-0006II-Mb for qemu-devel@nongnu.org; Wed, 16 Dec 2020 20:53: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-358-6S8GaFeEMoi1SZhZXGoonQ-1; Wed, 16 Dec 2020 20:53:49 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2E2411014E72 for ; Thu, 17 Dec 2020 01:53:48 +0000 (UTC) Received: from scv.redhat.com (ovpn-112-131.rdu2.redhat.com [10.10.112.131]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8495060CC4; Thu, 17 Dec 2020 01:53:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608170030; 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=vR6/tBT6aYwaD0uN4EPKsDga6xc6SKZ5E5FRcjytRzs=; b=baj527gbdY4fhcpiQwcx3o8XdcOzmI9EfHrG+q0W8887jOkDpn2hRqdEZI4/eBZjLeYtzF EeKjNuZDzmTyBsWlWmZjK1ppJogIvvmiZbMjuCwpDYSpTZ3EgmGL0z9zF+XpJODNZz/53u DpiqzOW5DVoYd7I/IDGpeTWYQiVgxEo= X-MC-Unique: 6S8GaFeEMoi1SZhZXGoonQ-1 From: John Snow To: Markus Armbruster , qemu-devel@nongnu.org Subject: [PATCH v3 04/13] qapi/introspect.py: guard against ifcond/comment misuse Date: Wed, 16 Dec 2020 20:53:34 -0500 Message-Id: <20201217015343.196279-5-jsnow@redhat.com> In-Reply-To: <20201217015343.196279-1-jsnow@redhat.com> References: <20201217015343.196279-1-jsnow@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_NONE=-0.0001, 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" _tree_to_qlit is called recursively on dict values alone; at such a point in generating output it is too late to apply an ifcond. Similarly, comments do not necessarily have a "tidy" place they can be printed in such a circumstance. Forbid this usage. Signed-off-by: John Snow --- scripts/qapi/introspect.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/qapi/introspect.py b/scripts/qapi/introspect.py index 4749f65ea3c..ccdf4f1c0d0 100644 --- a/scripts/qapi/introspect.py +++ b/scripts/qapi/introspect.py @@ -43,6 +43,12 @@ def indent(level): ifobj, extra =3D obj ifcond =3D extra.get('if') comment =3D extra.get('comment') + + # NB: _tree_to_qlit is called recursively on the values of a key:v= alue + # pair; those values can't be decorated with comments or condition= als. + msg =3D "dict values cannot have attached comments or if-condition= als." + assert not suppress_first_indent, msg + ret =3D '' if comment: ret +=3D indent(level) + '/* %s */\n' % comment --=20 2.26.2