Virtualization/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu.git synced 2025-10-30 07:57:14 +08:00
Code Issues Projects Releases Wiki Activity

meson: remove 'gnutls-bug1717-workaround' for migration TLS crashes

Browse Source 
The implementation of this workaround does not currently work, so
remove the option entirely to avoid exposing it to users. The code
will remain (temporarily dormant) to be fixed in the next release
cycle.

Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Link: https://lore.kernel.org/qemu-devel/20250805182431.504158-1-berrange@redhat.com
Signed-off-by: Fabiano Rosas <farosas@suse.de>
This commit is contained in:
Daniel P. Berrangé
2025-08-05 19:24:31 +01:00
committed by Fabiano Rosas
parent a41280fd5b
commit a04ba043a3
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meson.build
View File

@ -1836,11 +1836,11 @@ if get_option('gnutls').enabled() or (get_option('gnutls').auto() and have_syste
required: get_option('gnutls'))
endif
if gnutls.found() and not get_option('gnutls-bug1717-workaround').disabled()
#if gnutls.found() and not get_option('gnutls-bug1717-workaround').disabled()
# XXX: when bug 1717 is resolved, add logic to probe for
# the GNUTLS fixed version number to handle the 'auto' case
gnutls_bug1717_workaround = true
endif
# gnutls_bug1717_workaround = true
#endif
endif
# We prefer use of gnutls for crypto, unless the options

2
meson_options.txt
View File

@ -174,8 +174,6 @@ option('libcbor', type : 'feature', value : 'auto',
description: 'libcbor support')
option('gnutls', type : 'feature', value : 'auto',
description: 'GNUTLS cryptography support')
option('gnutls-bug1717-workaround', type: 'feature', value : 'auto',
description: 'GNUTLS workaround for https://gitlab.com/gnutls/gnutls/-/issues/1717')
option('nettle', type : 'feature', value : 'auto',
description: 'nettle cryptography support')
option('gcrypt', type : 'feature', value : 'auto',

5
scripts/meson-buildoptions.sh
View File

@ -123,9 +123,6 @@ meson_options_help() {
printf "%s\n" ' gio use libgio for D-Bus support'
printf "%s\n" ' glusterfs Glusterfs block device driver'
printf "%s\n" ' gnutls GNUTLS cryptography support'
printf "%s\n" ' gnutls-bug1717-workaround'
printf "%s\n" ' GNUTLS workaround for'
printf "%s\n" ' https://gitlab.com/gnutls/gnutls/-/issues/1717'
printf "%s\n" ' gtk GTK+ user interface'
printf "%s\n" ' gtk-clipboard clipboard support for the gtk UI (EXPERIMENTAL, MAY HANG)'
printf "%s\n" ' guest-agent Build QEMU Guest Agent'
@ -334,8 +331,6 @@ _meson_option_parse() {
--disable-glusterfs) printf "%s" -Dglusterfs=disabled ;;
--enable-gnutls) printf "%s" -Dgnutls=enabled ;;
--disable-gnutls) printf "%s" -Dgnutls=disabled ;;
--enable-gnutls-bug1717-workaround) printf "%s" -Dgnutls-bug1717-workaround=enabled ;;
--disable-gnutls-bug1717-workaround) printf "%s" -Dgnutls-bug1717-workaround=disabled ;;
--enable-gtk) printf "%s" -Dgtk=enabled ;;
--disable-gtk) printf "%s" -Dgtk=disabled ;;
--enable-gtk-clipboard) printf "%s" -Dgtk_clipboard=enabled ;;