stubs: move acpi stubs to hw/acpi

No need to include them in libqemustub.a, since only system emulators
need them.

Signed-off-by: Paolo Bonzini <[email protected]>

diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index 834c63b980307ded820baf4fefcf5732a9f6e063..dfc8229d2cc135f2d28869a83c7d80bfe95eac9a 100644 (file)
--- a/hw/acpi/Makefile.objs
+++ b/hw/acpi/Makefile.objs
@@ -4,7 +4,11 @@ common-obj-$(CONFIG_ACPI_CPU_HOTPLUG) += cpu_hotplug.o
 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) += acpi_interface.o
-common-obj-$(CONFIG_ACPI) += bios-linker-loader.o
-common-obj-$(CONFIG_ACPI) += aml-build.o
-common-obj-$(call land,$(CONFIG_ACPI),$(CONFIG_IPMI)) += ipmi.o
+
+common-obj-y += acpi_interface.o
+common-obj-y += bios-linker-loader.o
+common-obj-y += aml-build.o
+
+common-obj-$(CONFIG_IPMI) += ipmi.o
+common-obj-$(call lnot,$(CONFIG_IPMI)) += ipmi-stub.o
+common-obj-$(CONFIG_ALL) += ipmi-stub.o

diff --git a/hw/acpi/ipmi-stub.c b/hw/acpi/ipmi-stub.c
new file mode 100644 (file)
index 0000000..98b6dce
--- /dev/null
+++ b/hw/acpi/ipmi-stub.c
@@ -0,0 +1,14 @@
+/*
+ * IPMI ACPI firmware handling
+ *
+ * Copyright (c) 2015,2016 Corey Minyard, MontaVista Software, LLC
+ *
+ * This work is licensed under the terms of the GNU GPL, version 2 or later.
+ * See the COPYING file in the top-level directory.
+ */
+
+#include "hw/acpi/ipmi.h"
+
+void build_acpi_ipmi_devices(Aml *table, BusState *bus)
+{
+}

diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 13c5d45ce3201a6675226c17ac9924c0b8a893e3..c4df9152f69ad4073369184b3950e742990df41e 100644 (file)
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -44,6 +44,5 @@ stub-obj-y += target-monitor-defs.o
 stub-obj-y += target-get-monitor-def.o
 stub-obj-y += vhost.o
 stub-obj-y += iohandler.o
-stub-obj-y += ipmi.o
 stub-obj-y += pc_madt_cpu_entry.o
 stub-obj-y += migration-colo.o

diff --git a/stubs/ipmi.c b/stubs/ipmi.c
deleted file mode 100644 (file)
index 98b6dce..0000000
--- a/stubs/ipmi.c
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * IPMI ACPI firmware handling
- *
- * Copyright (c) 2015,2016 Corey Minyard, MontaVista Software, LLC
- *
- * This work is licensed under the terms of the GNU GPL, version 2 or later.
- * See the COPYING file in the top-level directory.
- */
-
-#include "hw/acpi/ipmi.h"
-
-void build_acpi_ipmi_devices(Aml *table, BusState *bus)
-{
-}