From nobody Mon Feb 9 16:18:44 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=1667578170; cv=none; d=zohomail.com; s=zohoarc; b=M/aWbZAmUR5SNqa4NNakodA+jWsklaaRodtES3xI7LxQCp7tYTC45jxvBpbxOMdSNBnANImSwyIb3eL2asby/fed0MXDUi21tm53jWCoBRxfM85WEv4fAC3kKaG8He7nkqH5/WN3e/+ujpdcR3awTNiHeohYwyTPZ1ktoeNgQyg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1667578170; 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=XOA+aAf0fl48wxBdjiLeJHf3d/rvUO3nI9AoWMcLcpY=; b=bcmrhSv1iyDaKn1il6rZGjsCgJNOlnzZDkdvpzwLwHMIha7SBV072In9rgC9yAB5Jb2ODDwuAzrpKQqtnGZY38IoTMDkWMK8Lr33EW71yF8DiKxy6t1nfH3Ub4T5okACpiilMN+NIIP0pIB2iUKfWh/ygDj9Mhf+keqlv1q2WMs= 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 1667578170944924.0666905418801; Fri, 4 Nov 2022 09:09:30 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oqzF3-0000rC-3m; Fri, 04 Nov 2022 12:08:25 -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 1oqzE9-000833-8j for qemu-devel@nongnu.org; Fri, 04 Nov 2022 12:07:29 -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 1oqzDz-0007dr-BI for qemu-devel@nongnu.org; Fri, 04 Nov 2022 12:07:26 -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-416-BAZDL53cNgS_Ad6Mz40Cyg-1; Fri, 04 Nov 2022 12:07:16 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 0C6F83810D44; Fri, 4 Nov 2022 16:07:16 +0000 (UTC) Received: from blackfin.pond.sub.org (unknown [10.39.193.175]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D1A171121315; Fri, 4 Nov 2022 16:07:15 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 622EB21E61B0; Fri, 4 Nov 2022 17:07:12 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1667578038; 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=XOA+aAf0fl48wxBdjiLeJHf3d/rvUO3nI9AoWMcLcpY=; b=K+qv0qW3wYjo7p81ElYWII3/fjP0vbnNcI3P5ShPC/3sGkezTF8lS5ypqZ0Br8pqlJOBRd ExqNBvPDyyR6qBqx8uMUixrJiKbH/AI95FtW8EHMel106iyPZXvrEwbopgll8CL5Wy9lG6 8gJjWCUamqk5iNggR2soE656MNGwo+s= X-MC-Unique: BAZDL53cNgS_Ad6Mz40Cyg-1 From: Markus Armbruster To: qemu-devel@nongnu.org Cc: jsnow@redhat.com, eblake@redhat.com, michael.roth@amd.com, "Michael S . Tsirkin" , Marcel Apfelbaum , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v3 19/30] qapi pci: Elide redundant has_FOO in generated C Date: Fri, 4 Nov 2022 17:07:01 +0100 Message-Id: <20221104160712.3005652-20-armbru@redhat.com> In-Reply-To: <20221104160712.3005652-1-armbru@redhat.com> References: <20221104160712.3005652-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.3 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: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.045, 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: 1667578171763100007 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/pci.json. Said commit explains the transformation in more detail. The invariant violations mentioned there do not occur here. Cc: Michael S. Tsirkin Cc: Marcel Apfelbaum Signed-off-by: Markus Armbruster Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/pci/pci.c | 2 -- monitor/hmp-cmds.c | 6 +++--- scripts/qapi/schema.py | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/hw/pci/pci.c b/hw/pci/pci.c index 2f450f6a72..e6292d8060 100644 --- a/hw/pci/pci.c +++ b/hw/pci/pci.c @@ -1879,7 +1879,6 @@ static PciDeviceInfo *qmp_query_pci_device(PCIDevice = *dev, PCIBus *bus, info->class_info->q_class =3D class; desc =3D get_class_desc(class); if (desc->desc) { - info->class_info->has_desc =3D true; info->class_info->desc =3D g_strdup(desc->desc); } =20 @@ -1897,7 +1896,6 @@ static PciDeviceInfo *qmp_query_pci_device(PCIDevice = *dev, PCIBus *bus, =20 type =3D dev->config[PCI_HEADER_TYPE] & ~PCI_HEADER_TYPE_MULTI_FUNCTIO= N; if (type =3D=3D PCI_HEADER_TYPE_BRIDGE) { - info->has_pci_bridge =3D true; info->pci_bridge =3D qmp_query_pci_bridge(dev, bus, bus_num); } else if (type =3D=3D PCI_HEADER_TYPE_NORMAL) { info->id->has_subsystem =3D info->id->has_subsystem_vendor =3D tru= e; diff --git a/monitor/hmp-cmds.c b/monitor/hmp-cmds.c index 45d78ba257..ae5ebe765a 100644 --- a/monitor/hmp-cmds.c +++ b/monitor/hmp-cmds.c @@ -709,7 +709,7 @@ static void hmp_info_pci_device(Monitor *mon, const Pci= DeviceInfo *dev) dev->slot, dev->function); monitor_printf(mon, " "); =20 - if (dev->class_info->has_desc) { + if (dev->class_info->desc) { monitor_puts(mon, dev->class_info->desc); } else { monitor_printf(mon, "Class %04" PRId64, dev->class_info->q_class); @@ -727,7 +727,7 @@ static void hmp_info_pci_device(Monitor *mon, const Pci= DeviceInfo *dev) dev->irq, (char)('A' + dev->irq_pin - 1)); } =20 - if (dev->has_pci_bridge) { + if (dev->pci_bridge) { monitor_printf(mon, " BUS %" PRId64 ".\n", dev->pci_bridge->bus->number); monitor_printf(mon, " secondary bus %" PRId64 ".\n", @@ -773,7 +773,7 @@ static void hmp_info_pci_device(Monitor *mon, const Pci= DeviceInfo *dev) =20 monitor_printf(mon, " id \"%s\"\n", dev->qdev_id); =20 - if (dev->has_pci_bridge) { + if (dev->pci_bridge) { if (dev->pci_bridge->has_devices) { PciDeviceInfoList *cdev; for (cdev =3D dev->pci_bridge->devices; cdev; cdev =3D cdev->n= ext) { diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py index 930dffd780..388b90812b 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/pci.json', 'qapi/qdev.json', 'qapi/qom.json', 'qapi/replay.json', --=20 2.37.3