summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Huth2020-11-09 09:59:06 +0100
committerPaolo Bonzini2020-11-09 10:09:36 +0100
commitb54b82df250685b8ee7f947909d10dc30a0ac2b1 (patch)
treecce0410fa7010a507cc99a71fb4e80a6c9903427
parentMerge remote-tracking branch 'remotes/cohuck/tags/s390x-20201106' into staging (diff)
downloadqemu-b54b82df250685b8ee7f947909d10dc30a0ac2b1.tar.gz
qemu-b54b82df250685b8ee7f947909d10dc30a0ac2b1.tar.xz
qemu-b54b82df250685b8ee7f947909d10dc30a0ac2b1.zip
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. Signed-off-by: Thomas Huth <thuth@redhat.com> Message-Id: <20201109085906.87921-1-thuth@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r--meson.build3
1 files changed, 2 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index f5175010df..b7f91cb08d 100644
--- a/meson.build
+++ b/meson.build
@@ -2102,11 +2102,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']}