Skip to contentSkip to conversation

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

PATCH Applied Thomas Huth 2 participants 2 messages Nov 9, 2020 Arm/Amlogic Meson SoC support

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 meson: Clarify the confusing vhost-user vs. vhost-kernel output

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.

---
 meson.build | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meson.build +2 -1
index b473620321..61d883bc07 100644
@@ -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']}
Signature · 1 line
2.18.2
#1 lore raw
Quoted 19 lines · Thomas Huth

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.

---
  meson.build | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
meson.build +0 -0
index b473620321..61d883bc07 100644
@@ -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')}

meson.build summary_info += {'madvise': config_host.has_key('CONFIG_MADVISE')} · line 2109

Quoted 10 lines
meson.build +2 -1
+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