aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2021-02-17 16:24:25 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2021-02-25 14:14:32 +0100
commit106ad1f9c513f48b046e07e45406c339d16e4e2f (patch)
treeac270ac8eb6a1d50c07d3a5e20e57c72cbc8ee9e /configure
parentefce01bcb6757158358a3f2c1f6756ffab4aa8c0 (diff)
multiprocess: move feature to meson_options.txt
While at it, improve the description of the feature in the summary and help message. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure14
1 files changed, 5 insertions, 9 deletions
diff --git a/configure b/configure
index 19f2b88589..cc435e2503 100755
--- a/configure
+++ b/configure
@@ -463,7 +463,7 @@ skip_meson=no
gettext="auto"
fuse="auto"
fuse_lseek="auto"
-multiprocess="no"
+multiprocess="auto"
malloc_trim="auto"
@@ -798,7 +798,6 @@ Linux)
linux="yes"
linux_user="yes"
vhost_user=${default_feature:-yes}
- multiprocess=${default_feature:-yes}
;;
esac
@@ -1558,9 +1557,9 @@ for opt do
;;
--disable-fuse-lseek) fuse_lseek="disabled"
;;
- --enable-multiprocess) multiprocess="yes"
+ --enable-multiprocess) multiprocess="enabled"
;;
- --disable-multiprocess) multiprocess="no"
+ --disable-multiprocess) multiprocess="disabled"
;;
*)
echo "ERROR: unknown option $opt"
@@ -1914,7 +1913,7 @@ disabled with --disable-FEATURE, default is enabled if available
libdaxctl libdaxctl support
fuse FUSE block device export
fuse-lseek SEEK_HOLE/SEEK_DATA support for FUSE exports
- multiprocess Multiprocess QEMU support
+ multiprocess Out of process device emulation support
NOTE: The object files are built at the place where configure is launched
EOF
@@ -6089,9 +6088,6 @@ fi
if test "$have_mlockall" = "yes" ; then
echo "HAVE_MLOCKALL=y" >> $config_host_mak
fi
-if test "$multiprocess" = "yes" ; then
- echo "CONFIG_MULTIPROCESS_ALLOWED=y" >> $config_host_mak
-fi
if test "$fuzzing" = "yes" ; then
# If LIB_FUZZING_ENGINE is set, assume we are running on OSS-Fuzz, and the
# needed CFLAGS have already been provided
@@ -6434,7 +6430,7 @@ NINJA=$ninja $meson setup \
-Dzstd=$zstd -Dseccomp=$seccomp -Dvirtfs=$virtfs -Dcap_ng=$cap_ng \
-Dattr=$attr -Ddefault_devices=$default_devices \
-Ddocs=$docs -Dsphinx_build=$sphinx_build -Dinstall_blobs=$blobs \
- -Dvhost_user_blk_server=$vhost_user_blk_server \
+ -Dvhost_user_blk_server=$vhost_user_blk_server -Dmultiprocess=$multiprocess \
-Dfuse=$fuse -Dfuse_lseek=$fuse_lseek -Dguest_agent_msi=$guest_agent_msi \
$(if test "$default_features" = no; then echo "-Dauto_features=disabled"; fi) \
-Dtcg_interpreter=$tcg_interpreter \