[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 12/35] stubs: move vhost stubs to stubs/vhost.o
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 12/35] stubs: move vhost stubs to stubs/vhost.o |
Date: |
Fri, 20 Jan 2017 14:31:16 +0100 |
No need to include them in libqemustub.a, since only system emulators
need them.
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/Makefile.objs | 2 +-
hw/virtio/Makefile.objs | 6 +++++-
stubs/vhost.c => hw/virtio/vhost-stub.c | 0
stubs/Makefile.objs | 1 -
4 files changed, 6 insertions(+), 3 deletions(-)
rename stubs/vhost.c => hw/virtio/vhost-stub.c (100%)
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 2a73ae5..7be399e 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -29,7 +29,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += timer/
devices-dirs-$(CONFIG_TPM) += tpm/
devices-dirs-$(CONFIG_SOFTMMU) += usb/
devices-dirs-$(CONFIG_SOFTMMU) += vfio/
-devices-dirs-$(CONFIG_VIRTIO) += virtio/
+devices-dirs-$(CONFIG_SOFTMMU) += virtio/
devices-dirs-$(CONFIG_SOFTMMU) += watchdog/
devices-dirs-$(CONFIG_SOFTMMU) += xen/
devices-dirs-$(CONFIG_MEM_HOTPLUG) += mem/
diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs
index 95c4c30..765d363 100644
--- a/hw/virtio/Makefile.objs
+++ b/hw/virtio/Makefile.objs
@@ -1,3 +1,4 @@
+ifeq ($(CONFIG_VIRTIO),y)
common-obj-y += virtio-rng.o
common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
common-obj-y += virtio-bus.o
@@ -5,7 +6,10 @@ common-obj-y += virtio-mmio.o
obj-y += virtio.o virtio-balloon.o
obj-$(CONFIG_LINUX) += vhost.o vhost-backend.o vhost-user.o
-
obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o
obj-y += virtio-crypto.o
obj-$(CONFIG_VIRTIO_PCI) += virtio-crypto-pci.o
+endif
+
+common-obj-$(call lnot,$(CONFIG_LINUX)) += vhost-stub.o
+common-obj-$(CONFIG_ALL) += vhost-stub.o
diff --git a/stubs/vhost.c b/hw/virtio/vhost-stub.c
similarity index 100%
rename from stubs/vhost.c
rename to hw/virtio/vhost-stub.c
diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs
index 40b4e15..0b642d7 100644
--- a/stubs/Makefile.objs
+++ b/stubs/Makefile.objs
@@ -35,7 +35,6 @@ stub-obj-y += kvm.o
stub-obj-y += qmp_pc_dimm_device_list.o
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 += 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, 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 <=
- [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
- [Qemu-devel] [PULL 19/35] serial: fix memory leak in serial exit, Paolo Bonzini, 2017/01/20
- [Qemu-devel] [PULL 20/35] qemu-thread: fix qemu_thread_set_name() race in qemu_thread_create(), Paolo Bonzini, 2017/01/20