[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 07/35] stubs: move acpi stubs to hw/acpi
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 07/35] stubs: move acpi stubs to hw/acpi |
Date: |
Fri, 20 Jan 2017 14:31:11 +0100 |
No need to include them in libqemustub.a, since only system emulators
need them.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/acpi/Makefile.objs | 12 ++++++++----
stubs/ipmi.c => hw/acpi/ipmi-stub.c | 0
stubs/Makefile.objs | 1 -
3 files changed, 8 insertions(+), 5 deletions(-)
rename stubs/ipmi.c => hw/acpi/ipmi-stub.c (100%)
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs
index 834c63b..dfc8229 100644
--- 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/stubs/ipmi.c b/hw/acpi/ipmi-stub.c
similarity index 100%
rename from stubs/ipmi.c
rename to hw/acpi/ipmi-stub.c
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 13c5d45..c4df915 100644
--- 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
--
2.9.3
- [Qemu-devel] [PULL v3 00/32] Misc patches for 2017-01-11, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 02/35] megasas: fix guest-triggered memory leak, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 01/35] bugfix: vm halt when in reset looping, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 04/35] smbios: filter based on CONFIG_SMBIOS rather than TARGET, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 03/35] qom: Make all interface types abstract, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 05/35] stubs: merge all monitor stubs in one file, remove monitor_cur_is_qmp stub, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 07/35] stubs: move acpi stubs to hw/acpi,
Paolo Bonzini <=
- [Qemu-devel] [PULL 08/35] stubs: remove unused stub for serial_hd, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 06/35] stubs: move smbios stubs to hw/smbios, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 09/35] hw: move reset handlers from vl.c to hw/core, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 12/35] stubs: move vhost stubs to stubs/vhost.o, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 10/35] stubs: group stubs for user-mode emulation, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 14/35] build: remove --enable-colo/--disable-colo, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 13/35] event_notifier: cleanups around event_notifier_set_handler, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 11/35] stubs: group all monitor_fdset_* functions in a single file, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 16/35] acpi: filter based on CONFIG_ACPI_X86 rather than TARGET, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 15/35] stubs: remove stubs/kvm.c, Paolo Bonzini, 2017/01/20