[PATCH-for-10.0,v2,13/13] hw/pci/pci: Remove legacy MachineClass::pci_allow_0_address flag

Commit Message

Philippe Mathieu-Daudé Nov. 26, 2024, 11:22 a.m. UTC

There are no more users of MachineClass::pci_allow_0_address,
remove the field along with the machine_refuses_bar_at_addr_0()
method.

Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
---
 include/hw/boards.h |  1 -
 hw/pci/pci.c        | 10 +---------
 2 files changed, 1 insertion(+), 10 deletions(-)

Patch

diff --git a/include/hw/boards.h b/include/hw/boards.h
index 36fbb9b59df..66fb2eddd34 100644
--- a/include/hw/boards.h
+++ b/include/hw/boards.h
@@ -284,7 +284,6 @@  struct MachineClass {
         no_floppy:1,
         no_cdrom:1,
         no_sdcard:1,
-        pci_allow_0_address:1,
         legacy_fw_cfg_order:1;
     bool is_default;
     const char *default_machine_opts;
diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 889821f64c0..20362da7b89 100644
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -45,7 +45,6 @@ 
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"
 #include "hw/hotplug.h"
-#include "hw/boards.h"
 #include "qapi/error.h"
 #include "qemu/cutils.h"
 #include "pci-internal.h"
@@ -520,13 +519,6 @@  bool pci_bus_bypass_iommu(PCIBus *bus)
     return host_bridge->bypass_iommu;
 }
 
-static bool machine_refuses_bar_at_addr_0(void)
-{
-    MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());
-
-    return !mc->pci_allow_0_address;
-}
-
 static void pci_root_bus_internal_init(PCIBus *bus, DeviceState *parent,
                                        MemoryRegion *mem, MemoryRegion *io,
                                        uint8_t devfn_min,
@@ -538,7 +530,7 @@  static void pci_root_bus_internal_init(PCIBus *bus, DeviceState *parent,
     bus->address_space_mem = mem;
     bus->address_space_io = io;
     bus->flags |= PCI_BUS_IS_ROOT;
-    if (bar_at_addr_0_refused && machine_refuses_bar_at_addr_0()) {
+    if (bar_at_addr_0_refused) {
         bus->flags |= PCI_BUS_BAR_AT_ADDR0_REFUSED;
     }