diff options
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.patch | 50 |
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 @@ | |||
1 | From 213ae3ffda463c0503e39e0cf827511b5298c314 Mon Sep 17 00:00:00 2001 | ||
2 | From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= <clg@redhat.com> | ||
3 | Date: Wed, 20 Dec 2023 14:53:02 +0100 | ||
4 | Subject: [PATCH] vfio/container: Replace basename with g_path_get_basename | ||
5 | MIME-Version: 1.0 | ||
6 | Content-Type: text/plain; charset=UTF-8 | ||
7 | Content-Transfer-Encoding: 8bit | ||
8 | |||
9 | g_path_get_basename() is a portable utility function that has the | ||
10 | advantage of not modifing the string argument. It also fixes a compile | ||
11 | breakage with the Musl C library reported in [1]. | ||
12 | |||
13 | [1] https://lore.kernel.org/all/20231212010228.2701544-1-raj.khem@gmail.com/ | ||
14 | |||
15 | Upstream-Status: Backport [https://github.com/qemu/qemu/commit/213ae3ffda463c0503e39e0cf827511b5298c314] | ||
16 | Reported-by: Khem Raj <raj.khem@gmail.com> | ||
17 | Reviewed-by: Eric Auger <eric.auger@redhat.com> | ||
18 | Reviewed-by: Zhao Liu <zhao1.liu@intel.com> | ||
19 | Reviewed-by: Zhenzhong Duan <zhenzhong.duan@intel.com> | ||
20 | Signed-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 | |||
25 | diff --git a/hw/vfio/container.c b/hw/vfio/container.c | ||
26 | index 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 | -- | ||
49 | 2.43.0 | ||
50 | |||