[PATCH] configure: simplify vhost condition with Kconfig

[PATCH] configure: simplify vhost condition with Kconfig

[Paolo Bonzini]

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 +++++
 hw/virtio/Kconfig       | 3 +++
 hw/virtio/Makefile.objs | 4 ++--
 3 files changed, 10 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/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
-- 
1.8.3.1

Re: [PATCH] configure: simplify vhost condition with Kconfig

[Thomas Huth]

On 11/12/2019 15.24, 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 +++++
>  hw/virtio/Kconfig       | 3 +++
>  hw/virtio/Makefile.objs | 4 ++--
>  3 files changed, 10 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

Don't you also have to add it to MINIKCONF_ARGS in the main Makefile??

 Thomas

Re: [PATCH] configure: simplify vhost condition with Kconfig

[Paolo Bonzini]

On 11/12/19 20:38, Thomas Huth wrote:
> On 11/12/2019 15.24, 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 +++++
>>  hw/virtio/Kconfig       | 3 +++
>>  hw/virtio/Makefile.objs | 4 ++--
>>  3 files changed, 10 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
> 
> Don't you also have to add it to MINIKCONF_ARGS in the main Makefile??

Yes, I do.

Paolo