All of lore.kernel.org
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: qemu-arm@nongnu.org, qemu-devel@nongnu.org
Cc: "Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PATCH v2 01/15] target/arm/arm-semi: Capture errno in softmmu version of set_swi_errno()
Date: Mon, 16 Sep 2019 15:15:30 +0100	[thread overview]
Message-ID: <20190916141544.17540-2-peter.maydell@linaro.org> (raw)
In-Reply-To: <20190916141544.17540-1-peter.maydell@linaro.org>

The set_swi_errno() function is called to capture the errno
from a host system call, so that we can return -1 from the
semihosting function and later allow the guest to get a more
specific error code with the SYS_ERRNO function. It comes in
two versions, one for user-only and one for softmmu. We forgot
to capture the errno in the softmmu version; fix the error.

(Semihosting calls directed to gdb are unaffected because
they go through a different code path that captures the
error return from the gdbstub call in arm_semi_cb() or
arm_semi_flen_cb().)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
NB that a later commit will put in some cleanup of TaskState
that will let us reduce the duplication between the two
implementations of this function.
---
 target/arm/arm-semi.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/target/arm/arm-semi.c b/target/arm/arm-semi.c
index 90423a35deb..03e60105c05 100644
--- a/target/arm/arm-semi.c
+++ b/target/arm/arm-semi.c
@@ -114,8 +114,13 @@ static inline uint32_t set_swi_errno(TaskState *ts, uint32_t code)
     return code;
 }
 #else
+static target_ulong syscall_err;
+
 static inline uint32_t set_swi_errno(CPUARMState *env, uint32_t code)
 {
+    if (code == (uint32_t)-1) {
+        syscall_err = errno;
+    }
     return code;
 }
 
@@ -124,10 +129,6 @@ static inline uint32_t set_swi_errno(CPUARMState *env, uint32_t code)
 
 static target_ulong arm_semi_syscall_len;
 
-#if !defined(CONFIG_USER_ONLY)
-static target_ulong syscall_err;
-#endif
-
 static void arm_semi_cb(CPUState *cs, target_ulong ret, target_ulong err)
 {
     ARMCPU *cpu = ARM_CPU(cs);
-- 
2.20.1



  reply	other threads:[~2019-09-16 14:23 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-16 14:15 [Qemu-devel] [PATCH v2 00/15] target/arm: Implement semihosting v2.0 Peter Maydell
2019-09-16 14:15 ` Peter Maydell [this message]
2019-10-03 23:24   ` [Qemu-devel] [PATCH v2 01/15] target/arm/arm-semi: Capture errno in softmmu version of set_swi_errno() Philippe Mathieu-Daudé
2019-10-04  9:50     ` Peter Maydell
2019-10-07 13:36   ` Richard Henderson
2019-09-16 14:15 ` [Qemu-devel] [PATCH v2 02/15] target/arm/arm-semi: Always set some kind of errno for failed calls Peter Maydell
2019-10-03 23:27   ` Philippe Mathieu-Daudé
2019-10-07 13:37   ` Richard Henderson
2019-09-16 14:15 ` [Qemu-devel] [PATCH v2 03/15] target/arm/arm-semi: Correct comment about gdb syscall races Peter Maydell
2019-10-07 14:06   ` Richard Henderson
2019-09-16 14:15 ` [Qemu-devel] [PATCH v2 04/15] target/arm/arm-semi: Make semihosting code hand out its own file descriptors Peter Maydell
2019-10-07 14:09   ` Richard Henderson
2019-09-16 14:15 ` [Qemu-devel] [PATCH v2 05/15] target/arm/arm-semi: Restrict use of TaskState* Peter Maydell
2019-10-07 14:12   ` Richard Henderson
2019-09-16 14:15 ` [Qemu-devel] [PATCH v2 06/15] target/arm/arm-semi: Use set_swi_errno() in gdbstub callback functions Peter Maydell
2019-10-03 23:29   ` Philippe Mathieu-Daudé
2019-10-07 14:13   ` Richard Henderson
2019-09-16 14:15 ` [Qemu-devel] [PATCH v2 07/15] target/arm/arm-semi: Factor out implementation of SYS_CLOSE Peter Maydell
2019-10-03 23:32   ` Philippe Mathieu-Daudé
2019-10-07 14:15   ` Richard Henderson
2019-09-16 14:15 ` [Qemu-devel] [PATCH v2 08/15] target/arm/arm-semi: Factor out implementation of SYS_WRITE Peter Maydell
2019-10-03 23:33   ` Philippe Mathieu-Daudé
2019-10-07 14:16   ` Richard Henderson
2019-09-16 14:15 ` [Qemu-devel] [PATCH v2 09/15] target/arm/arm-semi: Factor out implementation of SYS_READ Peter Maydell
2019-10-03 23:35   ` Philippe Mathieu-Daudé
2019-09-16 14:15 ` [Qemu-devel] [PATCH v2 10/15] target/arm/arm-semi: Factor out implementation of SYS_ISTTY Peter Maydell
2019-10-03 23:35   ` Philippe Mathieu-Daudé
2019-09-16 14:15 ` [Qemu-devel] [PATCH v2 11/15] target/arm/arm-semi: Factor out implementation of SYS_SEEK Peter Maydell
2019-10-03 23:37   ` Philippe Mathieu-Daudé
2019-09-16 14:15 ` [Qemu-devel] [PATCH v2 12/15] target/arm/arm-semi: Factor out implementation of SYS_FLEN Peter Maydell
2019-10-03 23:38   ` Philippe Mathieu-Daudé
2019-09-16 14:15 ` [Qemu-devel] [PATCH v2 13/15] target/arm/arm-semi: Implement support for semihosting feature detection Peter Maydell
2019-09-16 14:15 ` [Qemu-devel] [PATCH v2 14/15] target/arm/arm-semi: Implement SH_EXT_EXIT_EXTENDED extension Peter Maydell
2019-09-16 14:15 ` [Qemu-devel] [PATCH v2 15/15] target/arm/arm-semi: Implement SH_EXT_STDOUT_STDERR extension Peter Maydell
2019-10-03 13:03 ` [PATCH v2 00/15] target/arm: Implement semihosting v2.0 Peter Maydell

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=20190916141544.17540-2-peter.maydell@linaro.org \
    --to=peter.maydell@linaro.org \
    --cc=alex.bennee@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --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.