aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2022-02-21 17:24:05 +0000
committerPeter Maydell <peter.maydell@linaro.org>2022-02-21 17:24:05 +0000
commit922268067fe4181d6edcfccd689e908e4d1243ad (patch)
treeb2d27104b2a6533a8d3d02e76e8ccadf0975017a /tools
parent477c3b934a47adf7de285863f59d6e4503dd1a6d (diff)
parent5dc4618e781f36c4bea1b0cdd1bea75b48640c5a (diff)
Merge remote-tracking branch 'remotes/bonzini-gitlab/tags/for-upstream' into staging
* More Meson conversions (0.59.x now required rather than suggested) * UMIP support for TCG x86 * Fix migration crash * Restore error output for check-block # gpg: Signature made Mon 21 Feb 2022 09:35:59 GMT # gpg: using RSA key F13338574B662389866C7682BFFBD25F78C7AE83 # gpg: issuer "pbonzini@redhat.com" # gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full] # gpg: aka "Paolo Bonzini <pbonzini@redhat.com>" [full] # Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4 E2F7 7E15 100C CD36 69B1 # Subkey fingerprint: F133 3857 4B66 2389 866C 7682 BFFB D25F 78C7 AE83 * remotes/bonzini-gitlab/tags/for-upstream: (29 commits) configure, meson: move CONFIG_IASL to a Meson option meson, configure: move ntddscsi API check to meson meson: require dynamic linking for VSS support qga/vss-win32: require widl/midl, remove pre-built TLB file meson: do not make qga/vss-win32/meson.build conditional on C++ presence configure, meson: replace VSS SDK checks and options with --enable-vss-sdk qga/vss: use standard windows headers location qga/vss-win32: use widl if available meson: drop --with-win-sdk qga/vss-win32: fix midl arguments meson: refine check for whether to look for virglrenderer configure, meson: move guest-agent, tools to meson configure, meson: move smbd options to meson_options.txt configure, meson: move coroutine options to meson_options.txt configure, meson: move some default-disabled options to meson_options.txt meson: define qemu_cflags/qemu_ldflags configure, meson: move block layer options to meson_options.txt configure, meson: move image format options to meson_options.txt configure, meson: cleanup qemu-ga libraries configure, meson: move TPM check to meson ... Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/meson.build31
1 files changed, 9 insertions, 22 deletions
diff --git a/tools/meson.build b/tools/meson.build
index 3e5a0abfa2..46977af84f 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -1,25 +1,12 @@
-have_virtiofsd = (targetos == 'linux' and
- have_tools and
- seccomp.found() and
- libcap_ng.found() and
- 'CONFIG_VHOST_USER' in config_host)
-
-if get_option('virtiofsd').enabled()
- if not have_virtiofsd
- if targetos != 'linux'
- error('virtiofsd requires Linux')
- elif not seccomp.found() or not libcap_ng.found()
- error('virtiofsd requires libcap-ng-devel and seccomp-devel')
- elif 'CONFIG_VHOST_USER' not in config_host
- error('virtiofsd needs vhost-user support')
- else
- # Disabled all the tools but virtiofsd.
- have_virtiofsd = true
- endif
- endif
-elif get_option('virtiofsd').disabled() or not have_system
- have_virtiofsd = false
-endif
+have_virtiofsd = get_option('virtiofsd') \
+ .require(targetos == 'linux',
+ error_message: 'virtiofsd requires Linux') \
+ .require(seccomp.found() and libcap_ng.found(),
+ error_message: 'virtiofsd requires libcap-ng-devel and seccomp-devel') \
+ .require('CONFIG_VHOST_USER' in config_host,
+ error_message: 'virtiofsd needs vhost-user-support') \
+ .disable_auto_if(not have_tools and not have_system) \
+ .allowed()
if have_virtiofsd
subdir('virtiofsd')