diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2019-08-15 17:13:06 +0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2019-12-17 19:32:48 +0100 |
| commit | 21c6b0c87e85d952d3d0e569388526f03ad48576 (patch) | |
| tree | 85f3fc65d8e32a72e47cc0da315a36d086906e8b | |
| parent | 95c5f2debc867391a8c7dcc99be57dbab3dc6bda (diff) | |
configure: simplify vhost condition with Kconfig
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | Kconfig.host | 5 | ||||
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | hw/virtio/Kconfig | 3 | ||||
| -rw-r--r-- | hw/virtio/Makefile.objs | 4 |
4 files changed, 11 insertions, 2 deletions
diff --git a/Kconfig.host b/Kconfig.host index bb6e116e2a..55136e037d 100644 --- a/Kconfig.host +++ b/Kconfig.host @@ -25,6 +25,11 @@ config TPM config VHOST_USER bool + select VHOST + +config VHOST_KERNEL + bool + select VHOST config XEN bool @@ -382,6 +382,7 @@ MINIKCONF_ARGS = \ CONFIG_OPENGL=$(CONFIG_OPENGL) \ CONFIG_X11=$(CONFIG_X11) \ CONFIG_VHOST_USER=$(CONFIG_VHOST_USER) \ + CONFIG_VHOST_KERNEL=$(CONFIG_VHOST_KERNEL) \ CONFIG_VIRTFS=$(CONFIG_VIRTFS) \ CONFIG_LINUX=$(CONFIG_LINUX) \ CONFIG_PVRDMA=$(CONFIG_PVRDMA) diff --git a/hw/virtio/Kconfig b/hw/virtio/Kconfig index 3724ff8bac..f87def27a6 100644 --- a/hw/virtio/Kconfig +++ b/hw/virtio/Kconfig @@ -1,3 +1,6 @@ +config VHOST + bool + config VIRTIO bool diff --git a/hw/virtio/Makefile.objs b/hw/virtio/Makefile.objs index e2f70fbb89..de0f5fc39b 100644 --- a/hw/virtio/Makefile.objs +++ b/hw/virtio/Makefile.objs @@ -2,8 +2,8 @@ ifeq ($(CONFIG_VIRTIO),y) common-obj-y += virtio-bus.o obj-y += virtio.o -obj-$(call lor,$(CONFIG_VHOST_USER),$(CONFIG_VHOST_KERNEL)) += vhost.o vhost-backend.o -common-obj-$(call lnot,$(call lor,$(CONFIG_VHOST_USER),$(CONFIG_VHOST_KERNEL))) += vhost-stub.o +obj-$(CONFIG_VHOST) += vhost.o vhost-backend.o +common-obj-$(call lnot,$(CONFIG_VHOST)) += vhost-stub.o obj-$(CONFIG_VHOST_USER) += vhost-user.o common-obj-$(CONFIG_VIRTIO_RNG) += virtio-rng.o |