configure: move --enable-debug-tcg to meson
Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
80100e267a
commit
1d558c906e
|
@ -248,7 +248,6 @@ done
|
||||||
|
|
||||||
git_submodules_action="update"
|
git_submodules_action="update"
|
||||||
git="git"
|
git="git"
|
||||||
debug_tcg="no"
|
|
||||||
docs="auto"
|
docs="auto"
|
||||||
EXESUF=""
|
EXESUF=""
|
||||||
prefix="/usr/local"
|
prefix="/usr/local"
|
||||||
|
@ -727,13 +726,9 @@ for opt do
|
||||||
# configure to be used by RPM and similar macros that set
|
# configure to be used by RPM and similar macros that set
|
||||||
# lots of directory switches by default.
|
# lots of directory switches by default.
|
||||||
;;
|
;;
|
||||||
--enable-debug-tcg) debug_tcg="yes"
|
|
||||||
;;
|
|
||||||
--disable-debug-tcg) debug_tcg="no"
|
|
||||||
;;
|
|
||||||
--enable-debug)
|
--enable-debug)
|
||||||
# Enable debugging options that aren't excessively noisy
|
# Enable debugging options that aren't excessively noisy
|
||||||
debug_tcg="yes"
|
meson_option_parse --enable-debug-tcg ""
|
||||||
meson_option_parse --enable-debug-graph-lock ""
|
meson_option_parse --enable-debug-graph-lock ""
|
||||||
meson_option_parse --enable-debug-mutex ""
|
meson_option_parse --enable-debug-mutex ""
|
||||||
meson_option_add -Doptimization=0
|
meson_option_add -Doptimization=0
|
||||||
|
@ -933,7 +928,6 @@ cat << EOF
|
||||||
linux-user all linux usermode emulation targets
|
linux-user all linux usermode emulation targets
|
||||||
bsd-user all BSD usermode emulation targets
|
bsd-user all BSD usermode emulation targets
|
||||||
pie Position Independent Executables
|
pie Position Independent Executables
|
||||||
debug-tcg TCG debugging (default is disabled)
|
|
||||||
|
|
||||||
NOTE: The object files are built at the place where configure is launched
|
NOTE: The object files are built at the place where configure is launched
|
||||||
EOF
|
EOF
|
||||||
|
@ -1684,9 +1678,6 @@ echo >> $config_host_mak
|
||||||
|
|
||||||
echo all: >> $config_host_mak
|
echo all: >> $config_host_mak
|
||||||
|
|
||||||
if test "$debug_tcg" = "yes" ; then
|
|
||||||
echo "CONFIG_DEBUG_TCG=y" >> $config_host_mak
|
|
||||||
fi
|
|
||||||
if test "$targetos" = "windows"; then
|
if test "$targetos" = "windows"; then
|
||||||
echo "CONFIG_WIN32=y" >> $config_host_mak
|
echo "CONFIG_WIN32=y" >> $config_host_mak
|
||||||
echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER-QEMU}" >> $config_host_mak
|
echo "QEMU_GA_MANUFACTURER=${QEMU_GA_MANUFACTURER-QEMU}" >> $config_host_mak
|
||||||
|
|
|
@ -2199,6 +2199,7 @@ config_host_data.set10('CONFIG_COROUTINE_POOL', have_coroutine_pool)
|
||||||
config_host_data.set('CONFIG_DEBUG_GRAPH_LOCK', get_option('debug_graph_lock'))
|
config_host_data.set('CONFIG_DEBUG_GRAPH_LOCK', get_option('debug_graph_lock'))
|
||||||
config_host_data.set('CONFIG_DEBUG_MUTEX', get_option('debug_mutex'))
|
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_DEBUG_STACK_USAGE', get_option('debug_stack_usage'))
|
||||||
|
config_host_data.set('CONFIG_DEBUG_TCG', get_option('debug_tcg'))
|
||||||
config_host_data.set('CONFIG_GPROF', get_option('gprof'))
|
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_LIVE_BLOCK_MIGRATION', get_option('live_block_migration').allowed())
|
||||||
config_host_data.set('CONFIG_QOM_CAST_DEBUG', get_option('qom_cast_debug'))
|
config_host_data.set('CONFIG_QOM_CAST_DEBUG', get_option('qom_cast_debug'))
|
||||||
|
@ -4156,7 +4157,7 @@ if config_all.has_key('CONFIG_TCG')
|
||||||
summary_info += {'TCG backend': 'native (@0@)'.format(cpu)}
|
summary_info += {'TCG backend': 'native (@0@)'.format(cpu)}
|
||||||
endif
|
endif
|
||||||
summary_info += {'TCG plugins': config_host.has_key('CONFIG_PLUGIN')}
|
summary_info += {'TCG plugins': config_host.has_key('CONFIG_PLUGIN')}
|
||||||
summary_info += {'TCG debug enabled': config_host.has_key('CONFIG_DEBUG_TCG')}
|
summary_info += {'TCG debug enabled': get_option('debug_tcg')}
|
||||||
endif
|
endif
|
||||||
summary_info += {'target list': ' '.join(target_dirs)}
|
summary_info += {'target list': ' '.join(target_dirs)}
|
||||||
if have_system
|
if have_system
|
||||||
|
|
|
@ -83,6 +83,8 @@ option('xen_pci_passthrough', type: 'feature', value: 'auto',
|
||||||
description: 'Xen PCI passthrough support')
|
description: 'Xen PCI passthrough support')
|
||||||
option('tcg', type: 'feature', value: 'enabled',
|
option('tcg', type: 'feature', value: 'enabled',
|
||||||
description: 'TCG support')
|
description: 'TCG support')
|
||||||
|
option('debug_tcg', type: 'boolean', value: false,
|
||||||
|
description: 'TCG debugging')
|
||||||
option('tcg_interpreter', type: 'boolean', value: false,
|
option('tcg_interpreter', type: 'boolean', value: false,
|
||||||
description: 'TCG with bytecode interpreter (slow)')
|
description: 'TCG with bytecode interpreter (slow)')
|
||||||
option('safe_stack', type: 'boolean', value: false,
|
option('safe_stack', type: 'boolean', value: false,
|
||||||
|
|
|
@ -29,6 +29,7 @@ meson_options_help() {
|
||||||
printf "%s\n" ' --enable-debug-mutex mutex debugging support'
|
printf "%s\n" ' --enable-debug-mutex mutex debugging support'
|
||||||
printf "%s\n" ' --enable-debug-stack-usage'
|
printf "%s\n" ' --enable-debug-stack-usage'
|
||||||
printf "%s\n" ' measure coroutine stack usage'
|
printf "%s\n" ' measure coroutine stack usage'
|
||||||
|
printf "%s\n" ' --enable-debug-tcg TCG debugging'
|
||||||
printf "%s\n" ' --enable-fdt[=CHOICE] Whether and how to find the libfdt library'
|
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" ' (choices: auto/disabled/enabled/internal/system)'
|
||||||
printf "%s\n" ' --enable-fuzzing build fuzzing targets'
|
printf "%s\n" ' --enable-fuzzing build fuzzing targets'
|
||||||
|
@ -276,6 +277,8 @@ _meson_option_parse() {
|
||||||
--disable-debug-mutex) printf "%s" -Ddebug_mutex=false ;;
|
--disable-debug-mutex) printf "%s" -Ddebug_mutex=false ;;
|
||||||
--enable-debug-stack-usage) printf "%s" -Ddebug_stack_usage=true ;;
|
--enable-debug-stack-usage) printf "%s" -Ddebug_stack_usage=true ;;
|
||||||
--disable-debug-stack-usage) printf "%s" -Ddebug_stack_usage=false ;;
|
--disable-debug-stack-usage) printf "%s" -Ddebug_stack_usage=false ;;
|
||||||
|
--enable-debug-tcg) printf "%s" -Ddebug_tcg=true ;;
|
||||||
|
--disable-debug-tcg) printf "%s" -Ddebug_tcg=false ;;
|
||||||
--enable-dmg) printf "%s" -Ddmg=enabled ;;
|
--enable-dmg) printf "%s" -Ddmg=enabled ;;
|
||||||
--disable-dmg) printf "%s" -Ddmg=disabled ;;
|
--disable-dmg) printf "%s" -Ddmg=disabled ;;
|
||||||
--docdir=*) quote_sh "-Ddocdir=$2" ;;
|
--docdir=*) quote_sh "-Ddocdir=$2" ;;
|
||||||
|
|
Loading…
Reference in New Issue