[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 13/27] configure, meson: move coroutine options to meson_options.
From: |
Paolo Bonzini |
Subject: |
[PATCH 13/27] configure, meson: move coroutine options to meson_options.txt |
Date: |
Thu, 3 Feb 2022 18:33:45 +0100 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
configure | 31 -------------------------------
meson.build | 11 +++++++++--
meson_options.txt | 4 ++++
scripts/meson-buildoptions.sh | 7 +++++++
4 files changed, 20 insertions(+), 33 deletions(-)
diff --git a/configure b/configure
index a3aefb99c2..dda586cc69 100755
--- a/configure
+++ b/configure
@@ -322,8 +322,6 @@ vss_win32_sdk="$default_feature"
win_sdk="no"
want_tools="$default_feature"
coroutine=""
-coroutine_pool="$default_feature"
-debug_stack_usage="no"
tls_priority="NORMAL"
plugins="$default_feature"
secret_keyring="$default_feature"
@@ -937,12 +935,6 @@ for opt do
;;
--with-coroutine=*) coroutine="$optarg"
;;
- --disable-coroutine-pool) coroutine_pool="no"
- ;;
- --enable-coroutine-pool) coroutine_pool="yes"
- ;;
- --enable-debug-stack-usage) debug_stack_usage="yes"
- ;;
--disable-vhost-net) vhost_net="no"
;;
--enable-vhost-net) vhost_net="yes"
@@ -1272,8 +1264,6 @@ Advanced options (experts only):
--with-vss-sdk=SDK-path enable Windows VSS support in QEMU Guest Agent
--with-win-sdk=SDK-path path to Windows Platform SDK (to build VSS .tlb)
--tls-priority default TLS protocol/cipher priority string
- --enable-debug-stack-usage
- track the maximum stack usage of stacks created by
qemu_alloc_stack
--enable-plugins
enable plugins via shared library loading
--disable-containers don't use containers for cross-building
@@ -1303,7 +1293,6 @@ cat << EOF
vhost-kernel vhost kernel backend support
vhost-user vhost-user backend support
vhost-vdpa vhost-vdpa kernel backend support
- coroutine-pool coroutine freelist (better performance)
opengl opengl support
tools build qemu-io, qemu-nbd and qemu-img tools
gio libgio support
@@ -2519,17 +2508,6 @@ else
esac
fi
-if test "$coroutine_pool" = ""; then
- coroutine_pool=yes
-fi
-
-if test "$debug_stack_usage" = "yes"; then
- if test "$coroutine_pool" = "yes"; then
- echo "WARN: disabling coroutine pool for stack usage debugging"
- coroutine_pool=no
- fi
-fi
-
##################################################
# SafeStack
@@ -3123,15 +3101,6 @@ if [ "$bsd" = "yes" ] ; then
fi
echo "CONFIG_COROUTINE_BACKEND=$coroutine" >> $config_host_mak
-if test "$coroutine_pool" = "yes" ; then
- echo "CONFIG_COROUTINE_POOL=1" >> $config_host_mak
-else
- echo "CONFIG_COROUTINE_POOL=0" >> $config_host_mak
-fi
-
-if test "$debug_stack_usage" = "yes" ; then
- echo "CONFIG_DEBUG_STACK_USAGE=y" >> $config_host_mak
-fi
if test "$have_asan_iface_fiber" = "yes" ; then
echo "CONFIG_ASAN_IFACE_FIBER=y" >> $config_host_mak
diff --git a/meson.build b/meson.build
index 610a6d4a77..e44f8bf750 100644
--- a/meson.build
+++ b/meson.build
@@ -1548,7 +1548,14 @@ config_host_data.set_quoted('CONFIG_HOST_DSOSUF',
host_dsosuf)
config_host_data.set('HAVE_HOST_BLOCK_DEVICE', have_host_block_device)
config_host_data.set('HOST_WORDS_BIGENDIAN', host_machine.endian() == 'big')
+have_coroutine_pool = get_option('coroutine_pool')
+if get_option('debug_stack_usage') and have_coroutine_pool
+ message('Disabling coroutine pool to measure stack usage')
+ have_coroutine_pool = false
+endif
+config_host_data.set10('CONFIG_COROUTINE_POOL', have_coroutine_pool)
config_host_data.set('CONFIG_DEBUG_MUTEX', get_option('debug_mutex'))
+config_host_data.set('CONFIG_DEBUG_STACK_USAGE',
get_option('debug_stack_usage'))
config_host_data.set('CONFIG_GPROF', get_option('gprof'))
config_host_data.set('CONFIG_LIVE_BLOCK_MIGRATION',
get_option('live_block_migration').allowed())
config_host_data.set('CONFIG_QOM_CAST_DEBUG', get_option('qom_cast_debug'))
@@ -3407,7 +3414,7 @@ summary_info += {'PIE': get_option('b_pie')}
summary_info += {'static build': config_host.has_key('CONFIG_STATIC')}
summary_info += {'malloc trim support': has_malloc_trim}
summary_info += {'membarrier': have_membarrier}
-summary_info += {'debug stack usage':
config_host.has_key('CONFIG_DEBUG_STACK_USAGE')}
+summary_info += {'debug stack usage': get_option('debug_stack_usage')}
summary_info += {'mutex debugging': get_option('debug_mutex')}
summary_info += {'memory allocator': get_option('malloc')}
summary_info += {'avx2 optimization': config_host_data.get('CONFIG_AVX2_OPT')}
@@ -3475,7 +3482,7 @@ summary(summary_info, bool_yn: true, section: 'Targets
and accelerators')
# Block layer
summary_info = {}
summary_info += {'coroutine backend': config_host['CONFIG_COROUTINE_BACKEND']}
-summary_info += {'coroutine pool': config_host['CONFIG_COROUTINE_POOL'] ==
'1'}
+summary_info += {'coroutine pool': have_coroutine_pool}
if have_block
summary_info += {'Block whitelist (rw)':
config_host['CONFIG_BDRV_RW_WHITELIST']}
summary_info += {'Block whitelist (ro)':
config_host['CONFIG_BDRV_RO_WHITELIST']}
diff --git a/meson_options.txt b/meson_options.txt
index 781e4d5170..03ae957102 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -246,8 +246,12 @@ option('block_drv_whitelist_in_tools', type: 'boolean',
value: false,
description: 'use block whitelist also in tools instead of only QEMU')
option('rng_none', type: 'boolean', value: false,
description: 'dummy RNG, avoid using /dev/(u)random and getrandom()')
+option('coroutine_pool', type: 'boolean', value: true,
+ description: 'coroutine freelist (better performance)')
option('debug_mutex', type: 'boolean', value: false,
description: 'mutex debugging support')
+option('debug_stack_usage', type: 'boolean', value: false,
+ description: 'measure coroutine stack usage')
option('qom_cast_debug', type: 'boolean', value: false,
description: 'cast debugging support')
option('gprof', type: 'boolean', value: false,
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index e3e5167fb9..74bc6458d4 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -8,7 +8,10 @@ meson_options_help() {
printf "%s\n" ' (choices:
auto/disabled/enabled/internal/system)'
printf "%s\n" ' --enable-cfi Control-Flow Integrity (CFI)'
printf "%s\n" ' --enable-cfi-debug Verbose errors in case of CFI
violation'
+ printf "%s\n" ' --disable-coroutine-pool coroutine freelist (better
performance)'
printf "%s\n" ' --enable-debug-mutex mutex debugging support'
+ printf "%s\n" ' --enable-debug-stack-usage'
+ printf "%s\n" ' measure coroutine stack usage'
printf "%s\n" ' --enable-fdt[=CHOICE] Whether and how to find the libfdt
library'
printf "%s\n" ' (choices:
auto/disabled/enabled/internal/system)'
printf "%s\n" ' --enable-fuzzing build fuzzing targets'
@@ -165,6 +168,8 @@ _meson_option_parse() {
--disable-cocoa) printf "%s" -Dcocoa=disabled ;;
--enable-coreaudio) printf "%s" -Dcoreaudio=enabled ;;
--disable-coreaudio) printf "%s" -Dcoreaudio=disabled ;;
+ --enable-coroutine-pool) printf "%s" -Dcoroutine_pool=true ;;
+ --disable-coroutine-pool) printf "%s" -Dcoroutine_pool=false ;;
--enable-crypto-afalg) printf "%s" -Dcrypto_afalg=enabled ;;
--disable-crypto-afalg) printf "%s" -Dcrypto_afalg=disabled ;;
--enable-curl) printf "%s" -Dcurl=enabled ;;
@@ -175,6 +180,8 @@ _meson_option_parse() {
--disable-dbus-display) printf "%s" -Ddbus_display=disabled ;;
--enable-debug-mutex) printf "%s" -Ddebug_mutex=true ;;
--disable-debug-mutex) printf "%s" -Ddebug_mutex=false ;;
+ --enable-debug-stack-usage) printf "%s" -Ddebug_stack_usage=true ;;
+ --disable-debug-stack-usage) printf "%s" -Ddebug_stack_usage=false ;;
--enable-dmg) printf "%s" -Ddmg=enabled ;;
--disable-dmg) printf "%s" -Ddmg=disabled ;;
--enable-docs) printf "%s" -Ddocs=enabled ;;
--
2.34.1
- [PATCH 03/27] configure, meson: move AVX tests to meson, (continued)
- [PATCH 03/27] configure, meson: move AVX tests to meson, Paolo Bonzini, 2022/02/03
- [PATCH 04/27] configure, meson: move membarrier test to meson, Paolo Bonzini, 2022/02/03
- [PATCH 02/27] meson: use .require() and .disable_auto_if() method for features, Paolo Bonzini, 2022/02/03
- [PATCH 05/27] configure, meson: move AF_ALG test to meson, Paolo Bonzini, 2022/02/03
- [PATCH 08/27] configure, meson: cleanup qemu-ga libraries, Paolo Bonzini, 2022/02/03
- [PATCH 11/27] meson: define qemu_cflags/qemu_ldflags, Paolo Bonzini, 2022/02/03
- [PATCH 07/27] configure, meson: move TPM check to meson, Paolo Bonzini, 2022/02/03
- [PATCH 09/27] configure, meson: move image format options to meson_options.txt, Paolo Bonzini, 2022/02/03
- [PATCH 13/27] configure, meson: move coroutine options to meson_options.txt,
Paolo Bonzini <=
- [PATCH 10/27] configure, meson: move block layer options to meson_options.txt, Paolo Bonzini, 2022/02/03
- [PATCH 14/27] configure, meson: move smbd options to meson_options.txt, Paolo Bonzini, 2022/02/03
- [PATCH 12/27] configure, meson: move some default-disabled options to meson_options.txt, Paolo Bonzini, 2022/02/03
- [PATCH 15/27] configure, meson: move guest-agent, tools to meson, Paolo Bonzini, 2022/02/03
- [PATCH 26/27] meson, configure: move ntddscsi API check to meson, Paolo Bonzini, 2022/02/03
- [PATCH 27/27] configure, meson: move CONFIG_IASL to a Meson option, Paolo Bonzini, 2022/02/03
- [PATCH 18/27] qga/vss-win32: fix midl arguments, Paolo Bonzini, 2022/02/03