All of lore.kernel.org
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: Fabrice Fontaine <fontaine.fabrice@gmail.com>,
	Laurent Vivier <laurent@vivier.eu>
Subject: [PULL 2/8] linux-user/syscall.c: fix build without RLIMIT_RTTIME
Date: Wed, 25 May 2022 12:40:51 +0200	[thread overview]
Message-ID: <20220525104057.543354-3-laurent@vivier.eu> (raw)
In-Reply-To: <20220525104057.543354-1-laurent@vivier.eu>

From: Fabrice Fontaine <fontaine.fabrice@gmail.com>

RLIMIT_RTTIME is not provided by uclibc-ng or by musl prior to version
1.2.0 and
https://github.com/bminor/musl/commit/2507e7f5312e79620f6337935d0a6c9045ccba09
resulting in the following build failure since
https://git.qemu.org/?p=qemu.git;a=commit;h=244fd08323088db73590ff2317dfe86f810b51d7:

../linux-user/syscall.c: In function 'target_to_host_resource':
../linux-user/syscall.c:1057:16: error: 'RLIMIT_RTTIME' undeclared (first use in this function); did you mean 'RLIMIT_NOFILE'?
 1057 |         return RLIMIT_RTTIME;
      |                ^~~~~~~~~~~~~
      |                RLIMIT_NOFILE

Fixes:
 - http://autobuild.buildroot.org/results/22d3b584b704613d030e1ea9e6b709b713e4cc26

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20220523105239.1499162-1-fontaine.fabrice@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 linux-user/syscall.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index dd0d92ba4ee0..488facb3560e 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -1053,8 +1053,10 @@ static inline int target_to_host_resource(int code)
         return RLIMIT_RSS;
     case TARGET_RLIMIT_RTPRIO:
         return RLIMIT_RTPRIO;
+#ifdef RLIMIT_RTTIME
     case TARGET_RLIMIT_RTTIME:
         return RLIMIT_RTTIME;
+#endif
     case TARGET_RLIMIT_SIGPENDING:
         return RLIMIT_SIGPENDING;
     case TARGET_RLIMIT_STACK:
-- 
2.36.1



  parent reply	other threads:[~2022-05-25 10:43 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-05-25 10:40 [PULL 0/8] Linux user for 7.1 patches Laurent Vivier
2022-05-25 10:40 ` [PULL 1/8] linux-user: Clean up arg_start/arg_end confusion Laurent Vivier
2022-05-25 10:40 ` Laurent Vivier [this message]
2022-05-25 10:40 ` [PULL 3/8] linux-user/elfload: Remove pointless non-const CPUArchState cast Laurent Vivier
2022-05-25 10:40 ` [PULL 4/8] linux-user: Have do_syscall() use CPUArchState* instead of void* Laurent Vivier
2022-05-25 10:40 ` [PULL 5/8] linux-user: Remove pointless CPU{ARCH}State casts Laurent Vivier
2022-05-25 10:40 ` [PULL 6/8] linux-user/s390x: Fix unwinding from signal handlers Laurent Vivier
2022-05-25 10:40 ` [PULL 7/8] tests/tcg/s390x: Test " Laurent Vivier
2022-05-25 10:40 ` [PULL 8/8] linux-user/host/s390: Treat EX and EXRL as writes Laurent Vivier
2022-05-25 18:16 ` [PULL 0/8] Linux user for 7.1 patches Richard Henderson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220525104057.543354-3-laurent@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=fontaine.fabrice@gmail.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.