mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stubs: move vhost stubs to stubs/vhost.o

Browse Source 
No need to include them in libqemustub.a, since only system emulators
need them.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2016-10-24 11:13:49 +02:00
parent 858d436665
commit a0f80010b3
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/Makefile.objs
View File

@ -29,7 +29,7 @@ devices-dirs-$(CONFIG_SOFTMMU) += timer/
devices-dirs-$(CONFIG_TPM) += tpm/ devices-dirs-$(CONFIG_TPM) += tpm/
devices-dirs-$(CONFIG_SOFTMMU) += usb/ devices-dirs-$(CONFIG_SOFTMMU) += usb/
devices-dirs-$(CONFIG_SOFTMMU) += vfio/ devices-dirs-$(CONFIG_SOFTMMU) += vfio/
devices-dirs-$(CONFIG_VIRTIO) += virtio/ devices-dirs-$(CONFIG_SOFTMMU) += virtio/
devices-dirs-$(CONFIG_SOFTMMU) += watchdog/ devices-dirs-$(CONFIG_SOFTMMU) += watchdog/
devices-dirs-$(CONFIG_SOFTMMU) += xen/ devices-dirs-$(CONFIG_SOFTMMU) += xen/
devices-dirs-$(CONFIG_MEM_HOTPLUG) += mem/ devices-dirs-$(CONFIG_MEM_HOTPLUG) += mem/

6
hw/virtio/Makefile.objs
View File

@ -1,3 +1,4 @@
ifeq ($(CONFIG_VIRTIO),y)
common-obj-y += virtio-rng.o common-obj-y += virtio-rng.o
common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o common-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
common-obj-y += virtio-bus.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-y += virtio.o virtio-balloon.o
obj-$(CONFIG_LINUX) += vhost.o vhost-backend.o vhost-user.o obj-$(CONFIG_LINUX) += vhost.o vhost-backend.o vhost-user.o
obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o obj-$(CONFIG_VHOST_VSOCK) += vhost-vsock.o
obj-y += virtio-crypto.o obj-y += virtio-crypto.o
obj-$(CONFIG_VIRTIO_PCI) += virtio-crypto-pci.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

0
stubs/vhost.c → hw/virtio/vhost-stub.c
View File

1
stubs/Makefile.objs
View File

@ -35,7 +35,6 @@ stub-obj-y += kvm.o
stub-obj-y += qmp_pc_dimm_device_list.o stub-obj-y += qmp_pc_dimm_device_list.o
stub-obj-y += target-monitor-defs.o stub-obj-y += target-monitor-defs.o
stub-obj-y += target-get-monitor-def.o stub-obj-y += target-get-monitor-def.o
stub-obj-y += vhost.o
stub-obj-y += iohandler.o stub-obj-y += iohandler.o
stub-obj-y += pc_madt_cpu_entry.o stub-obj-y += pc_madt_cpu_entry.o
stub-obj-y += migration-colo.o stub-obj-y += migration-colo.o