[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/35] stubs: move smbios stubs to hw/smbios
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 06/35] stubs: move smbios stubs to hw/smbios |
Date: |
Fri, 20 Jan 2017 14:31:10 +0100 |
No need to include them in libqemustub.a, since only system emulators
need them.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/smbios/Makefile.objs | 11 ++++++++---
stubs/smbios_type_38.c => hw/smbios/smbios_type_38-stub.c | 0
stubs/Makefile.objs | 1 -
3 files changed, 8 insertions(+), 4 deletions(-)
rename stubs/smbios_type_38.c => hw/smbios/smbios_type_38-stub.c (100%)
diff --git a/hw/smbios/Makefile.objs b/hw/smbios/Makefile.objs
index ee0712b..23bb2ba 100644
--- a/hw/smbios/Makefile.objs
+++ b/hw/smbios/Makefile.objs
@@ -1,5 +1,10 @@
-common-obj-$(CONFIG_SMBIOS) += smbios.o
-common-obj-$(call land,$(CONFIG_SMBIOS),$(CONFIG_IPMI)) += smbios_type_38.o
+ifeq ($(CONFIG_SMBIOS),y)
+common-obj-y += smbios.o
+common-obj-$(CONFIG_IPMI) += smbios_type_38.o
+common-obj-$(call lnot,$(CONFIG_IPMI)) += smbios_type_38-stub.o
+else
+common-obj-y += smbios-stub.o
+endif
-common-obj-$(call lnot,$(CONFIG_SMBIOS)) += smbios-stub.o
common-obj-$(CONFIG_ALL) += smbios-stub.o
+common-obj-$(CONFIG_ALL) += smbios_type_38-stub.o
diff --git a/stubs/smbios_type_38.c b/hw/smbios/smbios_type_38-stub.c
similarity index 100%
rename from stubs/smbios_type_38.c
rename to hw/smbios/smbios_type_38-stub.c
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 9fc373e..13c5d45 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -44,7 +44,6 @@ 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 += smbios_type_38.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, 2017/01/20
- [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 <=
- [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
- [Qemu-devel] [PULL 18/35] scsi-block: fix direction of BYTCHK test for VERIFY commands, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 17/35] pc: fix crash in rtc_set_memory() if initial cpu is marked as hotplugged, Paolo Bonzini, 2017/01/20