From: Richard Purdie Date: Sun, 4 Feb 2024 21:23:44 +0000 (+0000) Subject: qemu: Upgrade 8.2.0 -> 8.2.1 X-Git-Tag: uninative-4.4~246 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1715d0907d372e787c054a5509690a2719acfed0;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git qemu: Upgrade 8.2.0 -> 8.2.1 This was a bugfix release containing several important fixes according to upstream. Drop a backported patch. Signed-off-by: Richard Purdie --- diff --git a/meta/recipes-devtools/qemu/qemu-native_8.2.0.bb b/meta/recipes-devtools/qemu/qemu-native_8.2.1.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_8.2.0.bb rename to meta/recipes-devtools/qemu/qemu-native_8.2.1.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_8.2.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_8.2.1.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_8.2.0.bb rename to meta/recipes-devtools/qemu/qemu-system-native_8.2.1.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 14b975db305..2a818701513 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 \ @@ -53,7 +52,7 @@ SRC_URI:append:class-native = " \ file://0012-linux-user-workaround-for-missing-MAP_SHARED_VALIDAT.patch \ " -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-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 ad4f4101788..00000000000 --- 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_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