diff options
| -rw-r--r-- | hw/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/virtio/Makefile.objs | 6 | ||||
| -rw-r--r-- | hw/virtio/vhost-stub.c (renamed from stubs/vhost.c) | 0 | ||||
| -rw-r--r-- | stubs/Makefile.objs | 1 |
4 files changed, 6 insertions, 3 deletions
diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 2a73ae598f..7be399e922 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 95c4c30ea1..765d363c1f 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 index 2d76cdebdc..2d76cdebdc 100644 --- a/stubs/vhost.c +++ b/hw/virtio/vhost-stub.c diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 40b4e15564..0b642d7893 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 |