qemu: refresh patches to include git headers

Use git format-patch to be able to use git am later, to fix openwrt/openwrt#10272 .
Remove patch to skip tests as not needed anymore.
Then apply refresh.

Signed-off-by: Vladimir Ermakov <redacted>

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 5b178eccbb31ef51abda9f0e741356ae2a4de6d7..41770ed88bd42ff22ec407228c8c4f85df3d5ba1 100644 (file)
--- a/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch
+++ b/utils/qemu/patches/0001-configure-allow-disable-fortify_source.patch
@@ -1,7 +1,7 @@
-From 871bc03884e8dd4a4b50d05022e347e72f4733d9 Mon Sep 17 00:00:00 2001
+From f0ada26ef03a37aa4b8c97246b93ab3bdf1db580 Mon Sep 17 00:00:00 2001
 From: Yousong Zhou <yszhou4tech@gmail.com>
 Date: Mon, 11 May 2020 10:46:09 +0800
-Subject: [PATCH] configure: allow disable fortify_source
+Subject: [PATCH 1/4] configure: allow disable fortify_source
 
 Tell build system of qemu to not add _FORTIFY_SOURCE options and let the
 OpenWrt base build system decide flavor of fortify_source to use

diff --git a/utils/qemu/patches/0006-util-mmap-alloc-fix-missing-MAP_SYNC.patch b/utils/qemu/patches/0002-util-mmap-alloc-fix-missing-MAP_SYNC.patch
similarity index 90%
rename from utils/qemu/patches/0006-util-mmap-alloc-fix-missing-MAP_SYNC.patch
rename to utils/qemu/patches/0002-util-mmap-alloc-fix-missing-MAP_SYNC.patch
index f8bfa67c2abc7dfeec5d25e310ff4b8cd4bbc5bb..904a1cd7f942d461606fdec3e680fcb9d758b44b 100644 (file)
--- a/utils/qemu/patches/0006-util-mmap-alloc-fix-missing-MAP_SYNC.patch
+++ b/utils/qemu/patches/0002-util-mmap-alloc-fix-missing-MAP_SYNC.patch
@@ -1,7 +1,7 @@
-From e1e0a76305927290d75b4aae56f1ed89d83da741 Mon Sep 17 00:00:00 2001
+From b2cd62027dbf41c3cd5354ed1a5f73c5e26b1811 Mon Sep 17 00:00:00 2001
 From: Yousong Zhou <yszhou4tech@gmail.com>
 Date: Mon, 30 Mar 2020 12:48:58 +0800
-Subject: [PATCH] util/mmap-alloc: fix missing MAP_SYNC
+Subject: [PATCH 2/4] util/mmap-alloc: fix missing MAP_SYNC
 
 Quote musl-libc commit 9b57db3f958 ("add MAP_SYNC and
 MAP_SHARED_VALIDATE from linux v4.15")

diff --git a/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch b/utils/qemu/patches/0003-qga-invoke-separate-applets-for-guest-shutdown-modes.patch
similarity index 84%
rename from utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch
rename to utils/qemu/patches/0003-qga-invoke-separate-applets-for-guest-shutdown-modes.patch
index 667bee81a85dd5f99a2a9506f4be9507108b8b64..68128bfca836cf44c850d019b39c2ff633c31e10 100644 (file)
--- a/utils/qemu/patches/0007-qga-invoke-separate-applets-for-guest-shutdown-modes.patch
+++ b/utils/qemu/patches/0003-qga-invoke-separate-applets-for-guest-shutdown-modes.patch
@@ -1,6 +1,14 @@
+From 3e7a53edd1ffc948e1f46b3493e0c0381e437980 Mon Sep 17 00:00:00 2001
+From: Vladimir Ermakov <vooon341@gmail.com>
+Date: Tue, 27 May 2025 09:53:37 +0200
+Subject: [PATCH 3/4] qga: invoke separate applets for guest shutdown modes
+
 Origin: community/qemu: fix qemu-guest-agent patch
 https://gitlab.alpinelinux.org/alpine/aports/-/blob/b720d51ec844d4754dd5b29084350aa1f5c9a74d/community/qemu/guest-agent-shutdown.patch
 ---
+ qga/commands-posix.c | 30 ++++--------------------------
+ 1 file changed, 4 insertions(+), 26 deletions(-)
+
 --- a/qga/commands-posix.c
 +++ b/qga/commands-posix.c
 @@ -218,43 +218,21 @@ void qmp_guest_shutdown(const char *mode

diff --git a/utils/qemu/patches/0011-meson-fix.patch b/utils/qemu/patches/0004-fix-meson-cross-build-compiler-sanity-check.patch
similarity index 53%
rename from utils/qemu/patches/0011-meson-fix.patch
rename to utils/qemu/patches/0004-fix-meson-cross-build-compiler-sanity-check.patch
index ab09e2a099472fba82e322fef06ab0cf683985b9..ceee68def686b7e733b2873e9de00318ad8696a4 100644 (file)
--- a/utils/qemu/patches/0011-meson-fix.patch
+++ b/utils/qemu/patches/0004-fix-meson-cross-build-compiler-sanity-check.patch
@@ -1,3 +1,12 @@
+From a41fe59d9ed66f807f3410408699b0b0b8afea3d Mon Sep 17 00:00:00 2001
+From: Vladimir Ermakov <vooon341@gmail.com>
+Date: Tue, 27 May 2025 09:57:50 +0200
+Subject: [PATCH 4/4] fix meson cross-build compiler sanity check
+
+---
+ configure | 1 +
+ 1 file changed, 1 insertion(+)
+
 --- a/configure
 +++ b/configure
 @@ -1845,6 +1845,7 @@ if test "$skip_meson" = no; then

diff --git a/utils/qemu/patches/0010-no-tests.patch b/utils/qemu/patches/0010-no-tests.patch
deleted file mode 100644 (file)
index c72bbda..0000000
--- a/utils/qemu/patches/0010-no-tests.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -3828,10 +3828,6 @@ subdir('common-user')
- subdir('bsd-user')
- subdir('linux-user')
- 
--# needed for fuzzing binaries
--subdir('tests/qtest/libqos')
--subdir('tests/qtest/fuzz')
--
- # accel modules
- target_modules += { 'accel' : { 'qtest': qtest_module_ss }}
- 
-@@ -4456,10 +4452,6 @@ subdir('scripts')
- subdir('tools')
- subdir('pc-bios')
- subdir('docs')
--subdir('tests')
--if gtk.found()
--  subdir('po')
--endif
- 
- if host_machine.system() == 'windows'
-   nsis_cmd = [