summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/qemu/qemu
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2024-02-04 21:23:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-02-05 14:06:10 +0000
commit25868ee2cc3fdcbf4bff1ff4f66465e8aeef744d (patch)
tree6b40209b8146449167bb041ae57bd5f7779a7fe4 /meta/recipes-devtools/qemu/qemu
parent3558ee528f50603a07a522d866d4e95e3e929e48 (diff)
downloadpoky-25868ee2cc3fdcbf4bff1ff4f66465e8aeef744d.tar.gz
qemu: Upgrade 8.2.0 -> 8.2.1
This was a bugfix release containing several important fixes according to upstream. Drop a backported patch. (From OE-Core rev: 1715d0907d372e787c054a5509690a2719acfed0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu')
-rw-r--r--meta/recipes-devtools/qemu/qemu/0001-vfio-container-Replace-basename-with-g_path_get_base.patch50
1 files changed, 0 insertions, 50 deletions
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 @@
1From 213ae3ffda463c0503e39e0cf827511b5298c314 Mon Sep 17 00:00:00 2001
2From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com>
3Date: Wed, 20 Dec 2023 14:53:02 +0100
4Subject: [PATCH] vfio/container: Replace basename with g_path_get_basename
5MIME-Version: 1.0
6Content-Type: text/plain; charset=UTF-8
7Content-Transfer-Encoding: 8bit
8
9g_path_get_basename() is a portable utility function that has the
10advantage of not modifing the string argument. It also fixes a compile
11breakage with the Musl C library reported in [1].
12
13[1] https://lore.kernel.org/all/20231212010228.2701544-1-raj.khem@gmail.com/
14
15Upstream-Status: Backport [https://github.com/qemu/qemu/commit/213ae3ffda463c0503e39e0cf827511b5298c314]
16Reported-by: Khem Raj <raj.khem@gmail.com>
17Reviewed-by: Eric Auger <eric.auger@redhat.com>
18Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
19Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com>
20Signed-off-by: Cédric Le Goater <clg@redhat.com>
21---
22 hw/vfio/container.c | 5 +++--
23 1 file changed, 3 insertions(+), 2 deletions(-)
24
25diff --git a/hw/vfio/container.c b/hw/vfio/container.c
26index 688cf23bab..8d334f52f2 100644
27--- a/hw/vfio/container.c
28+++ b/hw/vfio/container.c
29@@ -869,7 +869,8 @@ static void vfio_put_base_device(VFIODevice *vbasedev)
30
31 static int vfio_device_groupid(VFIODevice *vbasedev, Error **errp)
32 {
33- char *tmp, group_path[PATH_MAX], *group_name;
34+ char *tmp, group_path[PATH_MAX];
35+ g_autofree char *group_name = NULL;
36 int ret, groupid;
37 ssize_t len;
38
39@@ -885,7 +886,7 @@ static int vfio_device_groupid(VFIODevice *vbasedev, Error **errp)
40
41 group_path[len] = 0;
42
43- group_name = basename(group_path);
44+ group_name = g_path_get_basename(group_path);
45 if (sscanf(group_name, "%d", &groupid) != 1) {
46 error_setg_errno(errp, errno, "failed to read %s", group_path);
47 return -errno;
48--
492.43.0
50