From patchwork Thu Feb 1 18:00:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 38629 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C238AC54E5B for ; Thu, 1 Feb 2024 18:00:18 +0000 (UTC) Received: from a27-193.smtp-out.us-west-2.amazonses.com (a27-193.smtp-out.us-west-2.amazonses.com [54.240.27.193]) by mx.groups.io with SMTP id smtpd.web11.2095.1706810405189795237 for ; Thu, 01 Feb 2024 10:00:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=DQvucNVJ; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=Smf2XOo+; spf=pass (domain: us-west-2.amazonses.com, ip: 54.240.27.193, mailfrom: 0101018d65d3f446-b1aa19ca-4ca6-4ba4-b26e-21156f04fb4c-000000@us-west-2.amazonses.com) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1706810406; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=fBYQR9/zMxNM6ybefJx1POHJM50k4bvbAoaslS0GiQw=; b=DQvucNVJWNsvVw7rBV1i8sMvF88m3Cghai/SDK3lMWJL+7sLyd2OAXwXLZVfkiEZ K0JqNg6+j4ATrs7V31g1A7PTgAYdFogbDaZKwWSWNhiGm05QnmUEYmBrQ/6UuhMD7P1 kTF9gjKVz9eP9lOJm81/dNCxNUF52br3NbFRhlp0= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1706810406; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=fBYQR9/zMxNM6ybefJx1POHJM50k4bvbAoaslS0GiQw=; b=Smf2XOo+W4usllSHngM05Zk341vFYmFAzrjOnOaPuFWf3ZUDIM9fC0grRKiFf4ZV ukgOv2vKnbBL7CFAkDFQim8afzyeM4D5FKT2pSsiXplQMiDMB4JK5jyl3KabCAPAUNt bBlcc7ghsrQ69unOBAsFzXi/tVtkP0i0/RvCLppk= MIME-Version: 1.0 From: auh@yoctoproject.org To: Richard Purdie Cc: openembedded-core@lists.openembedded.org Subject: [AUH] qemu: upgrading to 8.2.1 FAILED Message-ID: <0101018d65d3f446-b1aa19ca-4ca6-4ba4-b26e-21156f04fb4c-000000@us-west-2.amazonses.com> Date: Thu, 1 Feb 2024 18:00:05 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2024.02.01-54.240.27.193 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Thu, 01 Feb 2024 18:00:18 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/194650 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *qemu* to *8.2.1* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-qemu-upgrade-8.2.0-8.2.1.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From 97cb54e7dd8c6334f498c6181c0265cd08ee9129 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Thu, 1 Feb 2024 09:00:14 +0000 Subject: [PATCH] qemu: upgrade 8.2.0 -> 8.2.1 --- meta/recipes-devtools/qemu/qemu.inc | 3 +- ...n-environment-space-to-boot-loader-q.patch | 14 ++--- ...eplace-basename-with-g_path_get_base.patch | 50 ---------------- ...ce-use-of-lfs64-related-functions-an.patch | 60 +++++++++---------- .../0003-apic-fixup-fallthrough-to-PIC.patch | 14 ++--- ...dd-pkg-config-handling-for-libgcrypt.patch | 14 ++--- ...mu-Do-not-include-file-if-not-exists.patch | 14 ++--- ...er-space-mmap-tweaks-to-address-musl.patch | 15 +++-- .../qemu/0007-qemu-Determinism-fixes.patch | 14 ++--- ...d-use-relative-path-to-refer-to-file.patch | 16 ++--- ...and-MAP_SHARED_VALIDATE-on-needed-li.patch | 12 ++-- ...t-against-buggy-or-malicious-guest-d.patch | 21 +++---- .../recipes-devtools/qemu/qemu/fix_segv.patch | 19 ++++-- .../qemu/qemu/fixedmeson.patch | 17 ++++-- meta/recipes-devtools/qemu/qemu/no-pip.patch | 17 ++++-- .../qemu/{qemu_8.2.0.bb => qemu_8.2.1.bb} | 0 16 files changed, 136 insertions(+), 164 deletions(-) delete mode 100644 meta/recipes-devtools/qemu/qemu/0001-vfio-container-Replace-basename-with-g_path_get_base.patch rename meta/recipes-devtools/qemu/{qemu_8.2.0.bb => qemu_8.2.1.bb} (100%) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index bc6ce0bb38..78ac04a688 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -32,7 +32,6 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \ file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \ file://fixedmeson.patch \ - file://0001-vfio-container-Replace-basename-with-g_path_get_base.patch \ file://no-pip.patch \ file://fix_segv.patch \ file://qemu-guest-agent.init \ @@ -41,7 +40,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[sha256sum] = "bf00d2fa12010df8b0ade93371def58e632cb32a6bfdc5f5a0ff8e6a1fb1bf32" +SRC_URI[sha256sum] = "8562751158175f9d187c5f22b57555abe3c870f0325c8ced12c34c6d987729be" CVE_STATUS[CVE-2017-5957] = "cpe-incorrect: Applies against virglrender < 0.6.0 and not qemu itself" diff --git a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch index c65508017d..9e91254705 100644 --- a/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch +++ b/meta/recipes-devtools/qemu/qemu/0001-qemu-Add-addition-environment-space-to-boot-loader-q.patch @@ -1,7 +1,7 @@ -From de64af82950a6908f9407dfc92b83c17e2af3eab Mon Sep 17 00:00:00 2001 +From 24f01654900dd47b5a86ab24dc329e85f9e242dd Mon Sep 17 00:00:00 2001 From: Jason Wessel Date: Fri, 28 Mar 2014 17:42:43 +0800 -Subject: [PATCH 01/12] qemu: Add addition environment space to boot loader +Subject: [PATCH] qemu: Add addition environment space to boot loader qemu-system-mips Upstream-Status: Inappropriate - OE uses deep paths @@ -18,11 +18,11 @@ Signed-off-by: Roy Li hw/mips/malta.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: qemu-8.0.0/hw/mips/malta.c -=================================================================== ---- qemu-8.0.0.orig/hw/mips/malta.c -+++ qemu-8.0.0/hw/mips/malta.c -@@ -64,7 +64,7 @@ +diff --git a/hw/mips/malta.c b/hw/mips/malta.c +index 049de46a9..5cb71d600 100644 +--- a/hw/mips/malta.c ++++ b/hw/mips/malta.c +@@ -63,7 +63,7 @@ #define ENVP_PADDR 0x2000 #define ENVP_VADDR cpu_mips_phys_to_kseg0(NULL, ENVP_PADDR) #define ENVP_NB_ENTRIES 16 diff --git a/meta/recipes-devtools/qemu/qemu/0001-vfio-container-Replace-basename-with-g_path_get_base.patch b/meta/recipes-devtools/qemu/qemu/0001-vfio-container-Replace-basename-with-g_path_get_base.patch deleted file mode 100644 index ad4f410178..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0001-vfio-container-Replace-basename-with-g_path_get_base.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 213ae3ffda463c0503e39e0cf827511b5298c314 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= -Date: Wed, 20 Dec 2023 14:53:02 +0100 -Subject: [PATCH] vfio/container: Replace basename with g_path_get_basename -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -g_path_get_basename() is a portable utility function that has the -advantage of not modifing the string argument. It also fixes a compile -breakage with the Musl C library reported in [1]. - -[1] https://lore.kernel.org/all/20231212010228.2701544-1-raj.khem@gmail.com/ - -Upstream-Status: Backport [https://github.com/qemu/qemu/commit/213ae3ffda463c0503e39e0cf827511b5298c314] -Reported-by: Khem Raj -Reviewed-by: Eric Auger -Reviewed-by: Zhao Liu -Reviewed-by: Zhenzhong Duan -Signed-off-by: Cédric Le Goater ---- - hw/vfio/container.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/hw/vfio/container.c b/hw/vfio/container.c -index 688cf23bab..8d334f52f2 100644 ---- a/hw/vfio/container.c -+++ b/hw/vfio/container.c -@@ -869,7 +869,8 @@ static void vfio_put_base_device(VFIODevice *vbasedev) - - static int vfio_device_groupid(VFIODevice *vbasedev, Error **errp) - { -- char *tmp, group_path[PATH_MAX], *group_name; -+ char *tmp, group_path[PATH_MAX]; -+ g_autofree char *group_name = NULL; - int ret, groupid; - ssize_t len; - -@@ -885,7 +886,7 @@ static int vfio_device_groupid(VFIODevice *vbasedev, Error **errp) - - group_path[len] = 0; - -- group_name = basename(group_path); -+ group_name = g_path_get_basename(group_path); - if (sscanf(group_name, "%d", &groupid) != 1) { - error_setg_errno(errp, errno, "failed to read %s", group_path); - return -errno; --- -2.43.0 - diff --git a/meta/recipes-devtools/qemu/qemu/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch b/meta/recipes-devtools/qemu/qemu/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch index ceae67be64..8cb0668f2c 100644 --- a/meta/recipes-devtools/qemu/qemu/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch +++ b/meta/recipes-devtools/qemu/qemu/0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch @@ -1,8 +1,7 @@ -From 71f14902256e3c3529710b713e1ea43100bf4c40 Mon Sep 17 00:00:00 2001 +From 712e40813a005e1ad76997ad0ff01b41eb5ac80d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 17 Dec 2022 08:37:46 -0800 -Subject: [PATCH 2/2] linux-user: Replace use of lfs64 related functions and - macros +Subject: [PATCH] linux-user: Replace use of lfs64 related functions and macros Builds defines -D_FILE_OFFSET_BITS=64 which makes the original functions anf macros behave same as their 64 suffixed counterparts. This also @@ -12,15 +11,16 @@ functions are no more available under _GNU_SOURCE feature macro Upstream-Status: Submitted [https://lists.gnu.org/archive/html/qemu-devel/2022-12/msg02841.html] Signed-off-by: Khem Raj Cc: Laurent Vivier + --- linux-user/syscall.c | 153 +++++++++++-------------------------------- 1 file changed, 39 insertions(+), 114 deletions(-) -Index: qemu-8.0.0/linux-user/syscall.c -=================================================================== ---- qemu-8.0.0.orig/linux-user/syscall.c -+++ qemu-8.0.0/linux-user/syscall.c -@@ -761,8 +761,8 @@ safe_syscall6(ssize_t, copy_file_range, +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 02374f84f..668019af5 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -761,8 +761,8 @@ safe_syscall6(ssize_t, copy_file_range, int, infd, loff_t *, pinoff, */ #define safe_ioctl(...) safe_syscall(__NR_ioctl, __VA_ARGS__) /* Similarly for fcntl. Note that callers must always: @@ -31,7 +31,7 @@ Index: qemu-8.0.0/linux-user/syscall.c * This will then work and use a 64-bit offset for both 32-bit and 64-bit hosts. */ #ifdef __NR_fcntl64 -@@ -6813,13 +6813,13 @@ static int target_to_host_fcntl_cmd(int +@@ -6727,13 +6727,13 @@ static int target_to_host_fcntl_cmd(int cmd) ret = cmd; break; case TARGET_F_GETLK: @@ -48,7 +48,7 @@ Index: qemu-8.0.0/linux-user/syscall.c break; case TARGET_F_GETOWN: ret = F_GETOWN; -@@ -6833,17 +6833,6 @@ static int target_to_host_fcntl_cmd(int +@@ -6747,17 +6747,6 @@ static int target_to_host_fcntl_cmd(int cmd) case TARGET_F_SETSIG: ret = F_SETSIG; break; @@ -66,7 +66,7 @@ Index: qemu-8.0.0/linux-user/syscall.c case TARGET_F_SETLEASE: ret = F_SETLEASE; break; -@@ -6895,8 +6884,8 @@ static int target_to_host_fcntl_cmd(int +@@ -6809,8 +6798,8 @@ static int target_to_host_fcntl_cmd(int cmd) * them to 5, 6 and 7 before making the syscall(). Since we make the * syscall directly, adjust to what is supported by the kernel. */ @@ -77,7 +77,7 @@ Index: qemu-8.0.0/linux-user/syscall.c } #endif -@@ -6929,55 +6918,11 @@ static int host_to_target_flock(int type +@@ -6843,55 +6832,11 @@ static int host_to_target_flock(int type) return type; } @@ -136,7 +136,7 @@ Index: qemu-8.0.0/linux-user/syscall.c abi_short l_type; abi_short l_whence; abi_llong l_start; -@@ -6985,10 +6930,10 @@ struct target_oabi_flock64 { +@@ -6899,10 +6844,10 @@ struct target_oabi_flock64 { abi_int l_pid; } QEMU_PACKED; @@ -149,7 +149,7 @@ Index: qemu-8.0.0/linux-user/syscall.c int l_type; if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) { -@@ -7009,10 +6954,10 @@ static inline abi_long copy_from_user_oa +@@ -6923,10 +6868,10 @@ static inline abi_long copy_from_user_oabi_flock64(struct flock64 *fl, return 0; } @@ -163,7 +163,7 @@ Index: qemu-8.0.0/linux-user/syscall.c short l_type; if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) { -@@ -7030,10 +6975,10 @@ static inline abi_long copy_to_user_oabi +@@ -6944,10 +6889,10 @@ static inline abi_long copy_to_user_oabi_flock64(abi_ulong target_flock_addr, } #endif @@ -176,7 +176,7 @@ Index: qemu-8.0.0/linux-user/syscall.c int l_type; if (!lock_user_struct(VERIFY_READ, target_fl, target_flock_addr, 1)) { -@@ -7054,10 +6999,10 @@ static inline abi_long copy_from_user_fl +@@ -6968,10 +6913,10 @@ static inline abi_long copy_from_user_flock64(struct flock64 *fl, return 0; } @@ -190,7 +190,7 @@ Index: qemu-8.0.0/linux-user/syscall.c short l_type; if (!lock_user_struct(VERIFY_WRITE, target_fl, target_flock_addr, 0)) { -@@ -7076,7 +7021,7 @@ static inline abi_long copy_to_user_floc +@@ -6990,7 +6935,7 @@ static inline abi_long copy_to_user_flock64(abi_ulong target_flock_addr, static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) { @@ -199,7 +199,7 @@ Index: qemu-8.0.0/linux-user/syscall.c #ifdef F_GETOWN_EX struct f_owner_ex fox; struct target_f_owner_ex *target_fox; -@@ -7089,6 +7034,7 @@ static abi_long do_fcntl(int fd, int cmd +@@ -7003,6 +6948,7 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) switch(cmd) { case TARGET_F_GETLK: @@ -207,7 +207,7 @@ Index: qemu-8.0.0/linux-user/syscall.c ret = copy_from_user_flock(&fl64, arg); if (ret) { return ret; -@@ -7098,32 +7044,11 @@ static abi_long do_fcntl(int fd, int cmd +@@ -7012,32 +6958,11 @@ static abi_long do_fcntl(int fd, int cmd, abi_ulong arg) ret = copy_to_user_flock(arg, &fl64); } break; @@ -241,7 +241,7 @@ Index: qemu-8.0.0/linux-user/syscall.c if (ret) { return ret; } -@@ -7348,7 +7273,7 @@ static inline abi_long target_truncate64 +@@ -7266,7 +7191,7 @@ static inline abi_long target_truncate64(CPUArchState *cpu_env, const char *arg1 arg2 = arg3; arg3 = arg4; } @@ -250,7 +250,7 @@ Index: qemu-8.0.0/linux-user/syscall.c } #endif -@@ -7362,7 +7287,7 @@ static inline abi_long target_ftruncate6 +@@ -7280,7 +7205,7 @@ static inline abi_long target_ftruncate64(CPUArchState *cpu_env, abi_long arg1, arg2 = arg3; arg3 = arg4; } @@ -259,7 +259,7 @@ Index: qemu-8.0.0/linux-user/syscall.c } #endif -@@ -8598,7 +8523,7 @@ static int do_getdents(abi_long dirfd, a +@@ -8639,7 +8564,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count) void *tdirp; int hlen, hoff, toff; int hreclen, treclen; @@ -268,7 +268,7 @@ Index: qemu-8.0.0/linux-user/syscall.c hdirp = g_try_malloc(count); if (!hdirp) { -@@ -8651,7 +8576,7 @@ static int do_getdents(abi_long dirfd, a +@@ -8692,7 +8617,7 @@ static int do_getdents(abi_long dirfd, abi_long arg2, abi_long count) * Return what we have, resetting the file pointer to the * location of the first record not returned. */ @@ -277,7 +277,7 @@ Index: qemu-8.0.0/linux-user/syscall.c break; } -@@ -8685,7 +8610,7 @@ static int do_getdents64(abi_long dirfd, +@@ -8726,7 +8651,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count) void *tdirp; int hlen, hoff, toff; int hreclen, treclen; @@ -286,7 +286,7 @@ Index: qemu-8.0.0/linux-user/syscall.c hdirp = g_try_malloc(count); if (!hdirp) { -@@ -8727,7 +8652,7 @@ static int do_getdents64(abi_long dirfd, +@@ -8768,7 +8693,7 @@ static int do_getdents64(abi_long dirfd, abi_long arg2, abi_long count) * Return what we have, resetting the file pointer to the * location of the first record not returned. */ @@ -295,7 +295,7 @@ Index: qemu-8.0.0/linux-user/syscall.c break; } -@@ -11158,7 +11083,7 @@ static abi_long do_syscall1(CPUArchState +@@ -11399,7 +11324,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, return -TARGET_EFAULT; } } @@ -304,7 +304,7 @@ Index: qemu-8.0.0/linux-user/syscall.c unlock_user(p, arg2, ret); return ret; case TARGET_NR_pwrite64: -@@ -11175,7 +11100,7 @@ static abi_long do_syscall1(CPUArchState +@@ -11416,7 +11341,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, return -TARGET_EFAULT; } } @@ -313,7 +313,7 @@ Index: qemu-8.0.0/linux-user/syscall.c unlock_user(p, arg2, 0); return ret; #endif -@@ -11998,14 +11923,14 @@ static abi_long do_syscall1(CPUArchState +@@ -12276,14 +12201,14 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, case TARGET_NR_fcntl64: { int cmd; @@ -333,7 +333,7 @@ Index: qemu-8.0.0/linux-user/syscall.c } #endif -@@ -12015,7 +11940,7 @@ static abi_long do_syscall1(CPUArchState +@@ -12293,7 +12218,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, } switch(arg2) { @@ -342,7 +342,7 @@ Index: qemu-8.0.0/linux-user/syscall.c ret = copyfrom(&fl, arg3); if (ret) { break; -@@ -12026,8 +11951,8 @@ static abi_long do_syscall1(CPUArchState +@@ -12304,8 +12229,8 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, } break; diff --git a/meta/recipes-devtools/qemu/qemu/0003-apic-fixup-fallthrough-to-PIC.patch b/meta/recipes-devtools/qemu/qemu/0003-apic-fixup-fallthrough-to-PIC.patch index e85f8202e9..11441fb5f4 100644 --- a/meta/recipes-devtools/qemu/qemu/0003-apic-fixup-fallthrough-to-PIC.patch +++ b/meta/recipes-devtools/qemu/qemu/0003-apic-fixup-fallthrough-to-PIC.patch @@ -1,7 +1,7 @@ -From dc2a8ccd440ee3741b61606eafed3f7e092f4312 Mon Sep 17 00:00:00 2001 +From 08736954dfa6ba6dbba858c376fd1f421db18688 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Tue, 26 Feb 2013 11:43:28 -0500 -Subject: [PATCH 03/12] apic: fixup fallthrough to PIC +Subject: [PATCH] apic: fixup fallthrough to PIC Commit 0e21e12bb311c4c1095d0269dc2ef81196ccb60a [Don't route PIC interrupts through the local APIC if the local APIC config says so.] @@ -29,11 +29,11 @@ Signed-off-by: He Zhe hw/intc/apic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: qemu-8.0.0/hw/intc/apic.c -=================================================================== ---- qemu-8.0.0.orig/hw/intc/apic.c -+++ qemu-8.0.0/hw/intc/apic.c -@@ -607,7 +607,7 @@ int apic_accept_pic_intr(DeviceState *de +diff --git a/hw/intc/apic.c b/hw/intc/apic.c +index ac3d47d23..8978af6ab 100644 +--- a/hw/intc/apic.c ++++ b/hw/intc/apic.c +@@ -607,7 +607,7 @@ int apic_accept_pic_intr(DeviceState *dev) APICCommonState *s = APIC(dev); uint32_t lvt0; diff --git a/meta/recipes-devtools/qemu/qemu/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch b/meta/recipes-devtools/qemu/qemu/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch index f981a64a54..dd6177fdb1 100644 --- a/meta/recipes-devtools/qemu/qemu/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch +++ b/meta/recipes-devtools/qemu/qemu/0004-configure-Add-pkg-config-handling-for-libgcrypt.patch @@ -1,7 +1,7 @@ -From d8265abdce5dc2bf74b3fccdf2b7257b4f3894f0 Mon Sep 17 00:00:00 2001 +From 13d3a64a7ba33e32b9106bc476d738af33e02765 Mon Sep 17 00:00:00 2001 From: He Zhe Date: Wed, 28 Aug 2019 19:56:28 +0800 -Subject: [PATCH 04/12] configure: Add pkg-config handling for libgcrypt +Subject: [PATCH] configure: Add pkg-config handling for libgcrypt libgcrypt may also be controlled by pkg-config, this patch adds pkg-config handling for libgcrypt. @@ -14,11 +14,11 @@ Signed-off-by: He Zhe meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: qemu-8.1.0/meson.build -=================================================================== ---- qemu-8.1.0.orig/meson.build -+++ qemu-8.1.0/meson.build -@@ -1481,7 +1481,7 @@ endif +diff --git a/meson.build b/meson.build +index 6c77d9687..2e3235c92 100644 +--- a/meson.build ++++ b/meson.build +@@ -1497,7 +1497,7 @@ endif if not gnutls_crypto.found() if (not get_option('gcrypt').auto() or have_system) and not get_option('nettle').enabled() gcrypt = dependency('libgcrypt', version: '>=1.8', diff --git a/meta/recipes-devtools/qemu/qemu/0005-qemu-Do-not-include-file-if-not-exists.patch b/meta/recipes-devtools/qemu/qemu/0005-qemu-Do-not-include-file-if-not-exists.patch index 38aa4c3bbe..a36e8a32dc 100644 --- a/meta/recipes-devtools/qemu/qemu/0005-qemu-Do-not-include-file-if-not-exists.patch +++ b/meta/recipes-devtools/qemu/qemu/0005-qemu-Do-not-include-file-if-not-exists.patch @@ -1,7 +1,7 @@ -From f39e7bfc5ed07b5ecaeb705c4eae4855ca120d47 Mon Sep 17 00:00:00 2001 +From 7280bbe0ce6f4b8960150f382a74b6187ac16410 Mon Sep 17 00:00:00 2001 From: Oleksiy Obitotskyy Date: Wed, 25 Mar 2020 21:21:35 +0200 -Subject: [PATCH 05/12] qemu: Do not include file if not exists +Subject: [PATCH] qemu: Do not include file if not exists Script configure checks for if_alg.h and check failed but if_alg.h still included. @@ -16,11 +16,11 @@ Signed-off-by: Sakib Sajal linux-user/syscall.c | 2 ++ 1 file changed, 2 insertions(+) -Index: qemu-8.0.0/linux-user/syscall.c -=================================================================== ---- qemu-8.0.0.orig/linux-user/syscall.c -+++ qemu-8.0.0/linux-user/syscall.c -@@ -115,7 +115,9 @@ +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index e384e1424..02374f84f 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -116,7 +116,9 @@ #include #include #include diff --git a/meta/recipes-devtools/qemu/qemu/0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch b/meta/recipes-devtools/qemu/qemu/0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch index 5d1d7c6881..6aaaee1716 100644 --- a/meta/recipes-devtools/qemu/qemu/0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch +++ b/meta/recipes-devtools/qemu/qemu/0006-qemu-Add-some-user-space-mmap-tweaks-to-address-musl.patch @@ -1,8 +1,7 @@ -From 375cae3dd6151ef33cae8f243f6a2c2da6c0c356 Mon Sep 17 00:00:00 2001 +From fe32dab8e292094cafe919bc389131f9647da80b Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 8 Jan 2021 17:27:06 +0000 -Subject: [PATCH 06/12] qemu: Add some user space mmap tweaks to address musl - 32 bit +Subject: [PATCH] qemu: Add some user space mmap tweaks to address musl 32 bit When using qemu-i386 to build qemux86 webkitgtk on musl, it sits in an infinite loop of mremap calls of ever decreasing/increasing addresses. @@ -23,11 +22,11 @@ Signed-off-by: Richard Purdie Date: Mon, 1 Mar 2021 13:00:47 +0000 -Subject: [PATCH 07/12] qemu: Determinism fixes +Subject: [PATCH] qemu: Determinism fixes When sources are included within debug information, a couple of areas of the qemu build are not reproducible due to either full buildpaths or timestamps. @@ -16,11 +16,11 @@ RP 2021/3/1 scripts/decodetree.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -Index: qemu-8.0.0/scripts/decodetree.py -=================================================================== ---- qemu-8.0.0.orig/scripts/decodetree.py -+++ qemu-8.0.0/scripts/decodetree.py -@@ -1328,7 +1328,7 @@ def main(): +diff --git a/scripts/decodetree.py b/scripts/decodetree.py +index e8b72da3a..5cd86b142 100644 +--- a/scripts/decodetree.py ++++ b/scripts/decodetree.py +@@ -1558,7 +1558,7 @@ def main(): toppat = ExcMultiPattern(0) for filename in args: diff --git a/meta/recipes-devtools/qemu/qemu/0008-tests-meson.build-use-relative-path-to-refer-to-file.patch b/meta/recipes-devtools/qemu/qemu/0008-tests-meson.build-use-relative-path-to-refer-to-file.patch index a84364ccc1..140f112e34 100644 --- a/meta/recipes-devtools/qemu/qemu/0008-tests-meson.build-use-relative-path-to-refer-to-file.patch +++ b/meta/recipes-devtools/qemu/qemu/0008-tests-meson.build-use-relative-path-to-refer-to-file.patch @@ -1,7 +1,7 @@ -From 2bf9388b801d4389e2d57e95a7897bfc1c42786e Mon Sep 17 00:00:00 2001 +From 69f65525e1f3a49614512d1b3839b4e0df05fc74 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 14 Jan 2021 06:33:04 +0000 -Subject: [PATCH 08/12] tests/meson.build: use relative path to refer to files +Subject: [PATCH] tests/meson.build: use relative path to refer to files Fix error like: Fatal error: can't create tests/ptimer-test.p/..._qemu-5.2.0_hw_core_ptimer.c.o: File name too long @@ -17,11 +17,11 @@ Signed-off-by: Changqing Li tests/unit/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -Index: qemu-8.0.0/tests/unit/meson.build -=================================================================== ---- qemu-8.0.0.orig/tests/unit/meson.build -+++ qemu-8.0.0/tests/unit/meson.build -@@ -46,7 +46,7 @@ tests = { +diff --git a/tests/unit/meson.build b/tests/unit/meson.build +index a05d47109..f258c7cbd 100644 +--- a/tests/unit/meson.build ++++ b/tests/unit/meson.build +@@ -47,7 +47,7 @@ tests = { 'test-keyval': [testqapi], 'test-logging': [], 'test-uuid': [], @@ -30,7 +30,7 @@ Index: qemu-8.0.0/tests/unit/meson.build 'test-qapi-util': [], 'test-interval-tree': [], 'test-xs-node': [qom], -@@ -136,7 +136,7 @@ if have_system +@@ -138,7 +138,7 @@ if have_system 'test-util-sockets': ['socket-helpers.c'], 'test-base64': [], 'test-bufferiszero': [], diff --git a/meta/recipes-devtools/qemu/qemu/0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch b/meta/recipes-devtools/qemu/qemu/0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch index 4de6cc2445..61e7542702 100644 --- a/meta/recipes-devtools/qemu/qemu/0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch +++ b/meta/recipes-devtools/qemu/qemu/0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch @@ -1,7 +1,7 @@ -From ebf4bb2f51da83af0c61480414cfa156f7308b34 Mon Sep 17 00:00:00 2001 +From f186705fb6c50d425401d687331d2e01db5d6c97 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 21 Mar 2022 10:09:38 -0700 -Subject: [PATCH 09/12] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux +Subject: [PATCH] Define MAP_SYNC and MAP_SHARED_VALIDATE on needed linux systems linux only wires MAP_SYNC and MAP_SHARED_VALIDATE for architectures @@ -18,10 +18,10 @@ Cc: Michael S. Tsirkin util/mmap-alloc.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) -Index: qemu-8.0.0/util/mmap-alloc.c -=================================================================== ---- qemu-8.0.0.orig/util/mmap-alloc.c -+++ qemu-8.0.0/util/mmap-alloc.c +diff --git a/util/mmap-alloc.c b/util/mmap-alloc.c +index ed14f9c64..038f5b4b5 100644 +--- a/util/mmap-alloc.c ++++ b/util/mmap-alloc.c @@ -10,14 +10,18 @@ * later. See the COPYING file in the top-level directory. */ diff --git a/meta/recipes-devtools/qemu/qemu/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch b/meta/recipes-devtools/qemu/qemu/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch index 6caf35b634..f5c75b0ebb 100644 --- a/meta/recipes-devtools/qemu/qemu/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch +++ b/meta/recipes-devtools/qemu/qemu/0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch @@ -1,12 +1,12 @@ -CVE: CVE-2022-1050 -Upstream-Status: Submitted [https://lore.kernel.org/qemu-devel/20220403095234.2210-1-yuval.shaia.ml@gmail.com/] -Signed-off-by: Ross Burton - -From dbdef95c272e8f3ec037c3db4197c66002e30995 Mon Sep 17 00:00:00 2001 +From 160b67a41f2012adc4faae203974a34179ae77e4 Mon Sep 17 00:00:00 2001 From: Yuval Shaia Date: Sun, 3 Apr 2022 12:52:34 +0300 Subject: [PATCH] hw/pvrdma: Protect against buggy or malicious guest driver +CVE: CVE-2022-1050 +Upstream-Status: Submitted [https://lore.kernel.org/qemu-devel/20220403095234.2210-1-yuval.shaia.ml@gmail.com/] +Signed-off-by: Ross Burton + Guest driver might execute HW commands when shared buffers are not yet allocated. This could happen on purpose (malicious guest) or because of some other @@ -17,15 +17,16 @@ Fixes: CVE-2022-1050 Reported-by: Raven Signed-off-by: Yuval Shaia + --- hw/rdma/vmw/pvrdma_cmd.c | 6 ++++++ 1 file changed, 6 insertions(+) -Index: qemu-8.0.0/hw/rdma/vmw/pvrdma_cmd.c -=================================================================== ---- qemu-8.0.0.orig/hw/rdma/vmw/pvrdma_cmd.c -+++ qemu-8.0.0/hw/rdma/vmw/pvrdma_cmd.c -@@ -782,6 +782,12 @@ int pvrdma_exec_cmd(PVRDMADev *dev) +diff --git a/hw/rdma/vmw/pvrdma_cmd.c b/hw/rdma/vmw/pvrdma_cmd.c +index d385d18d9..116adddec 100644 +--- a/hw/rdma/vmw/pvrdma_cmd.c ++++ b/hw/rdma/vmw/pvrdma_cmd.c +@@ -786,6 +786,12 @@ int pvrdma_exec_cmd(PVRDMADev *dev) goto out; } diff --git a/meta/recipes-devtools/qemu/qemu/fix_segv.patch b/meta/recipes-devtools/qemu/qemu/fix_segv.patch index da5ae87e0c..2bc352101f 100644 --- a/meta/recipes-devtools/qemu/qemu/fix_segv.patch +++ b/meta/recipes-devtools/qemu/qemu/fix_segv.patch @@ -1,3 +1,8 @@ +From 5146526ece498eb7d0a47bbe5b26ec40c767c874 Mon Sep 17 00:00:00 2001 +From: Richard Henderson +Date: Tue, 8 Aug 2023 20:02:19 -0700 +Subject: [PATCH] qemu: Fix segfaults in webkitgtk:do_compile on debian11 + With qemu 8.2.0 we started seeing SEGV errors when compiling webkitgtk from usermode qemu: @@ -7,16 +12,14 @@ Segmentation fault By bisection, this was tracked down to: commit 7b7a3366e142d3baeb3fd1d3660a50e7956c19eb -Author: Richard Henderson -Date: Tue Aug 8 20:02:19 2023 -0700 linux-user: Use walk_memory_regions for open_self_maps - + Replace the by-hand method of region identification with the official user-exec interface. Cross-check the region provided to the callback with the interval tree from read_self_maps(). - + Tested-by: Helge Deller Reviewed-by: Ilya Leoshkevich Signed-off-by: Richard Henderson @@ -31,11 +34,15 @@ YOCTO #15367 Signed-off-by: Richard Purdie Upstream-Status: Pending +--- + linux-user/syscall.c | 3 +++ + 1 file changed, 3 insertions(+) + diff --git a/linux-user/syscall.c b/linux-user/syscall.c -index e384e14248..2577fb770d 100644 +index 668019af5..c461d3b99 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c -@@ -8085,6 +8085,9 @@ static int open_self_maps_2(void *opaque, target_ulong guest_start, +@@ -8012,6 +8012,9 @@ static int open_self_maps_2(void *opaque, target_ulong guest_start, while (1) { IntervalTreeNode *n = interval_tree_iter_first(d->host_maps, host_start, host_start); diff --git a/meta/recipes-devtools/qemu/qemu/fixedmeson.patch b/meta/recipes-devtools/qemu/qemu/fixedmeson.patch index 9047f66dc3..b5d54afefa 100644 --- a/meta/recipes-devtools/qemu/qemu/fixedmeson.patch +++ b/meta/recipes-devtools/qemu/qemu/fixedmeson.patch @@ -1,9 +1,18 @@ +From e237d80802d52030afddd2b1ec57394ff24acd7c Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Thu, 24 Aug 2023 16:41:20 +0100 +Subject: [PATCH] qemu: Upgrade 8.0.4 -> 8.1.0 + Upstream-Status: Inappropriate [workaround, would need a real fix for upstream] -Index: qemu-8.2.0/configure -=================================================================== ---- qemu-8.2.0.orig/configure -+++ qemu-8.2.0/configure +--- + configure | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/configure b/configure +index d7e0926ff..e98ecd25f 100755 +--- a/configure ++++ b/configure @@ -955,12 +955,7 @@ fi $mkvenv ensuregroup --dir "${source_path}/python/wheels" \ ${source_path}/pythondeps.toml meson || exit 1 diff --git a/meta/recipes-devtools/qemu/qemu/no-pip.patch b/meta/recipes-devtools/qemu/qemu/no-pip.patch index 92b2edbe9f..fc69af9ffc 100644 --- a/meta/recipes-devtools/qemu/qemu/no-pip.patch +++ b/meta/recipes-devtools/qemu/qemu/no-pip.patch @@ -1,4 +1,7 @@ -qemu: Ensure pip and the python venv aren't used for meson +From 65ac7848f679980f19015a0bd2977ef357735d41 Mon Sep 17 00:00:00 2001 +From: Richard Purdie +Date: Tue, 19 Dec 2023 21:24:57 +0000 +Subject: [PATCH] qemu: Ensure pip and the python venv aren't used for meson Qemu wants to use a supported python version and a specific meson version to "help" users and uses pip and creates a venv to do this. This is a nightmare @@ -22,10 +25,14 @@ as it stands is a workaround. Upstream-Status: Inappropriate [oe specific] Signed-off-by: Richard Purdie -Index: qemu-8.2.0/configure -=================================================================== ---- qemu-8.2.0.orig/configure -+++ qemu-8.2.0/configure +--- + configure | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure b/configure +index e98ecd25f..7e7297982 100755 +--- a/configure ++++ b/configure @@ -937,7 +937,7 @@ python="$(command -v "$python")" echo "python determined to be '$python'" echo "python version: $($python --version)" diff --git a/meta/recipes-devtools/qemu/qemu_8.2.0.bb b/meta/recipes-devtools/qemu/qemu_8.2.1.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_8.2.0.bb rename to meta/recipes-devtools/qemu/qemu_8.2.1.bb