From: Warner Losh <imp@bsdimp.com>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
arrowd@FreeBSD.org, Kyle Evans <kevans@FreeBSD.org>,
Richard Henderson <richard.henderson@linaro.org>,
def@FreeBSD.org, jrtc27@FreeBSD.org, Warner Losh <imp@bsdimp.com>,
Brad Smith <brad@comstyle.com>
Subject: [PULL 12/16] bsd-user/freebsd/os-syscall.c: Add get_errno and host_to_target_errno
Date: Mon, 28 Feb 2022 11:12:10 -0700 [thread overview]
Message-ID: <20220228181214.2602-13-imp@bsdimp.com> (raw)
In-Reply-To: <20220228181214.2602-1-imp@bsdimp.com>
Add the helper functions get_errno and host_to_target_errno. get_errno
returns either the system call results, or the -errno when system call
indicates failure by returning -1. Host_to_target_errno returns errno
(since on FreeBSD they are the same on all architectures) along with a
comment about why it's the identity.
Signed-off-by: Warner Losh <imp@bsdimp.com>
Reviewed-by: Kyle Evans <kevans@FreeBSD.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
---
bsd-user/freebsd/os-syscall.c | 23 ++++++++++++++++++++++-
bsd-user/qemu.h | 3 ++-
2 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/bsd-user/freebsd/os-syscall.c b/bsd-user/freebsd/os-syscall.c
index fc57e324173..597a41c2f50 100644
--- a/bsd-user/freebsd/os-syscall.c
+++ b/bsd-user/freebsd/os-syscall.c
@@ -45,9 +45,30 @@ void target_set_brk(abi_ulong new_brk)
{
}
-bool is_error(abi_long ret)
+/*
+ * errno conversion.
+ */
+abi_long get_errno(abi_long ret)
{
+ if (ret == -1) {
+ return -host_to_target_errno(errno);
+ } else {
+ return ret;
+ }
+}
+int host_to_target_errno(int err)
+{
+ /*
+ * All the BSDs have the property that the error numbers are uniform across
+ * all architectures for a given BSD, though they may vary between different
+ * BSDs.
+ */
+ return err;
+}
+
+bool is_error(abi_long ret)
+{
return (abi_ulong)ret >= (abi_ulong)(-4096);
}
diff --git a/bsd-user/qemu.h b/bsd-user/qemu.h
index e5742bd6c03..56042ddbc5d 100644
--- a/bsd-user/qemu.h
+++ b/bsd-user/qemu.h
@@ -246,9 +246,10 @@ extern unsigned long target_dflssiz;
extern unsigned long target_maxssiz;
extern unsigned long target_sgrowsiz;
-/* syscall.c */
+/* os-syscall.c */
abi_long get_errno(abi_long ret);
bool is_error(abi_long ret);
+int host_to_target_errno(int err);
/* os-sys.c */
abi_long do_freebsd_sysarch(void *cpu_env, abi_long arg1, abi_long arg2);
--
2.33.1
next prev parent reply other threads:[~2022-02-28 18:26 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-28 18:11 [PULL 00/16] Bsd user preen 2022q1 patches Warner Losh
2022-02-28 18:11 ` [PULL 01/16] bsd-user/main.c: Drop syscall flavor arg -bsd Warner Losh
2022-02-28 18:12 ` [PULL 02/16] bsd-user/x86_64/target_arch_cpu.h: int $80 never was a BSD system call on amd64 Warner Losh
2022-02-28 18:12 ` [PULL 03/16] bsd-user/x86_64/target_arch_cpu.h: Remove openbsd syscall Warner Losh
2022-02-28 18:12 ` [PULL 04/16] bsd-user/i386/target_arch_cpu.h: " Warner Losh
2022-02-28 18:12 ` [PULL 05/16] bsd-user/arm/target_arch_cpu.h: Only support FreeBSD sys calls Warner Losh
2022-02-28 18:12 ` [PULL 06/16] bsd-user/arm/target_arch_thread.h: Assume a FreeBSD target Warner Losh
2022-02-28 18:12 ` [PULL 07/16] bsd-user/x86_64/target_arch_thread.h: " Warner Losh
2022-02-28 18:12 ` [PULL 08/16] bsd-user: Remove bsd_type Warner Losh
2022-02-28 18:12 ` [PULL 09/16] bsd-user/freebsd/os-syscall.c: Move syscall processing here Warner Losh
2022-02-28 18:12 ` [PULL 10/16] bsd-user: Move system call building to os-syscall.c Warner Losh
2022-02-28 18:12 ` [PULL 11/16] bsd-user/sycall.c: Now obsolete, remove Warner Losh
2022-02-28 18:12 ` Warner Losh [this message]
2022-02-28 18:12 ` [PULL 13/16] bsd-user/bsd-file.h: Implementation details for the filesystem calls Warner Losh
2022-02-28 18:12 ` [PULL 14/16] bsd-user: introduce target.h Warner Losh
2022-02-28 18:12 ` [PULL 15/16] bsd-user: Define target_arg64 Warner Losh
2022-02-28 18:12 ` [PULL 16/16] bsd-user: Add safe system call macros Warner Losh
2022-03-02 10:45 ` [PULL 00/16] Bsd user preen 2022q1 patches 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=20220228181214.2602-13-imp@bsdimp.com \
--to=imp@bsdimp.com \
--cc=arrowd@FreeBSD.org \
--cc=brad@comstyle.com \
--cc=def@FreeBSD.org \
--cc=jrtc27@FreeBSD.org \
--cc=kevans@FreeBSD.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.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 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).