acpi_interface.c should only register QOM interfaces. Move the qbus_build_aml() function to aml-build.c with the other AML build-related helpers.
Signed-off-by: Philippe Mathieu-Daudé <[email protected]> Reviewed-by: Pierrick Bouvier <[email protected]> --- hw/acpi/acpi_interface.c | 10 ---------- hw/acpi/aml-build.c | 11 +++++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/hw/acpi/acpi_interface.c b/hw/acpi/acpi_interface.c index e58e8aaee23..a44679017ea 100644 --- a/hw/acpi/acpi_interface.c +++ b/hw/acpi/acpi_interface.c @@ -2,16 +2,6 @@ #include "hw/acpi/acpi_dev_interface.h" #include "hw/acpi/acpi_aml_interface.h" #include "qemu/module.h" -#include "qemu/queue.h" - -void qbus_build_aml(BusState *bus, Aml *scope) -{ - BusChild *kid; - - QTAILQ_FOREACH(kid, &bus->children, sibling) { - call_dev_aml_func(DEVICE(kid->child), scope); - } -} static void register_types(void) { diff --git a/hw/acpi/aml-build.c b/hw/acpi/aml-build.c index ea1c415b211..4b374050881 100644 --- a/hw/acpi/aml-build.c +++ b/hw/acpi/aml-build.c @@ -25,12 +25,14 @@ #include "hw/acpi/acpi.h" #include "qemu/bswap.h" #include "qemu/bitops.h" +#include "qemu/queue.h" #include "system/numa.h" #include "hw/core/boards.h" #include "hw/acpi/tpm.h" #include "hw/pci/pci_host.h" #include "hw/pci/pci_bus.h" #include "hw/pci/pci_bridge.h" +#include "hw/acpi/acpi_aml_interface.h" #include "qemu/cutils.h" static GArray *build_alloc_array(void) @@ -2647,3 +2649,12 @@ Aml *aml_error_device(void) return dev; } + +void qbus_build_aml(BusState *bus, Aml *scope) +{ + BusChild *kid; + + QTAILQ_FOREACH(kid, &bus->children, sibling) { + call_dev_aml_func(DEVICE(kid->child), scope); + } +} -- 2.52.0
