Message ID | 1576110624-33604-1-git-send-email-pbonzini@redhat.com |
---|---|
State | New |
Headers | show |
Series | [v2] configure: simplify vhost condition with Kconfig | expand |
On 12/12/2019 01.30, Paolo Bonzini wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > Kconfig.host | 5 +++++ > Makefile | 1 + > hw/virtio/Kconfig | 3 +++ > hw/virtio/Makefile.objs | 4 ++-- > 4 files changed, 11 insertions(+), 2 deletions(-) Reviewed-by: Thomas Huth <thuth@redhat.com>
On 12/12/19 1:30 AM, Paolo Bonzini wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > Kconfig.host | 5 +++++ > Makefile | 1 + > hw/virtio/Kconfig | 3 +++ > hw/virtio/Makefile.objs | 4 ++-- > 4 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/Kconfig.host b/Kconfig.host > index bb6e116..55136e0 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 > diff --git a/Makefile b/Makefile > index 96e69dd..a74c2f2 100644 > --- a/Makefile > +++ b/Makefile > @@ -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 3724ff8..f87def2 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 e2f70fb..de0f5fc 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 >
diff --git a/Kconfig.host b/Kconfig.host index bb6e116..55136e0 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 diff --git a/Makefile b/Makefile index 96e69dd..a74c2f2 100644 --- a/Makefile +++ b/Makefile @@ -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 3724ff8..f87def2 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 e2f70fb..de0f5fc 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