diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-10-24 10:18:16 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2017-01-16 17:52:35 +0100 |
| commit | 6a997d3b76aee43f9e6eb148f43fd5a919633487 (patch) | |
| tree | e98126a4887d2f3ce284336bf59fddc91691b567 | |
| parent | cc7a73604a4d6241ba2df37ea06109b4d7e03d4b (diff) | |
| download | qemu-6a997d3b76aee43f9e6eb148f43fd5a919633487.tar.gz | |
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 <pbonzini@redhat.com>
| -rw-r--r-- | hw/acpi/Makefile.objs | 12 | ||||
| -rw-r--r-- | hw/acpi/ipmi-stub.c (renamed from stubs/ipmi.c) | 0 | ||||
| -rw-r--r-- | stubs/Makefile.objs | 1 |
3 files changed, 8 insertions, 5 deletions
diff --git a/hw/acpi/Makefile.objs b/hw/acpi/Makefile.objs index 834c63b980..dfc8229d2c 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 index 98b6dcee0d..98b6dcee0d 100644 --- a/stubs/ipmi.c +++ b/hw/acpi/ipmi-stub.c diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 13c5d45ce3..c4df9152f6 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 |