[Qemu-devel] [PATCH v2 2/6] hw/acpi: Move the ACPI stub to the stubs/ directory

[Philippe Mathieu-Daudé]

Move the ACPI stub file to the stubs/ directory to greatly simplify
the hw/acpi Makefile.

Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
 MAINTAINERS                         | 1 +
 hw/acpi/Makefile.objs               | 5 -----
 stubs/Makefile.objs                 | 1 +
 hw/acpi/acpi-stub.c => stubs/acpi.c | 0
 4 files changed, 2 insertions(+), 5 deletions(-)
 rename hw/acpi/acpi-stub.c => stubs/acpi.c (100%)

diff --git a/MAINTAINERS b/MAINTAINERS
index e1681eca5cb..d05a3d36511 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1357,6 +1357,7 @@ F: hw/acpi/*
 F: hw/smbios/*
 F: hw/i386/acpi-build.[hc]
 F: hw/arm/virt-acpi-build.c
+F: stubs/acpi.c
 F: tests/bios-tables-test.c
 F: tests/acpi-utils.[hc]
 F: tests/data/acpi/
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index 4e302feb885..73eca4f7dff 100644
--- a/hw/acpi/Makefile.objs
+++ b/hw/acpi/Makefile.objs
@@ -6,15 +6,10 @@ common-obj-$(CONFIG_ACPI_MEMORY_HOTPLUG) += memory_hotplug.o
 common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu.o
 common-obj-$(CONFIG_ACPI_NVDIMM) += nvdimm.o
 common-obj-$(CONFIG_ACPI_VMGENID) += vmgenid.o
-common-obj-$(call lnot,$(CONFIG_ACPI_X86)) += acpi-stub.o
 
 common-obj-y += acpi_interface.o
 common-obj-y += bios-linker-loader.o
 common-obj-y += aml-build.o
 common-obj-$(CONFIG_TPM) += tpm.o
-
 common-obj-$(CONFIG_IPMI) += ipmi.o
-else
-common-obj-y += acpi-stub.o
 endif
-common-obj-$(CONFIG_ALL) += acpi-stub.o
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 36bb9ff0b1d..47ee66a71f2 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -1,3 +1,4 @@
+stub-obj-y += acpi.o
 stub-obj-y += bdrv-next-monitor-owned.o
 stub-obj-y += blk-commit-all.o
 stub-obj-y += blockdev-close-all-bdrv-states.o
diff --git a/hw/acpi/acpi-stub.c b/stubs/acpi.c
similarity index 100%
rename from hw/acpi/acpi-stub.c
rename to stubs/acpi.c
-- 
2.20.1