@samitouri / QOSamiQemu / commits / b5d09c11d1

hw/acpi: Move qbus_build_aml() function out of acpi_interface.c

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é <philmd@linaro.org> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Message-Id: <20260225035739.42848-4-philmd@linaro.org>

Philippe Mathieu-Daudé committed Feb 24, 2026 at 13:23 UTC b5d09c11d1e0b5decd4643325abb63f0c1be7ad9
2 files changed +11 -10
hw/acpi/acpi_interface.c
-10
@@ -2,16 +2,6 @@
2 #include "hw/acpi/acpi_dev_interface.h"
3 #include "hw/acpi/acpi_aml_interface.h"
4 #include "qemu/module.h"
5 -#include "qemu/queue.h"
6 -
7 -void qbus_build_aml(BusState *bus, Aml *scope)
8 -{
9 - BusChild *kid;
10 -
11 - QTAILQ_FOREACH(kid, &bus->children, sibling) {
12 - call_dev_aml_func(DEVICE(kid->child), scope);
13 - }
14 -}
5
6 static void register_types(void)
7 {
hw/acpi/aml-build.c
+11
@@ -25,12 +25,14 @@
25 #include "hw/acpi/acpi.h"
26 #include "qemu/bswap.h"
27 #include "qemu/bitops.h"
28 +#include "qemu/queue.h"
29 #include "system/numa.h"
30 #include "hw/core/boards.h"
31 #include "hw/acpi/tpm.h"
32 #include "hw/pci/pci_host.h"
33 #include "hw/pci/pci_bus.h"
34 #include "hw/pci/pci_bridge.h"
35 +#include "hw/acpi/acpi_aml_interface.h"
36 #include "qemu/cutils.h"
37
38 static GArray *build_alloc_array(void)
@@ -2647,3 +2649,12 @@ Aml *aml_error_device(void)
2649
2650 return dev;
2651 }
2652 +
2653 +void qbus_build_aml(BusState *bus, Aml *scope)
2654 +{
2655 + BusChild *kid;
2656 +
2657 + QTAILQ_FOREACH(kid, &bus->children, sibling) {
2658 + call_dev_aml_func(DEVICE(kid->child), scope);
2659 + }
2660 +}