On Wed, Apr 20, 2022 at 7:45 PM Paolo Bonzini <pbonz...@redhat.com> wrote:
> Use the new support for string option parsing.
>
> Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
>
Reviewed-by: Marc-André Lureau <marcandre.lur...@redhat.com>
> ---
> configure | 5 -----
> meson.build | 3 ++-
> meson_options.txt | 2 ++
> scripts/meson-buildoptions.sh | 3 +++
> 4 files changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/configure b/configure
> index 8f34f2a061..3327a4887a 100755
> --- a/configure
> +++ b/configure
> @@ -311,7 +311,6 @@ bsd_user=""
> pkgversion=""
> pie=""
> coroutine=""
> -tls_priority="NORMAL"
> plugins="$default_feature"
> meson=""
> meson_args=""
> @@ -938,8 +937,6 @@ for opt do
> --enable-uuid|--disable-uuid)
> echo "$0: $opt is obsolete, UUID support is always built" >&2
> ;;
> - --tls-priority=*) tls_priority="$optarg"
> - ;;
> --disable-vhost-user) vhost_user="no"
> ;;
> --enable-vhost-user) vhost_user="yes"
> @@ -1169,7 +1166,6 @@ Advanced options (experts only):
> --with-coroutine=BACKEND coroutine backend. Supported options:
> ucontext, sigaltstack, windows
> --enable-gcov enable test coverage analysis with gcov
> - --tls-priority default TLS protocol/cipher priority string
> --enable-plugins
> enable plugins via shared library loading
> --disable-containers don't use containers for cross-building
> @@ -2200,7 +2196,6 @@ if test "$modules" = "yes"; then
> echo "CONFIG_STAMP=_$( (echo $qemu_version; echo $pkgversion; cat $0) |
> $shacmd - | cut -f1 -d\ )" >> $config_host_mak
> echo "CONFIG_MODULES=y" >> $config_host_mak
> fi
> -echo "CONFIG_TLS_PRIORITY=\"$tls_priority\"" >> $config_host_mak
>
> if test "$vhost_scsi" = "yes" ; then
> echo "CONFIG_VHOST_SCSI=y" >> $config_host_mak
> diff --git a/meson.build b/meson.build
> index ffca473fbc..8a7e4ab5c7 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -1596,6 +1596,7 @@ 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_TLS_PRIORITY',
> get_option('tls_priority'))
> if iasl.found()
> config_host_data.set_quoted('CONFIG_IASL', iasl.full_path())
> endif
> @@ -3806,7 +3807,7 @@ summary(summary_info, bool_yn: true, section: 'Block
> layer support')
>
> # Crypto
> summary_info = {}
> -summary_info += {'TLS priority': config_host['CONFIG_TLS_PRIORITY']}
> +summary_info += {'TLS priority': get_option('tls_priority')}
> summary_info += {'GNUTLS support': gnutls}
> if gnutls.found()
> summary_info += {' GNUTLS crypto': gnutls_crypto.found()}
> diff --git a/meson_options.txt b/meson_options.txt
> index 415fcc448e..891c0ec130 100644
> --- a/meson_options.txt
> +++ b/meson_options.txt
> @@ -14,6 +14,8 @@ option('sphinx_build', type : 'string', value : '',
> description: 'Use specified sphinx-build for building document')
> option('iasl', type : 'string', value : '',
> description: 'Path to ACPI disassembler')
> +option('tls_priority', type : 'string', value : 'NORMAL',
> + description: 'Default TLS protocol/cipher priority string')
> option('default_devices', type : 'boolean', value : true,
> description: 'Include a default selection of devices in emulators')
> option('audio_drv_list', type: 'array', value: ['default'],
> diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
> index 63f2f1abcf..0e0548aa87 100644
> --- a/scripts/meson-buildoptions.sh
> +++ b/scripts/meson-buildoptions.sh
> @@ -36,6 +36,8 @@ meson_options_help() {
> printf "%s\n" '
> dtrace/ftrace/log/nop/simple/syslog/ust)'
> printf "%s\n" ' --iasl=VALUE Path to ACPI disassembler'
> printf "%s\n" ' --sphinx-build=VALUE Use specified sphinx-build
> for building document'
> + printf "%s\n" ' --tls-priority=VALUE Default TLS protocol/cipher
> priority string'
> + printf "%s\n" ' [NORMAL]'
> printf "%s\n" ' --with-trace-file=VALUE Trace file prefix for simple
> backend [trace]'
> printf "%s\n" ''
> printf "%s\n" 'Optional features, enabled with --enable-FEATURE and'
> @@ -349,6 +351,7 @@ _meson_option_parse() {
> --disable-tcg) printf "%s" -Dtcg=disabled ;;
> --enable-tcg-interpreter) printf "%s" -Dtcg_interpreter=true ;;
> --disable-tcg-interpreter) printf "%s" -Dtcg_interpreter=false ;;
> + --tls-priority=*) quote_sh "-Dtls_priority=$2" ;;
> --enable-tools) printf "%s" -Dtools=enabled ;;
> --disable-tools) printf "%s" -Dtools=disabled ;;
> --enable-tpm) printf "%s" -Dtpm=enabled ;;
> --
> 2.35.1
>
>
>
>
--
Marc-André Lureau
