From 40a439bfa85915ea58446e9aeae913d5123d3b0c Mon Sep 17 00:00:00 2001
From: Vladimir Ermakov <vooon341@gmail.com>
Date: Thu, 22 May 2025 12:53:33 +0200
Subject: [PATCH] qemu: update to 10.0.0

- Update version to 10.0.0
- Update sanitizer config options names
- Add patch to fix meson cross compiler sanitiz check build

Signed-off-by: Vladimir Ermakov <vooon341@gmail.com>
---
 utils/qemu/Makefile                                    | 10 +++++++---
 .../0001-configure-allow-disable-fortify_source.patch  |  4 ++--
 ...oke-separate-applets-for-guest-shutdown-modes.patch |  2 +-
 utils/qemu/patches/0010-no-tests.patch                 |  8 ++++----
 utils/qemu/patches/0011-meson-fix.patch                | 10 ++++++++++
 5 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 utils/qemu/patches/0011-meson-fix.patch

diff --git a/utils/qemu/Makefile b/utils/qemu/Makefile
index 520f7a2d7a..cd8188a0f8 100644
--- a/utils/qemu/Makefile
+++ b/utils/qemu/Makefile
@@ -9,10 +9,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=qemu
-PKG_VERSION:=9.1.3
+PKG_VERSION:=10.0.0
 PKG_RELEASE:=1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_HASH:=480a77a0ed13a9b39415f639aa020b4eb0d7cc5a52569510dfd830b3af1bac89
+PKG_HASH:=22c075601fdcf8c7b2671a839ebdcef1d4f2973eb6735254fd2e1bd0f30b3896
 PKG_SOURCE_URL:=https://download.qemu.org/
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE tcg/LICENSE
@@ -419,7 +419,11 @@ CONFIGURE_ARGS +=			\
 	--disable-rbd			\
 	--disable-rdma			\
 	--disable-rutabaga-gfx          \
-	--disable-sanitizers		\
+	--disable-asan			\
+	--disable-tsan			\
+	--disable-ubsan			\
+	--disable-fuzzing		\
+	--disable-safe-stack		\
 	--$(if $(CONFIG_QEMU_SECCOMP),enable,disable)-seccomp		\
 	--disable-smartcard		\
 	--disable-snappy		\
diff --git a/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch b/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch
index 1843df22a2..5b178eccbb 100644
--- a/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch
+++ b/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch
@@ -11,9 +11,9 @@ OpenWrt base build system decide flavor of fortify_source to use
 
 --- a/configure
 +++ b/configure
-@@ -757,6 +757,8 @@ for opt do
+@@ -780,6 +780,8 @@ for opt do
    ;;
-   --gdb=*) gdb_bin="$optarg"
+   --disable-rust) rust=disabled
    ;;
 +  --disable-fortify-source) fortify_source="no"
 +  ;;
diff --git a/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch b/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch
index 9b1c572b4c..667bee81a8 100644
--- a/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch
+++ b/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch
@@ -3,7 +3,7 @@ https://gitlab.alpinelinux.org/alpine/aports/-/blob/b720d51ec844d4754dd5b2908435
 ---
 --- a/qga/commands-posix.c
 +++ b/qga/commands-posix.c
-@@ -219,43 +219,21 @@ void qmp_guest_shutdown(const char *mode
+@@ -218,43 +218,21 @@ void qmp_guest_shutdown(const char *mode
      const char *shutdown_flag;
      Error *local_err = NULL;
  
diff --git a/utils/qemu/patches/0010-no-tests.patch b/utils/qemu/patches/0010-no-tests.patch
index bf43c44d35..c72bbda6c9 100644
--- a/utils/qemu/patches/0010-no-tests.patch
+++ b/utils/qemu/patches/0010-no-tests.patch
@@ -1,6 +1,6 @@
 --- a/meson.build
 +++ b/meson.build
-@@ -3643,10 +3643,6 @@ subdir('common-user')
+@@ -3828,10 +3828,6 @@ subdir('common-user')
  subdir('bsd-user')
  subdir('linux-user')
  
@@ -9,9 +9,9 @@
 -subdir('tests/qtest/fuzz')
 -
  # accel modules
- tcg_real_module_ss = ss.source_set()
- tcg_real_module_ss.add_all(when: 'CONFIG_TCG_MODULAR', if_true: tcg_module_ss)
-@@ -4174,10 +4170,6 @@ subdir('scripts')
+ target_modules += { 'accel' : { 'qtest': qtest_module_ss }}
+ 
+@@ -4456,10 +4452,6 @@ subdir('scripts')
  subdir('tools')
  subdir('pc-bios')
  subdir('docs')
diff --git a/utils/qemu/patches/0011-meson-fix.patch b/utils/qemu/patches/0011-meson-fix.patch
new file mode 100644
index 0000000000..ab09e2a099
--- /dev/null
+++ b/utils/qemu/patches/0011-meson-fix.patch
@@ -0,0 +1,10 @@
+--- a/configure
++++ b/configure
+@@ -1845,6 +1845,7 @@ if test "$skip_meson" = no; then
+ 
+   echo "# Automatically generated by configure - do not modify" > $cross
+   echo "[properties]" >> $cross
++  echo "needs_exe_wrapper = true" >> $cross
+ 
+   # unroll any custom device configs
+   for a in $device_archs; do
-- 
2.30.2