[6/6] hw/nvram/fw_cfg: Remove fw_cfg_add_extra_pci_roots()

Commit Message

Philippe Mathieu-Daudé Dec. 6, 2024, 6:13 p.m. UTC

Now that all uses of fw_cfg_add_extra_pci_roots() have been
converted to the newer pci_bus_add_fw_cfg_extra_pci_roots(),
we can remove that bogus method. hw/nvram/fw_cfg must
stay generic. Device specific entries have to be implemented
using TYPE_FW_CFG_DATA_GENERATOR_INTERFACE.

This mostly reverts commit 0abd38885ac0fcdb08653922f339849cad387961
("fw_cfg: Refactor extra pci roots addition").

Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
---
 include/hw/nvram/fw_cfg.h |  9 ---------
 hw/nvram/fw_cfg.c         | 23 -----------------------
 2 files changed, 32 deletions(-)

Comments

Daniel P. Berrangé Dec. 13, 2024, 11:35 a.m. UTC | #1

On Fri, Dec 06, 2024 at 07:13:52PM +0100, Philippe Mathieu-Daudé wrote:
> Now that all uses of fw_cfg_add_extra_pci_roots() have been
> converted to the newer pci_bus_add_fw_cfg_extra_pci_roots(),
> we can remove that bogus method. hw/nvram/fw_cfg must
> stay generic. Device specific entries have to be implemented
> using TYPE_FW_CFG_DATA_GENERATOR_INTERFACE.
> 
> This mostly reverts commit 0abd38885ac0fcdb08653922f339849cad387961
> ("fw_cfg: Refactor extra pci roots addition").
> 
> Signed-off-by: Philippe Mathieu-Daudé <[e-mail]>
> ---
>  include/hw/nvram/fw_cfg.h |  9 ---------
>  hw/nvram/fw_cfg.c         | 23 -----------------------
>  2 files changed, 32 deletions(-)

Reviewed-by: Daniel P. Berrangé <[e-mail]>

With regards,
Daniel

Patch

diff --git a/include/hw/nvram/fw_cfg.h b/include/hw/nvram/fw_cfg.h
index fcb06f18cc3..80a1549ad05 100644
--- a/include/hw/nvram/fw_cfg.h
+++ b/include/hw/nvram/fw_cfg.h
@@ -312,15 +312,6 @@  bool fw_cfg_add_file_from_generator(FWCfgState *s,
                                     Object *parent, const char *part,
                                     const char *filename, Error **errp);
 
-/**
- * fw_cfg_add_extra_pci_roots:
- * @bus: main pci root bus to be scanned from
- * @s: fw_cfg device being modified
- *
- * Add a new fw_cfg item...
- */
-void fw_cfg_add_extra_pci_roots(PCIBus *bus, FWCfgState *s);
-
 FWCfgState *fw_cfg_init_io_dma(uint32_t iobase, uint32_t dma_iobase,
                                 AddressSpace *dma_as);
 FWCfgState *fw_cfg_init_mem(hwaddr ctl_addr, hwaddr data_addr);
diff --git a/hw/nvram/fw_cfg.c b/hw/nvram/fw_cfg.c
index b94cd27bd85..053db7e08cc 100644
--- a/hw/nvram/fw_cfg.c
+++ b/hw/nvram/fw_cfg.c
@@ -41,7 +41,6 @@ 
 #include "qemu/cutils.h"
 #include "qapi/error.h"
 #include "hw/acpi/aml-build.h"
-#include "hw/pci/pci_bus.h"
 #include "hw/loader.h"
 
 #define FW_CFG_FILE_SLOTS_DFLT 0x20
@@ -1057,28 +1056,6 @@  bool fw_cfg_add_file_from_generator(FWCfgState *s,
     return true;
 }
 
-void fw_cfg_add_extra_pci_roots(PCIBus *bus, FWCfgState *s)
-{
-    int extra_hosts = 0;
-
-    if (!bus) {
-        return;
-    }
-
-    QLIST_FOREACH(bus, &bus->child, sibling) {
-        /* look for expander root buses */
-        if (pci_bus_is_root(bus)) {
-            extra_hosts++;
-        }
-    }
-
-    if (extra_hosts && s) {
-        uint64_t *val = g_malloc(sizeof(*val));
-        *val = cpu_to_le64(extra_hosts);
-        fw_cfg_add_file(s, "etc/extra-pci-roots", val, sizeof(*val));
-    }
-}
-
 static void fw_cfg_machine_reset(void *opaque)
 {
     MachineClass *mc = MACHINE_GET_CLASS(qdev_get_machine());