9c8774ec77
- kvm-migration-postcopy-Spatial-locality-page-hint-for-pr.patch [RHEL-85635] - kvm-meson-configure-add-valgrind-option-en-dis-able-valg.patch [RHEL-88457] - kvm-distro-add-an-explicit-valgrind-devel-build-dep.patch [RHEL-88457] - kvm-Allow-guest-get-load-QGA-command.patch [RHEL-91219] - Resolves: RHEL-85635 (Video stuck about 1 min after switchover phase when play one video during postcopy-preempt migration) - Resolves: RHEL-88457 (qemu inadvertantly built with valgrind coroutine stack debugging on x86_64) - Resolves: RHEL-91219 ([qemu-guest-agent] Enable 'guest-get-load' by default [RHEL-10])
108 lines
4.5 KiB
Diff
108 lines
4.5 KiB
Diff
From 8227a9534bb09d202441b3e554da53815be66a28 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
|
|
Date: Fri, 25 Apr 2025 13:17:12 +0100
|
|
Subject: [PATCH 2/4] meson/configure: add 'valgrind' option & --{en,
|
|
dis}able-valgrind flag
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Daniel P. Berrangé <berrange@redhat.com>
|
|
RH-MergeRequest: 360: distro: add an explicit valgrind-devel build dep
|
|
RH-Jira: RHEL-88457
|
|
RH-Acked-by: Thomas Huth <thuth@redhat.com>
|
|
RH-Acked-by: Eric Blake <eblake@redhat.com>
|
|
RH-Commit: [1/2] 55ab738650e95ff0e951897001d9246a725ee699 (berrange/centos-src-qemu)
|
|
|
|
Currently valgrind debugging support for coroutine stacks is enabled
|
|
unconditionally when valgrind/valgrind.h is found. There is no way
|
|
to disable valgrind support if valgrind.h is present in the build env.
|
|
|
|
This is bad for distros, as an dependency far down the chain may cause
|
|
valgrind.h to become installed, inadvertently enabling QEMU's valgrind
|
|
debugging support. It also means if a distro wants valgrind support
|
|
there is no way to mandate this.
|
|
|
|
The solution is to add a 'valgrind' build feature to meson and thus
|
|
configure script.
|
|
|
|
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
|
|
Reviewed-by: Thomas Huth <thuth@redhat.com>
|
|
Message-ID: <20250425121713.1913424-1-berrange@redhat.com>
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
(cherry picked from commit 6b1c744ec0d66d6d568f9a156282153fc11a21cf)
|
|
---
|
|
meson.build | 13 ++++++++++++-
|
|
meson_options.txt | 2 ++
|
|
scripts/meson-buildoptions.sh | 3 +++
|
|
3 files changed, 17 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/meson.build b/meson.build
|
|
index 0607c1313b..dadd47d362 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -2617,7 +2617,17 @@ config_host_data.set('CONFIG_FSTRIM', qga_fstrim)
|
|
# has_header
|
|
config_host_data.set('CONFIG_EPOLL', cc.has_header('sys/epoll.h'))
|
|
config_host_data.set('CONFIG_LINUX_MAGIC_H', cc.has_header('linux/magic.h'))
|
|
-config_host_data.set('CONFIG_VALGRIND_H', cc.has_header('valgrind/valgrind.h'))
|
|
+valgrind = false
|
|
+if get_option('valgrind').allowed()
|
|
+ if cc.has_header('valgrind/valgrind.h')
|
|
+ valgrind = true
|
|
+ else
|
|
+ if get_option('valgrind').enabled()
|
|
+ error('valgrind requested but valgrind.h not found')
|
|
+ endif
|
|
+ endif
|
|
+endif
|
|
+config_host_data.set('CONFIG_VALGRIND_H', valgrind)
|
|
config_host_data.set('HAVE_BTRFS_H', cc.has_header('linux/btrfs.h'))
|
|
config_host_data.set('HAVE_DRM_H', cc.has_header('libdrm/drm.h'))
|
|
config_host_data.set('HAVE_OPENAT2_H', cc.has_header('linux/openat2.h'))
|
|
@@ -4856,6 +4866,7 @@ endif
|
|
if host_os == 'darwin'
|
|
summary_info += {'ParavirtualizedGraphics support': pvg}
|
|
endif
|
|
+summary_info += {'valgrind': valgrind}
|
|
summary(summary_info, bool_yn: true, section: 'Dependencies')
|
|
|
|
if host_arch == 'unknown'
|
|
diff --git a/meson_options.txt b/meson_options.txt
|
|
index ad6996178c..6592d9fb07 100644
|
|
--- a/meson_options.txt
|
|
+++ b/meson_options.txt
|
|
@@ -117,6 +117,8 @@ option('dbus_display', type: 'feature', value: 'auto',
|
|
description: '-display dbus support')
|
|
option('tpm', type : 'feature', value : 'auto',
|
|
description: 'TPM support')
|
|
+option('valgrind', type : 'feature', value: 'auto',
|
|
+ description: 'valgrind debug support for coroutine stacks')
|
|
|
|
# Do not enable it by default even for Mingw32, because it doesn't
|
|
# work on Wine.
|
|
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
|
|
index e9edc8a919..541e1e7a2f 100644
|
|
--- a/scripts/meson-buildoptions.sh
|
|
+++ b/scripts/meson-buildoptions.sh
|
|
@@ -199,6 +199,7 @@ meson_options_help() {
|
|
printf "%s\n" ' u2f U2F emulation support'
|
|
printf "%s\n" ' uadk UADK Library support'
|
|
printf "%s\n" ' usb-redir libusbredir support'
|
|
+ printf "%s\n" ' valgrind valgrind debug support for coroutine stacks'
|
|
printf "%s\n" ' vde vde network backend support'
|
|
printf "%s\n" ' vdi vdi image format support'
|
|
printf "%s\n" ' vduse-blk-export'
|
|
@@ -528,6 +529,8 @@ _meson_option_parse() {
|
|
--disable-ubsan) printf "%s" -Dubsan=false ;;
|
|
--enable-usb-redir) printf "%s" -Dusb_redir=enabled ;;
|
|
--disable-usb-redir) printf "%s" -Dusb_redir=disabled ;;
|
|
+ --enable-valgrind) printf "%s" -Dvalgrind=enabled ;;
|
|
+ --disable-valgrind) printf "%s" -Dvalgrind=disabled ;;
|
|
--enable-vde) printf "%s" -Dvde=enabled ;;
|
|
--disable-vde) printf "%s" -Dvde=disabled ;;
|
|
--enable-vdi) printf "%s" -Dvdi=enabled ;;
|
|
--
|
|
2.39.3
|
|
|