[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 19/30] qapi pci: Elide redundant has_FOO in generated C
From: |
Markus Armbruster |
Subject: |
[PULL 19/30] qapi pci: Elide redundant has_FOO in generated C |
Date: |
Wed, 14 Dec 2022 08:47:10 +0100 |
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 <mst@redhat.com>
Cc: Marcel Apfelbaum <marcel.apfelbaum@gmail.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20221104160712.3005652-20-armbru@redhat.com>
---
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 = class;
desc = get_class_desc(class);
if (desc->desc) {
- info->class_info->has_desc = true;
info->class_info->desc = g_strdup(desc->desc);
}
@@ -1897,7 +1896,6 @@ static PciDeviceInfo *qmp_query_pci_device(PCIDevice
*dev, PCIBus *bus,
type = dev->config[PCI_HEADER_TYPE] & ~PCI_HEADER_TYPE_MULTI_FUNCTION;
if (type == PCI_HEADER_TYPE_BRIDGE) {
- info->has_pci_bridge = true;
info->pci_bridge = qmp_query_pci_bridge(dev, bus, bus_num);
} else if (type == PCI_HEADER_TYPE_NORMAL) {
info->id->has_subsystem = info->id->has_subsystem_vendor = true;
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
PciDeviceInfo *dev)
dev->slot, dev->function);
monitor_printf(mon, " ");
- 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
PciDeviceInfo *dev)
dev->irq, (char)('A' + dev->irq_pin - 1));
}
- 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
PciDeviceInfo *dev)
monitor_printf(mon, " id \"%s\"\n", dev->qdev_id);
- if (dev->has_pci_bridge) {
+ if (dev->pci_bridge) {
if (dev->pci_bridge->has_devices) {
PciDeviceInfoList *cdev;
for (cdev = dev->pci_bridge->devices; cdev; cdev = cdev->next) {
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 chunks
opt_out = [
- 'qapi/pci.json',
'qapi/qdev.json',
'qapi/qom.json',
'qapi/replay.json',
--
2.37.3
- [PULL 03/30] docs/devel/qapi-code-gen: Extend example for next commit's change, (continued)
- [PULL 03/30] docs/devel/qapi-code-gen: Extend example for next commit's change, Markus Armbruster, 2022/12/14
- [PULL 01/30] docs/devel/qapi-code-gen: Update example to match current code, Markus Armbruster, 2022/12/14
- [PULL 04/30] qapi: Start to elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 11/30] qapi chardev: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 28/30] qapi virtio: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 16/30] qapi migration: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 07/30] qapi audio: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 22/30] qapi rocker: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 12/30] qapi crypto: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 02/30] qapi: Tidy up whitespace in generated code, Markus Armbruster, 2022/12/14
- [PULL 19/30] qapi pci: Elide redundant has_FOO in generated C,
Markus Armbruster <=
- [PULL 15/30] qapi machine: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 17/30] qapi misc: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 25/30] qapi tpm: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 10/30] qapi block: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 06/30] qapi acpi: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 08/30] blockdev: Clean up abuse of DriveBackup member format, Markus Armbruster, 2022/12/14
- [PULL 23/30] qapi run-state: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 27/30] qapi ui: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 13/30] qapi dump: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14
- [PULL 29/30] qapi qga: Elide redundant has_FOO in generated C, Markus Armbruster, 2022/12/14