diff options
| author | Paolo Bonzini | 2016-10-24 10:18:16 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2017-01-16 17:52:35 +0100 |
| commit | cc7a73604a4d6241ba2df37ea06109b4d7e03d4b (patch) | |
| tree | dda58ae52f4d504872beeac6557c23f6397b5e6c | |
| parent | stubs: merge all monitor stubs in one file, remove monitor_cur_is_qmp stub (diff) | |
| download | qemu-cc7a73604a4d6241ba2df37ea06109b4d7e03d4b.tar.gz qemu-cc7a73604a4d6241ba2df37ea06109b4d7e03d4b.tar.xz qemu-cc7a73604a4d6241ba2df37ea06109b4d7e03d4b.zip | |
stubs: move smbios stubs to hw/smbios
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/smbios/Makefile.objs | 11 | ||||
| -rw-r--r-- | hw/smbios/smbios_type_38-stub.c (renamed from stubs/smbios_type_38.c) | 0 | ||||
| -rw-r--r-- | stubs/Makefile.objs | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/hw/smbios/Makefile.objs b/hw/smbios/Makefile.objs index ee0712bae0..23bb2bac07 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 index 9528c2c28e..9528c2c28e 100644 --- a/stubs/smbios_type_38.c +++ b/hw/smbios/smbios_type_38-stub.c diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 9fc373ed3f..13c5d45ce3 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 |