mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-07-26 08:55:57 +02:00
bd76aa2876Bug: https://bugs.gentoo.org/949098 Signed-off-by: Dmitry Khromov <dk@icelogic.net> Closes: https://github.com/gentoo/gentoo/pull/40597 Signed-off-by: Sam James <sam@gentoo.org>
46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
https://bugs.gentoo.org/949098
|
|
https://gitlab.com/qemu-project/qemu/-/issues/2799
|
|
https://lists.nongnu.org/archive/html/qemu-devel/2024-10/msg02221.html
|
|
|
|
glibc 2.41+ has added [1] definitions for sched_setattr and sched_getattr functions
|
|
and struct sched_attr. Therefore, it needs to be checked for here as well before
|
|
defining sched_attr
|
|
|
|
Define sched_attr conditionally on SCHED_ATTR_SIZE_VER0
|
|
|
|
Fixes builds with glibc/trunk
|
|
|
|
[1]
|
|
https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=21571ca0d70302909cf72707b2a7736cf12190a0;hp=298bc488fdc047da37482f4003023cb9adef78f8
|
|
|
|
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
|
Cc: Laurent Vivier <laurent@vivier.eu>
|
|
Cc: Paolo Bonzini <pbonzini@redhat.com>
|
|
---
|
|
v2: Use SCHED_ATTR_SIZE_VER0 instead of glibc version check
|
|
|
|
linux-user/syscall.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
|
|
index 1ce4c79..a407d4a 100644
|
|
--- a/linux-user/syscall.c
|
|
+++ b/linux-user/syscall.c
|
|
@@ -358,7 +358,8 @@ _syscall3(int, sys_sched_getaffinity, pid_t, pid, unsigned int, len,
|
|
#define __NR_sys_sched_setaffinity __NR_sched_setaffinity
|
|
_syscall3(int, sys_sched_setaffinity, pid_t, pid, unsigned int, len,
|
|
unsigned long *, user_mask_ptr);
|
|
-/* sched_attr is not defined in glibc */
|
|
+/* sched_attr is not defined in glibc < 2.41 */
|
|
+#ifndef SCHED_ATTR_SIZE_VER0
|
|
struct sched_attr {
|
|
uint32_t size;
|
|
uint32_t sched_policy;
|
|
@@ -371,6 +372,7 @@ struct sched_attr {
|
|
uint32_t sched_util_min;
|
|
uint32_t sched_util_max;
|
|
};
|
|
+#endif
|
|
#define __NR_sys_sched_getattr __NR_sched_getattr
|
|
_syscall4(int, sys_sched_getattr, pid_t, pid, struct sched_attr *, attr,
|
|
unsigned int, size, unsigned int, flags);
|