diff options
| author | Peter Maydell | 2018-06-12 17:42:53 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-06-12 17:42:53 +0200 |
| commit | 3b2a4d3901b8b45840c0e0495ee1cbd13123739d (patch) | |
| tree | 55e666966f0cc3794e04ecaf2dd9cae35ecf6801 /linux-user/syscall.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/usb-20180612-pull-request' ... (diff) | |
| parent | linux-user/sparc64: Add inotify_rm_watch and tee syscalls (diff) | |
| download | qemu-3b2a4d3901b8b45840c0e0495ee1cbd13123739d.tar.gz qemu-3b2a4d3901b8b45840c0e0495ee1cbd13123739d.tar.xz qemu-3b2a4d3901b8b45840c0e0495ee1cbd13123739d.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.0-pull-request' into staging
Fixes in syscall numbers,
disable the build of binaries not needed for linux-user,
update of qemu-binfmt-conf.sh and cleanup around is_error()
# gpg: Signature made Tue 12 Jun 2018 11:57:18 BST
# gpg: using RSA key F30C38BD3F2FBE3C
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>"
# gpg: aka "Laurent Vivier <laurent@vivier.eu>"
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>"
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/linux-user-for-3.0-pull-request:
linux-user/sparc64: Add inotify_rm_watch and tee syscalls
linux-user/microblaze: Fix typo in accept4 syscall
linux-user/hppa: Fix typo in mknodat syscall
linux-user/alpha: Fix epoll syscalls
qemu-binfmt-conf.sh: ignore the OS/ABI field
linux-user: disable qemu-bridge-helper and socket_scm_helper build
linux-user: Use is_error() to avoid warnings and make the code clearer
linux-user: Export use is_error(), use it to avoid warnings
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/syscall.c')
| -rw-r--r-- | linux-user/syscall.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 7b9ac3b408..2117fb13b4 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -906,11 +906,6 @@ static inline abi_long get_errno(abi_long ret) return ret; } -static inline int is_error(abi_long ret) -{ - return (abi_ulong)ret >= (abi_ulong)(-4096); -} - const char *target_strerror(int err) { if (err == TARGET_ERESTARTSYS) { |