[PATCH] meson: Clarify the confusing vhost-user vs. vhost-kernel output

Thomas Huth posted 1 patch 3 years, 4 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20201109085906.87921-1-thuth@redhat.com
meson.build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
[PATCH] meson: Clarify the confusing vhost-user vs. vhost-kernel output
Posted by Thomas Huth 3 years, 4 months ago
The configuration summary prints a line with "vhost-user: YES/NO",
but the value is currently the vhost-kernel setting instead which
looks wrong. Print the kernel setting in a separate line and switch
the "vhost-user:" line to CONFIG_VHOST_USER instead.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index b473620321..61d883bc07 100644
--- a/meson.build
+++ b/meson.build
@@ -2098,11 +2098,12 @@ summary_info += {'madvise':           config_host.has_key('CONFIG_MADVISE')}
 summary_info += {'posix_madvise':     config_host.has_key('CONFIG_POSIX_MADVISE')}
 summary_info += {'posix_memalign':    config_host.has_key('CONFIG_POSIX_MEMALIGN')}
 summary_info += {'libcap-ng support': config_host.has_key('CONFIG_LIBCAP_NG')}
+summary_info += {'vhost-kernel support': config_host.has_key('CONFIG_VHOST_KERNEL')}
 summary_info += {'vhost-net support': config_host.has_key('CONFIG_VHOST_NET')}
 summary_info += {'vhost-crypto support': config_host.has_key('CONFIG_VHOST_CRYPTO')}
 summary_info += {'vhost-scsi support': config_host.has_key('CONFIG_VHOST_SCSI')}
 summary_info += {'vhost-vsock support': config_host.has_key('CONFIG_VHOST_VSOCK')}
-summary_info += {'vhost-user support': config_host.has_key('CONFIG_VHOST_KERNEL')}
+summary_info += {'vhost-user support': config_host.has_key('CONFIG_VHOST_USER')}
 summary_info += {'vhost-user-fs support': config_host.has_key('CONFIG_VHOST_USER_FS')}
 summary_info += {'vhost-vdpa support': config_host.has_key('CONFIG_VHOST_VDPA')}
 summary_info += {'Trace backends':    config_host['TRACE_BACKENDS']}
-- 
2.18.2


Re: [PATCH] meson: Clarify the confusing vhost-user vs. vhost-kernel output
Posted by Paolo Bonzini 3 years, 4 months ago
On 09/11/20 09:59, Thomas Huth wrote:
> The configuration summary prints a line with "vhost-user: YES/NO",
> but the value is currently the vhost-kernel setting instead which
> looks wrong. Print the kernel setting in a separate line and switch
> the "vhost-user:" line to CONFIG_VHOST_USER instead.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>
> ---
>   meson.build | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meson.build b/meson.build
> index b473620321..61d883bc07 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -2098,11 +2098,12 @@ summary_info += {'madvise':           config_host.has_key('CONFIG_MADVISE')}
>   summary_info += {'posix_madvise':     config_host.has_key('CONFIG_POSIX_MADVISE')}
>   summary_info += {'posix_memalign':    config_host.has_key('CONFIG_POSIX_MEMALIGN')}
>   summary_info += {'libcap-ng support': config_host.has_key('CONFIG_LIBCAP_NG')}
> +summary_info += {'vhost-kernel support': config_host.has_key('CONFIG_VHOST_KERNEL')}
>   summary_info += {'vhost-net support': config_host.has_key('CONFIG_VHOST_NET')}
>   summary_info += {'vhost-crypto support': config_host.has_key('CONFIG_VHOST_CRYPTO')}
>   summary_info += {'vhost-scsi support': config_host.has_key('CONFIG_VHOST_SCSI')}
>   summary_info += {'vhost-vsock support': config_host.has_key('CONFIG_VHOST_VSOCK')}
> -summary_info += {'vhost-user support': config_host.has_key('CONFIG_VHOST_KERNEL')}
> +summary_info += {'vhost-user support': config_host.has_key('CONFIG_VHOST_USER')}
>   summary_info += {'vhost-user-fs support': config_host.has_key('CONFIG_VHOST_USER_FS')}
>   summary_info += {'vhost-vdpa support': config_host.has_key('CONFIG_VHOST_VDPA')}
>   summary_info += {'Trace backends':    config_host['TRACE_BACKENDS']}
> 

Queued, thanks.

Paolo