summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2011-11-21 12:21:19 +0000
committerRiku Voipio <riku.voipio@linaro.org>2012-02-02 17:51:20 +0200
commit2a7e12455c1d388e41f4c8d2231fb48a968792cd (patch)
treeaab7c17bd0c1fc734bdfbe0ac63b3d82a6cee73c
parent962b289ef35087fcd8764e4e29808d8ac90157f7 (diff)
downloadfocaccia-qemu-2a7e12455c1d388e41f4c8d2231fb48a968792cd.tar.gz
focaccia-qemu-2a7e12455c1d388e41f4c8d2231fb48a968792cd.zip
linux-user/strace.c: Correct errno printing for mmap etc
Correct the printing of errnos for syscalls which are handled
via print_syscall_ret_addr (mmap, mmap2, brk, shmat): errnos
are returned as negative returned values at this level, not
via the host 'errno' variable.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
-rw-r--r--linux-user/strace.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/linux-user/strace.c b/linux-user/strace.c
index 269481e7ae..05a0d3e9d7 100644
--- a/linux-user/strace.c
+++ b/linux-user/strace.c
@@ -1,5 +1,4 @@
 #include <stdio.h>
-#include <errno.h>
 #include <sys/ipc.h>
 #include <sys/msg.h>
 #include <sys/sem.h>
@@ -286,11 +285,11 @@ print_syscall_ret_addr(const struct syscallname *name, abi_long ret)
 {
     char *errstr = NULL;
 
-    if (ret == -1) {
-        errstr = target_strerror(errno);
+    if (ret < 0) {
+        errstr = target_strerror(-ret);
     }
-    if ((ret == -1) && errstr) {
-        gemu_log(" = -1 errno=%d (%s)\n", errno, errstr);
+    if (errstr) {
+        gemu_log(" = -1 errno=%d (%s)\n", (int)-ret, errstr);
     } else {
         gemu_log(" = 0x" TARGET_ABI_FMT_lx "\n", ret);
     }