@samitouri / QOSamiQemu / commits / fb1d68d1d6

hw/acpi: Build stubs once

Move stubs to the global stub_ss[] source set. These files are now built once for all binaries, instead of one time per system binary. 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-7-philmd@linaro.org>

Philippe Mathieu-Daudé committed Feb 10, 2026 at 22:48 UTC fb1d68d1d6d4515975e97eb93e5717764b61c47e
1 file changed +14 -11
hw/acpi/meson.build
+14 -11
@@ -6,33 +6,36 @@ acpi_ss.add(files(
6 'utils.c',
7 ))
8 acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_true: files('cpu.c'))
9 -acpi_ss.add(when: 'CONFIG_ACPI_CPU_HOTPLUG', if_false: files('acpi-cpu-hotplug-stub.c'))
9 +stub_ss.add(files('acpi-cpu-hotplug-stub.c'))
10 acpi_ss.add(when: 'CONFIG_ACPI_MEMORY_HOTPLUG', if_true: files('memory_hotplug.c'))
11 -acpi_ss.add(when: 'CONFIG_ACPI_MEMORY_HOTPLUG', if_false: files('acpi-mem-hotplug-stub.c'))
11 +stub_ss.add(files('acpi-mem-hotplug-stub.c'))
12 acpi_ss.add(when: 'CONFIG_ACPI_NVDIMM', if_true: files('nvdimm.c'))
13 -acpi_ss.add(when: 'CONFIG_ACPI_NVDIMM', if_false: files('acpi-nvdimm-stub.c'))
13 +stub_ss.add(files('acpi-nvdimm-stub.c'))
14 acpi_ss.add(when: 'CONFIG_ACPI_PCI', if_true: files('pci.c'))
15 -acpi_ss.add(when: 'CONFIG_ACPI_CXL', if_true: files('cxl.c'), if_false: files('cxl-stub.c'))
15 +acpi_ss.add(when: 'CONFIG_ACPI_CXL', if_true: files('cxl.c'))
16 +stub_ss.add(files('cxl-stub.c'))
17 acpi_ss.add(when: 'CONFIG_ACPI_VMGENID', if_true: files('vmgenid.c'))
18 acpi_ss.add(when: 'CONFIG_ACPI_VMCLOCK', if_true: files('vmclock.c'))
19 acpi_ss.add(when: 'CONFIG_ACPI_HW_REDUCED', if_true: files('generic_event_device.c'))
20 acpi_ss.add(when: 'CONFIG_ACPI_HMAT', if_true: files('hmat.c'))
20 -acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c'), if_false: files('ghes-stub.c'))
21 +acpi_ss.add(when: 'CONFIG_ACPI_APEI', if_true: files('ghes.c'))
22 +stub_ss.add(files('ghes-stub.c'))
23 acpi_ss.add(when: 'CONFIG_ACPI_PIIX4', if_true: files('piix4.c'))
24 acpi_ss.add(when: 'CONFIG_ACPI_PCI_BRIDGE', if_true: files('pci-bridge.c'))
25 acpi_ss.add(when: 'CONFIG_ACPI_PCIHP', if_true: files('pcihp.c'))
24 -acpi_ss.add(when: 'CONFIG_ACPI_PCIHP', if_false: files('acpi-pci-hotplug-stub.c'))
26 +stub_ss.add(files('acpi-pci-hotplug-stub.c'))
27 acpi_ss.add(when: 'CONFIG_ACPI_VIOT', if_true: files('viot.c'))
28 acpi_ss.add(when: 'CONFIG_ACPI_ICH9', if_true: files('ich9.c', 'ich9_tco.c', 'ich9_timer.c'))
29 acpi_ss.add(when: 'CONFIG_ACPI_ERST', if_true: files('erst.c'))
28 -acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'), if_false: files('ipmi-stub.c'))
29 -acpi_ss.add(when: 'CONFIG_PC', if_false: files('acpi-x86-stub.c'))
30 +acpi_ss.add(when: 'CONFIG_IPMI', if_true: files('ipmi.c'))
31 +stub_ss.add(files('ipmi-stub.c'))
32 +stub_ss.add(files('acpi-x86-stub.c'))
33 if have_tpm
34 acpi_ss.add(files('tpm.c'))
35 endif
33 -system_ss.add(when: 'CONFIG_ACPI', if_false: files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c', 'acpi_interface.c'))
34 -system_ss.add(when: 'CONFIG_ACPI_PCI_BRIDGE', if_false: files('pci-bridge-stub.c'))
36 +stub_ss.add(files('acpi-stub.c', 'aml-build-stub.c', 'ghes-stub.c'))
37 +stub_ss.add(files('pci-bridge-stub.c'))
38 system_ss.add_all(when: 'CONFIG_ACPI', if_true: acpi_ss)
39 system_ss.add(when: 'CONFIG_GHES_CPER', if_true: files('ghes_cper.c'))
37 -system_ss.add(when: 'CONFIG_GHES_CPER', if_false: files('ghes_cper_stub.c'))
40 +stub_ss.add(files('ghes_cper_stub.c'))
41 system_ss.add(files('acpi-qmp-cmds.c', 'acpi_interface.c'))