* [PATCH] linux-user: fix strace build w/out munlockall
@ 2023-01-17 23:30 Mike Frysinger
2023-01-18 7:21 ` Philippe Mathieu-Daudé
2023-01-18 9:01 ` [PATCH v2] " Mike Frysinger
0 siblings, 2 replies; 4+ messages in thread
From: Mike Frysinger @ 2023-01-17 23:30 UTC (permalink / raw)
To: qemu-devel, Laurent Vivier
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
linux-user/strace.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/linux-user/strace.c b/linux-user/strace.c
index 9ae5a812cd71..f7912ad67f2b 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -1380,6 +1380,7 @@ UNUSED static struct flags termios_lflags[] = {
FLAG_END,
};
+#ifdef TARGET_NR_mlockall
UNUSED static struct flags mlockall_flags[] = {
FLAG_TARGET(MCL_CURRENT),
FLAG_TARGET(MCL_FUTURE),
@@ -1388,6 +1389,7 @@ UNUSED static struct flags mlockall_flags[] = {
#endif
FLAG_END,
};
+#endif
/* IDs of the various system clocks */
#define TARGET_CLOCK_REALTIME 0
--
2.39.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] linux-user: fix strace build w/out munlockall
2023-01-17 23:30 [PATCH] linux-user: fix strace build w/out munlockall Mike Frysinger
@ 2023-01-18 7:21 ` Philippe Mathieu-Daudé
2023-01-18 9:01 ` [PATCH v2] " Mike Frysinger
1 sibling, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2023-01-18 7:21 UTC (permalink / raw)
To: Mike Frysinger, qemu-devel, Laurent Vivier
On 18/1/23 00:30, Mike Frysinger wrote:
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> ---
> linux-user/strace.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/linux-user/strace.c b/linux-user/strace.c
> index 9ae5a812cd71..f7912ad67f2b 100644
> --- a/linux-user/strace.c
> +++ b/linux-user/strace.c
> @@ -1380,6 +1380,7 @@ UNUSED static struct flags termios_lflags[] = {
> FLAG_END,
> };
>
> +#ifdef TARGET_NR_mlockall
> UNUSED static struct flags mlockall_flags[] = {
Removing the 'UNUSED' qualifier:
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> FLAG_TARGET(MCL_CURRENT),
> FLAG_TARGET(MCL_FUTURE),
> @@ -1388,6 +1389,7 @@ UNUSED static struct flags mlockall_flags[] = {
> #endif
> FLAG_END,
> };
> +#endif
>
> /* IDs of the various system clocks */
> #define TARGET_CLOCK_REALTIME 0
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH v2] linux-user: fix strace build w/out munlockall
2023-01-17 23:30 [PATCH] linux-user: fix strace build w/out munlockall Mike Frysinger
2023-01-18 7:21 ` Philippe Mathieu-Daudé
@ 2023-01-18 9:01 ` Mike Frysinger
2023-01-25 13:25 ` Laurent Vivier
1 sibling, 1 reply; 4+ messages in thread
From: Mike Frysinger @ 2023-01-18 9:01 UTC (permalink / raw)
To: qemu-devel, Laurent Vivier; +Cc: Philippe Mathieu-Daudé
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=8bit, Size: 833 bytes --]
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
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 9ae5a812cd71..11a7c3df9498 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -1380,7 +1380,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
@@ -1388,6 +1389,7 @@ UNUSED static struct flags mlockall_flags[] = {
#endif
FLAG_END,
};
+#endif
/* IDs of the various system clocks */
#define TARGET_CLOCK_REALTIME 0
--
2.39.0
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] linux-user: fix strace build w/out munlockall
2023-01-18 9:01 ` [PATCH v2] " Mike Frysinger
@ 2023-01-25 13:25 ` Laurent Vivier
0 siblings, 0 replies; 4+ messages in thread
From: Laurent Vivier @ 2023-01-25 13:25 UTC (permalink / raw)
To: Mike Frysinger, qemu-devel; +Cc: Philippe Mathieu-Daudé
Le 18/01/2023 à 10:01, Mike Frysinger a écrit :
> Signed-off-by: Mike Frysinger <vapier@gentoo.org>
> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> 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 9ae5a812cd71..11a7c3df9498 100644
> --- a/linux-user/strace.c
> +++ b/linux-user/strace.c
> @@ -1380,7 +1380,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
> @@ -1388,6 +1389,7 @@ UNUSED static struct flags mlockall_flags[] = {
> #endif
> FLAG_END,
> };
> +#endif
>
> /* IDs of the various system clocks */
> #define TARGET_CLOCK_REALTIME 0
Applied to my linux-user-for-8.0 branch.
Thanks,
Laurent
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-01-25 13:26 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-17 23:30 [PATCH] linux-user: fix strace build w/out munlockall Mike Frysinger
2023-01-18 7:21 ` Philippe Mathieu-Daudé
2023-01-18 9:01 ` [PATCH v2] " Mike Frysinger
2023-01-25 13:25 ` Laurent Vivier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).