From nobody Mon Feb 9 18:18:41 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=1663276453; cv=none; d=zohomail.com; s=zohoarc; b=Qyta/2+ytoyQEV4W0y9Tp3XjF51ZK/SWd/M7GdXFG5JbGGgzsYMLXcS3o79XoMTxP8wtE/iplUsJ3Wuwjv5M3ZNe2hWYrXlwB+sNmo5os9lmnbMqHj0c4I/n8aQU6MsclMw0fRhy5AWz7ToIF+hcSD/r0gxHPatIfvfwA1o3jqc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1663276453; 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=FTrnBuLZAdwMQqFzkT81fUNd4MA5jqEjIl3AKe0NT4k=; b=EbPRgKXouNbXGvvMtOmH9L4cq6QYbv5ovoROrcp3OjYAmM5+yuPUuDgYmeL5FWEvbhy3OnqzfX3ljFcTPBkQnIbb51Ocxhc398P8S4b3SS5/gz9PSzh5rFlwwyLjxnnKwFPzULyiIMprVRz7/tTO9FSp1IVdSsLBg0hxsskuqFs= 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) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1663276453635505.71024382450196; Thu, 15 Sep 2022 14:14:13 -0700 (PDT) Received: from localhost ([::1]:41238 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oYwBY-0002YS-As for importer@patchew.org; Thu, 15 Sep 2022 17:14:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32864) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYvhw-00024y-LC for qemu-devel@nongnu.org; Thu, 15 Sep 2022 16:43:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:43273) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oYvhn-0000Jg-V3 for qemu-devel@nongnu.org; Thu, 15 Sep 2022 16:43:36 -0400 Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-460--rNYZ76WNHuS6fOftALYwQ-1; Thu, 15 Sep 2022 16:43:24 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id BDCD01C07590; Thu, 15 Sep 2022 20:43:23 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.192.163]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 99AEB40C6EC2; Thu, 15 Sep 2022 20:43:23 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 19D1E21E6613; Thu, 15 Sep 2022 22:43:18 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1663274607; 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=FTrnBuLZAdwMQqFzkT81fUNd4MA5jqEjIl3AKe0NT4k=; b=EznOmoEpr83X+LMQUJ+SV7cZLiLQKCnDyd0Y0LRSqCGbdKCZvIRSby3FYE+5e923b1Pdsz B3kCYXOmMUS4ClQacjd6Ld0ZRLhxu+VlxyP4EaURtfi/0p7dVUiSs+FyD0ioUITlBirgAS d3fm9dW7InLYuUEyluLzc/WXCE48iT8= X-MC-Unique: -rNYZ76WNHuS6fOftALYwQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: michael.roth@amd.com, jsnow@redhat.com, eblake@redhat.com, Stefan Berger Subject: [PATCH 23/27] qapi tpm: Elide redundant has_FOO in generated C Date: Thu, 15 Sep 2022 22:43:13 +0200 Message-Id: <20220915204317.3766007-24-armbru@redhat.com> In-Reply-To: <20220915204317.3766007-1-armbru@redhat.com> References: <20220915204317.3766007-1-armbru@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.2 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=170.10.133.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, 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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1663276455944100001 Content-Type: text/plain; charset="utf-8" The has_FOO for pointer-valued FOO are redundant, except for arrays. They are also a nuisance to work with. Recent commit "qapi: Start to elide redundant has_FOO in generated C" provided the means to elide them step by step. This is the step for qapi/tpm.json. Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here. Cc: Stefan Berger Signed-off-by: Markus Armbruster --- backends/tpm/tpm_passthrough.c | 2 -- monitor/hmp-cmds.c | 8 ++++---- scripts/qapi/schema.py | 1 - 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/backends/tpm/tpm_passthrough.c b/backends/tpm/tpm_passthrough.c index 5a2f74db1b..179697a3a9 100644 --- a/backends/tpm/tpm_passthrough.c +++ b/backends/tpm/tpm_passthrough.c @@ -259,12 +259,10 @@ tpm_passthrough_handle_device_opts(TPMPassthruState *= tpm_pt, QemuOpts *opts) value =3D qemu_opt_get(opts, "cancel-path"); if (value) { tpm_pt->options->cancel_path =3D g_strdup(value); - tpm_pt->options->has_cancel_path =3D true; } =20 value =3D qemu_opt_get(opts, "path"); if (value) { - tpm_pt->options->has_path =3D true; tpm_pt->options->path =3D g_strdup(value); } =20 diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 7ae986ab10..4a2485ddaa 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -883,10 +883,10 @@ void hmp_info_tpm(Monitor *mon, const QDict *qdict) case TPM_TYPE_PASSTHROUGH: tpo =3D ti->options->u.passthrough.data; monitor_printf(mon, "%s%s%s%s", - tpo->has_path ? ",path=3D" : "", - tpo->has_path ? tpo->path : "", - tpo->has_cancel_path ? ",cancel-path=3D" : "", - tpo->has_cancel_path ? tpo->cancel_path : ""); + tpo->path ? ",path=3D" : "", + tpo->path ?: "", + tpo->cancel_path ? ",cancel-path=3D" : "", + tpo->cancel_path ?: ""); break; case TPM_TYPE_EMULATOR: teo =3D ti->options->u.emulator.data; diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index 6f35e57fe2..2bec0588c8 100644 --- a/scripts/qapi/schema.py +++ b/scripts/qapi/schema.py @@ -759,7 +759,6 @@ def need_has(self): assert self.type # Temporary hack to support dropping the has_FOO in reviewable chu= nks opt_out =3D [ - 'qapi/tpm.json', 'qapi/transaction.json', 'qapi/ui.json', 'qga/qapi-schema.json'] --=20 2.37.2