On Thu, Oct 7, 2021 at 5:17 PM Paolo Bonzini <pbonz...@redhat.com> wrote:
> Cc: Stefan Hajnoczi <stefa...@redhat.com>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
>
lgtm
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> configure | 91 +--------------------------------------------
> docs/meson.build | 2 +-
> meson.build | 51 +++++++++++++++++++++----
> meson_options.txt | 6 +++
> scripts/meson.build | 2 +-
> trace/meson.build | 15 +++++---
> 6 files changed, 61 insertions(+), 106 deletions(-)
>
> diff --git a/configure b/configure
> index 98723db0cd..4bfc5e350d 100755
> --- a/configure
> +++ b/configure
> @@ -216,10 +216,6 @@ version_ge () {
> done
> }
>
> -have_backend () {
> - echo "$trace_backends" | grep "$1" >/dev/null
> -}
> -
> glob() {
> eval test -z '"${1#'"$2"'}"'
> }
> @@ -3512,56 +3508,6 @@ case "$capstone" in
> ;;
> esac
>
> -##########################################
> -# check if we have posix_syslog
> -
> -posix_syslog=no
> -cat > $TMPC << EOF
> -#include <syslog.h>
> -int main(void) { openlog("qemu", LOG_PID, LOG_DAEMON); syslog(LOG_INFO,
> "configure"); return 0; }
> -EOF
> -if compile_prog "" "" ; then
> - posix_syslog=yes
> -fi
> -
> -##########################################
> -# check if trace backend exists
> -
> -$python "$source_path/scripts/tracetool.py" "--backends=$trace_backends"
> --check-backends > /dev/null 2> /dev/null
> -if test "$?" -ne 0 ; then
> - error_exit "invalid trace backends" \
> - "Please choose supported trace backends."
> -fi
> -
> -##########################################
> -# For 'ust' backend, test if ust headers are present
> -if have_backend "ust"; then
> - if $pkg_config lttng-ust --exists; then
> - lttng_ust_libs=$($pkg_config --libs lttng-ust)
> - else
> - error_exit "Trace backend 'ust' missing lttng-ust header files"
> - fi
> -fi
> -
> -##########################################
> -# For 'dtrace' backend, test if 'dtrace' command is present
> -if have_backend "dtrace"; then
> - if ! has 'dtrace' ; then
> - error_exit "dtrace command is not found in PATH $PATH"
> - fi
> - trace_backend_stap="no"
> - if has 'stap' ; then
> - trace_backend_stap="yes"
> -
> - # Workaround to avoid dtrace(1) producing a file with 'hidden' symbol
> - # visibility. Define STAP_SDT_V2 to produce 'default' symbol
> visibility
> - # instead. QEMU --enable-modules depends on this because the SystemTap
> - # semaphores are linked into the main binary and not the module's
> shared
> - # object.
> - QEMU_CFLAGS="$QEMU_CFLAGS -DSTAP_SDT_V2"
> - fi
> -fi
> -
> ##########################################
> # check and set a backend for coroutine
>
> @@ -4572,42 +4518,6 @@ if test "$tpm" = "yes"; then
> echo 'CONFIG_TPM=y' >> $config_host_mak
> fi
>
> -echo "TRACE_BACKENDS=$trace_backends" >> $config_host_mak
> -if have_backend "nop"; then
> - echo "CONFIG_TRACE_NOP=y" >> $config_host_mak
> -fi
> -if have_backend "simple"; then
> - echo "CONFIG_TRACE_SIMPLE=y" >> $config_host_mak
> -fi
> -if have_backend "log"; then
> - echo "CONFIG_TRACE_LOG=y" >> $config_host_mak
> -fi
> -if have_backend "ust"; then
> - echo "CONFIG_TRACE_UST=y" >> $config_host_mak
> - echo "LTTNG_UST_LIBS=$lttng_ust_libs" >> $config_host_mak
> -fi
> -if have_backend "dtrace"; then
> - echo "CONFIG_TRACE_DTRACE=y" >> $config_host_mak
> - if test "$trace_backend_stap" = "yes" ; then
> - echo "CONFIG_TRACE_SYSTEMTAP=y" >> $config_host_mak
> - fi
> -fi
> -if have_backend "ftrace"; then
> - if test "$linux" = "yes" ; then
> - echo "CONFIG_TRACE_FTRACE=y" >> $config_host_mak
> - else
> - feature_not_found "ftrace(trace backend)" "ftrace requires Linux"
> - fi
> -fi
> -if have_backend "syslog"; then
> - if test "$posix_syslog" = "yes" ; then
> - echo "CONFIG_TRACE_SYSLOG=y" >> $config_host_mak
> - else
> - feature_not_found "syslog(trace backend)" "syslog not available"
> - fi
> -fi
> -echo "CONFIG_TRACE_FILE=$trace_file" >> $config_host_mak
> -
> if test "$rdma" = "yes" ; then
> echo "CONFIG_RDMA=y" >> $config_host_mak
> echo "RDMA_LIBS=$rdma_libs" >> $config_host_mak
> @@ -4990,6 +4900,7 @@ if test "$skip_meson" = no; then
> $(if test "$default_feature" = no; then echo
> "-Dauto_features=disabled"; fi) \
> -Dalsa=$alsa -Dcoreaudio=$coreaudio -Ddsound=$dsound -Djack=$jack
> -Doss=$oss \
> -Dpa=$pa -Daudio_drv_list=$audio_drv_list
> -Dtcg_interpreter=$tcg_interpreter \
> + -Dtrace_backends=$trace_backends -Dtrace_file=$trace_file \
> $cross_arg \
> "$PWD" "$source_path"
>
> diff --git a/docs/meson.build b/docs/meson.build
> index be4dc30f39..19cce670a2 100644
> --- a/docs/meson.build
> +++ b/docs/meson.build
> @@ -57,7 +57,7 @@ if build_docs
> 'qemu-nbd.8': (have_tools ? 'man8' : ''),
> 'qemu-pr-helper.8': (have_tools ? 'man8' : ''),
> 'qemu-storage-daemon.1': (have_tools ? 'man1' : ''),
> - 'qemu-trace-stap.1':
> (config_host.has_key('CONFIG_TRACE_SYSTEMTAP') ? 'man1' : ''),
> + 'qemu-trace-stap.1': (stap.found() ? 'man1' : ''),
> 'virtfs-proxy-helper.1': (have_virtfs_proxy_helper ? 'man1' : ''),
> 'virtiofsd.1': (have_virtiofsd ? 'man1' : ''),
> 'qemu.1': 'man1',
> diff --git a/meson.build b/meson.build
> index 8752b757cc..98fa4b68d9 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -111,6 +111,22 @@ foreach target : edk2_targets
> endif
> endforeach
>
> +dtrace = not_found
> +stap = not_found
> +if 'dtrace' in get_option('trace_backends')
> + dtrace = find_program('dtrace', required: true)
> + stap = find_program('stap', required: false)
> + if stap.found()
> + # Workaround to avoid dtrace(1) producing a file with 'hidden' symbol
> + # visibility. Define STAP_SDT_V2 to produce 'default' symbol
> visibility
> + # instead. QEMU --enable-modules depends on this because the SystemTap
> + # semaphores are linked into the main binary and not the module's
> shared
> + # object.
> + add_global_arguments('-DSTAP_SDT_V2',
> + native: false, language: ['c', 'cpp', 'objc'])
> + endif
> +endif
> +
> ##################
> # Compiler flags #
> ##################
> @@ -201,6 +217,19 @@ if get_option('fuzzing') and
> get_option('fuzzing_engine') == '' and \
> error('Your compiler does not support -fsanitize=fuzzer')
> endif
>
> +if 'ftrace' in get_option('trace_backends') and targetos != 'linux'
> + error('ftrace is supported only on Linux')
> +endif
> +if 'syslog' in get_option('trace_backends') and not cc.compiles('''
> + #include <syslog.h>
> + int main(void) {
> + openlog("qemu", LOG_PID, LOG_DAEMON);
> + syslog(LOG_INFO, "configure");
> + return 0;
> + }''')
> + error('syslog is not supported on this system')
> +endif
> +
> if targetos != 'linux' and get_option('mpath').enabled()
> error('Multipath is supported only on Linux')
> endif
> @@ -361,8 +390,9 @@ if 'CONFIG_GIO' in config_host
> link_args: config_host['GIO_LIBS'].split())
> endif
> lttng = not_found
> -if 'CONFIG_TRACE_UST' in config_host
> - lttng = declare_dependency(link_args:
> config_host['LTTNG_UST_LIBS'].split())
> +if 'ust' in get_option('trace_backends')
> + lttng = dependency('lttng-ust', required: true, method: 'pkg-config',
> + kwargs: static_kwargs)
> endif
> pixman = not_found
> if have_system or have_tools
> @@ -1349,6 +1379,11 @@ elif get_option('virtfs').disabled()
> have_virtfs = false
> endif
>
> +foreach k : get_option('trace_backends')
> + config_host_data.set('CONFIG_TRACE_' + k.to_upper(), true)
> +endforeach
> +config_host_data.set_quoted('CONFIG_TRACE_FILE', get_option('trace_file'))
> +
> config_host_data.set_quoted('CONFIG_BINDIR', get_option('prefix') /
> get_option('bindir'))
> config_host_data.set_quoted('CONFIG_PREFIX', get_option('prefix'))
> config_host_data.set_quoted('CONFIG_QEMU_CONFDIR', get_option('prefix') /
> qemu_confdir)
> @@ -1574,7 +1609,7 @@ config_host_data.set('HAVE_BROKEN_SIZE_MAX', not
> cc.compiles('''
>
> ignored = ['CONFIG_QEMU_INTERP_PREFIX'] # actually per-target
> arrays = ['CONFIG_BDRV_RW_WHITELIST', 'CONFIG_BDRV_RO_WHITELIST']
> -strings = ['HOST_DSOSUF', 'CONFIG_IASL', 'CONFIG_TRACE_FILE']
> +strings = ['HOST_DSOSUF', 'CONFIG_IASL']
> foreach k, v: config_host
> if ignored.contains(k)
> # do nothing
> @@ -2112,7 +2147,7 @@ qapi_gen_depends = [ meson.current_source_dir() /
> 'scripts/qapi/__init__.py',
>
> tracetool = [
> python, files('scripts/tracetool.py'),
> - '--backend=' + config_host['TRACE_BACKENDS']
> + '--backend=' + ','.join(get_option('trace_backends'))
> ]
> tracetool_depends = files(
> 'scripts/tracetool/backend/log.py',
> @@ -2831,7 +2866,7 @@ foreach target : target_dirs
> emulators += {exe['name']: emulator}
> endif
>
> - if 'CONFIG_TRACE_SYSTEMTAP' in config_host
> + if stap.found()
> foreach stp: [
> {'ext': '.stp-build', 'fmt': 'stap', 'bin':
> meson.current_build_dir() / exe['name'], 'install': false},
> {'ext': '.stp', 'fmt': 'stap', 'bin': get_option('prefix') /
> get_option('bindir') / exe['name'], 'install': true},
> @@ -3012,9 +3047,9 @@ summary_info += {'fuzzing support':
> get_option('fuzzing')}
> if have_system
> summary_info += {'Audio drivers': ' '.join(audio_drivers_selected)}
> endif
> -summary_info += {'Trace backends': config_host['TRACE_BACKENDS']}
> -if config_host['TRACE_BACKENDS'].split().contains('simple')
> - summary_info += {'Trace output file': config_host['CONFIG_TRACE_FILE']
> + '-<pid>'}
> +summary_info += {'Trace backends':
> ','.join(get_option('trace_backends'))}
> +if 'simple' in get_option('trace_backends')
> + summary_info += {'Trace output file': get_option('trace_file') +
> '-<pid>'}
> endif
> summary_info += {'QOM debugging':
> config_host.has_key('CONFIG_QOM_CAST_DEBUG')}
> summary_info += {'vhost-kernel support':
> config_host.has_key('CONFIG_VHOST_KERNEL')}
> diff --git a/meson_options.txt b/meson_options.txt
> index 100c30e967..8f9c3b5b17 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -13,6 +13,8 @@ option('audio_drv_list', type: 'array', value:
> ['default'],
> description: 'Set audio driver list')
> option('fuzzing_engine', type : 'string', value : '',
> description: 'fuzzing engine library for OSS-Fuzz')
> +option('trace_file', type: 'string', value: 'trace',
> + description: 'Trace file prefix for simple backend')
>
> option('docs', type : 'feature', value : 'auto',
> description: 'Documentations build support')
> @@ -146,6 +148,10 @@ option('fuse', type: 'feature', value: 'auto',
> option('fuse_lseek', type : 'feature', value : 'auto',
> description: 'SEEK_HOLE/SEEK_DATA support for FUSE exports')
>
> +option('trace_backends', type: 'array', value: ['log'],
> + choices: ['dtrace', 'ftrace', 'log', 'nop', 'simple', 'syslog',
> 'ust'],
> + description: 'Set available tracing backends')
> +
> option('alsa', type: 'feature', value: 'auto',
> description: 'ALSA sound support')
> option('coreaudio', type: 'feature', value: 'auto',
> diff --git a/scripts/meson.build b/scripts/meson.build
> index e8cc63896d..1c89e10a76 100644
> --- a/scripts/meson.build
> +++ b/scripts/meson.build
> @@ -1,3 +1,3 @@
> -if 'CONFIG_TRACE_SYSTEMTAP' in config_host
> +if stap.found()
> install_data('qemu-trace-stap', install_dir: get_option('bindir'))
> endif
> diff --git a/trace/meson.build b/trace/meson.build
> index b8f95de200..573dd699c6 100644
> --- a/trace/meson.build
> +++ b/trace/meson.build
> @@ -2,7 +2,6 @@
> specific_ss.add(files('control-target.c'))
>
> trace_events_files = []
> -dtrace = find_program('dtrace', required: 'CONFIG_TRACE_DTRACE' in
> config_host)
> foreach dir : [ '.' ] + trace_events_subdirs
> trace_events_file = meson.project_source_root() / dir / 'trace-events'
> trace_events_files += [ trace_events_file ]
> @@ -21,7 +20,7 @@ foreach dir : [ '.' ] + trace_events_subdirs
> input: trace_events_file,
> command: [ tracetool, group, '--format=c',
> '@INPUT@', '@OUTPUT@' ],
> depend_files: tracetool_depends)
> - if 'CONFIG_TRACE_UST' in config_host
> + if 'ust' in get_option('trace_backends')
> trace_ust_h = custom_target(fmt.format('trace-ust', 'h'),
> output: fmt.format('trace-ust', 'h'),
> input: trace_events_file,
> @@ -31,7 +30,7 @@ foreach dir : [ '.' ] + trace_events_subdirs
> genh += trace_ust_h
> endif
> trace_ss.add(trace_h, trace_c)
> - if 'CONFIG_TRACE_DTRACE' in config_host
> + if 'dtrace' in get_option('trace_backends')
> trace_dtrace = custom_target(fmt.format('trace-dtrace', 'dtrace'),
> output: fmt.format('trace-dtrace',
> 'dtrace'),
> input: trace_events_file,
> @@ -76,7 +75,7 @@ foreach d : [
> specific_ss.add(when: 'CONFIG_TCG', if_true: gen)
> endforeach
>
> -if 'CONFIG_TRACE_UST' in config_host
> +if 'ust' in get_option('trace_backends')
> trace_ust_all_h = custom_target('trace-ust-all.h',
> output: 'trace-ust-all.h',
> input: trace_events_files,
> @@ -91,7 +90,11 @@ if 'CONFIG_TRACE_UST' in config_host
> genh += trace_ust_all_h
> endif
>
> -trace_ss.add(when: 'CONFIG_TRACE_SIMPLE', if_true: files('simple.c'))
> -trace_ss.add(when: 'CONFIG_TRACE_FTRACE', if_true: files('ftrace.c'))
> +if 'simple' in get_option('trace_backends')
> + trace_ss.add(files('simple.c'))
> +endif
> +if 'ftrace' in get_option('trace_backends')
> + trace_ss.add(files('ftrace.c'))
> +endif
> trace_ss.add(files('control.c'))
> trace_ss.add(files('qmp.c'))
> --
> 2.31.1
>
>
>
>
--
Marc-André Lureau
