From nobody Tue Feb 10 05:44:24 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=1666687699; cv=none; d=zohomail.com; s=zohoarc; b=aMgSFYYBvaeTQXEHLuKGvLGZmYG4hueb4fkxmN0/RKb7q7AxYUGM9ye7aZORq6FLW/SbGRyN+n8ZyPIPAP2WTNlwSDsCnuWJpDSs2EIbfeppunfCPxgXio/B0wpcZt7DDiny/blySGTKp5hNXbzplW073X1wyeXe7PPjYV6C+o8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1666687699; 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=Li+OxAZmyH5xo3KRNbHsRqj8RTC5q1wme5dzkt4nzrM=; b=hHgN+576a1fwkjvart0nUO5dt1D9ubl3cjVMnMzodwTfvoLHAggM1cvPhwfQWslviUNXwcZQT/3J6weXjIPttzNpRJYxosOQOSLB/lu+CSrr3Fd/8MSBHbI0aaBeBa6kjdoa8y+dYwcLb0xfOBOV/IP8Vz8edRJWk81cwYI19UY= 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 1666687699808295.7665073504203; Tue, 25 Oct 2022 01:48:19 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1onFVw-0005kj-H3; Tue, 25 Oct 2022 04:42:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1onEwy-0004i3-It for qemu-devel@nongnu.org; Tue, 25 Oct 2022 04:06:17 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1onEwe-0007vQ-C8 for qemu-devel@nongnu.org; Tue, 25 Oct 2022 04:05:59 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-126-4IIVUBhtOz67VEjfQPCJwA-1; Tue, 25 Oct 2022 04:05:45 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E243E86F123; Tue, 25 Oct 2022 08:05:44 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.195.118]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B32BA39DB3; Tue, 25 Oct 2022 08:05:44 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 4F3C621E60CB; Tue, 25 Oct 2022 10:05:41 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1666685148; 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=Li+OxAZmyH5xo3KRNbHsRqj8RTC5q1wme5dzkt4nzrM=; b=KaSumox6y5UKgngmGg5LuqpZmwVlyKER4C+4JY9TvzKJQBPO1iKdyxRJ1bSror84gt4usj yvMnzLbF2R5ETlqHldItX18N4V5m4I1IaNujdI0x3+jJWjtIZtXg4Q8ryOHbIcwkQO5dNB tIvWzMNKv+EgafbAcPseqdW0NpeIOpo= X-MC-Unique: 4IIVUBhtOz67VEjfQPCJwA-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: stefanha@redhat.com, Mark Kanda , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PULL 22/28] qapi stats: Elide redundant has_FOO in generated C Date: Tue, 25 Oct 2022 10:05:35 +0200 Message-Id: <20221025080541.271547-23-armbru@redhat.com> In-Reply-To: <20221025080541.271547-1-armbru@redhat.com> References: <20221025080541.271547-1-armbru@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.5 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: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.503, 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_H2=-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.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Qemu-devel" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1666687700086100001 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/stats.json. Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here. Cc: Mark Kanda Cc: Paolo Bonzini Signed-off-by: Markus Armbruster Reviewed-by: Mark Kanda Message-Id: <20221018062849.3420573-23-armbru@redhat.com> Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- monitor/qmp-cmds.c | 5 +---- scripts/qapi/schema.py | 1 - 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/monitor/qmp-cmds.c b/monitor/qmp-cmds.c index f8ab5dd50f..3bf2ae9bb7 100644 --- a/monitor/qmp-cmds.c +++ b/monitor/qmp-cmds.c @@ -560,10 +560,7 @@ void add_stats_entry(StatsResultList **stats_results, = StatsProvider provider, StatsResult *entry =3D g_new0(StatsResult, 1); =20 entry->provider =3D provider; - if (qom_path) { - entry->has_qom_path =3D true; - entry->qom_path =3D g_strdup(qom_path); - } + entry->qom_path =3D g_strdup(qom_path); entry->stats =3D stats_list; =20 QAPI_LIST_PREPEND(*stats_results, entry); diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index f405ab7f49..0544037e71 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/stats.json', 'qapi/tpm.json', 'qapi/transaction.json', 'qapi/ui.json', --=20 2.37.3