f9d45693eb
-vhost-user-blk: fix the resize crash -plugins: make qemu_plugin_user_exit's locking order consistent with fork_start's -linux-user: fix strace build w/out munlockall -ui: fix crash on serial reset, during init -qga/win/vss: requester_freeze changes -migration: fix populate_vfio_info -block/rbd: workaround for ceph issue #53784 -target/i386: add FZRM, FSRS, FSRC -i386: Add new CPU model SapphireRapids -core/cpu-common: Fix the wrong '#ifdef __aarch64__' Signed-off-by: Fei Xu <xufei30@huawei.com>
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From c51eaedcf9833a6edfcee1993e6651046fad1f59 Mon Sep 17 00:00:00 2001
|
|
From: qihao <qihao@cmss.chinamobile.com>
|
|
Date: Thu, 30 Mar 2023 18:07:11 +0800
|
|
Subject: [PATCH] linux-user: fix strace build w/out munlockall
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
cheery-pick from d237b416b9499441b6833b91609ec840efd832b6
|
|
|
|
Signed-off-by: qihao_yewu <qihao_yewu@cmss.chinamobile.com>
|
|
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
|
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
|
|
Message-Id: <20230118090144.31155-1-vapier@gentoo.org>
|
|
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
|
|
---
|
|
linux-user/strace.c | 4 +++-
|
|
1 file changed, 3 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/linux-user/strace.c b/linux-user/strace.c
|
|
index 2cdbf030ba..37d66d0dff 100644
|
|
--- a/linux-user/strace.c
|
|
+++ b/linux-user/strace.c
|
|
@@ -1368,7 +1368,8 @@ UNUSED static struct flags termios_lflags[] = {
|
|
FLAG_END,
|
|
};
|
|
|
|
-UNUSED static struct flags mlockall_flags[] = {
|
|
+#ifdef TARGET_NR_mlockall
|
|
+static struct flags mlockall_flags[] = {
|
|
FLAG_TARGET(MCL_CURRENT),
|
|
FLAG_TARGET(MCL_FUTURE),
|
|
#ifdef MCL_ONFAULT
|
|
@@ -1376,6 +1377,7 @@ UNUSED static struct flags mlockall_flags[] = {
|
|
#endif
|
|
FLAG_END,
|
|
};
|
|
+#endif
|
|
|
|
/* IDs of the various system clocks */
|
|
#define TARGET_CLOCK_REALTIME 0
|
|
--
|
|
2.27.0
|
|
|