summary refs log tree commit diff stats
path: root/linux-user/main.c
diff options
context:
space:
mode:
authortakasi-y@ops.dti.ne.jp <takasi-y@ops.dti.ne.jp>2010-04-12 04:07:35 +0900
committerAurelien Jarno <aurelien@aurel32.net>2010-05-18 19:30:10 +0200
commit81bbe906c89b6b7af58a1eeb96ec5a0bfdc3386f (patch)
treee38bc6a84bd2966bed3ee6d1f8318f02f8c6a8fd /linux-user/main.c
parentc69ea0dff27ccc6663f8ecb4a70f762f4559672c (diff)
downloadfocaccia-qemu-81bbe906c89b6b7af58a1eeb96ec5a0bfdc3386f.tar.gz
focaccia-qemu-81bbe906c89b6b7af58a1eeb96ec5a0bfdc3386f.zip
linux-user: rlimit conversion between host and target.
rlim_t conversion between host and target added.
Otherwise there are some incorrect case like
- RLIM_INFINITY on 32bit target -> 64bit host.
- RLIM_INFINITY on 64bit host -> mips and sparc target ?
- Big value(for 32bit target) on 64bit host -> 32bit target.

One is added into getrlimit, setrlimit, and ugetrlimit. It converts both
RLIM_INFINITY and value bigger than target can hold(>31bit) to RLIM_INFINITY.

Another one is added to guest_stack_size calculation introduced by
703e0e89. The rule is mostly same except the result on the case is keeping
the value of guest_stack_size.

Slightly tested for SH4, and x86_64 -linux-user on x86_64-pc-linux host.

Signed-off-by: Takashi YOSHII <takasi-y@ops.dti.ne.jp>
Acked-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'linux-user/main.c')
-rw-r--r--linux-user/main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/linux-user/main.c b/linux-user/main.c
index 18b52c00a4..99a7cde559 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -2706,7 +2706,8 @@ int main(int argc, char **argv, char **envp)
     {
         struct rlimit lim;
         if (getrlimit(RLIMIT_STACK, &lim) == 0
-            && lim.rlim_cur != RLIM_INFINITY) {
+            && lim.rlim_cur != RLIM_INFINITY
+            && lim.rlim_cur == (target_long)lim.rlim_cur) {
             guest_stack_size = lim.rlim_cur;
         }
     }