diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2020-07-06 11:40:10 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2020-07-06 11:40:10 +0100 |
| commit | 7623b5ba017f61de5d7c2bba12c6feb3d55091b1 (patch) | |
| tree | c6f2cd490f2acd9f6592a5bb5fd748a4ba2072a9 /target | |
| parent | eb6490f544388dd24c0d054a96dd304bc7284450 (diff) | |
| parent | 8f902c540eccd72086e8f67d977e30e05659783f (diff) | |
| download | qemu-7623b5ba017f61de5d7c2bba12c6feb3d55091b1.zip qemu-7623b5ba017f61de5d7c2bba12c6feb3d55091b1.tar.gz qemu-7623b5ba017f61de5d7c2bba12c6feb3d55091b1.tar.bz2 | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-5.1-pull-request' into staging
linux-user pull request 2020-07-02
Update linux-user maintainer
Improve strace output for some syscalls
Display contents of ioctl() parameters
Fix sparc64 flushw operation
# gpg: Signature made Sat 04 Jul 2020 17:25:21 BST
# gpg: using RSA key CD2F75DDC8E3A4DC2E4F5173F30C38BD3F2FBE3C
# gpg: issuer "laurent@vivier.eu"
# gpg: Good signature from "Laurent Vivier <lvivier@redhat.com>" [full]
# gpg: aka "Laurent Vivier <laurent@vivier.eu>" [full]
# gpg: aka "Laurent Vivier (Red Hat) <lvivier@redhat.com>" [full]
# Primary key fingerprint: CD2F 75DD C8E3 A4DC 2E4F 5173 F30C 38BD 3F2F BE3C
* remotes/vivier2/tags/linux-user-for-5.1-pull-request:
MAINTAINERS: update linux-user maintainer
linux-user: Add strace support for printing arguments of ioctl()
linux-user: Add thunk argument types for SIOCGSTAMP and SIOCGSTAMPNS
linux-user: Add strace support for printing arguments of fallocate()
linux-user: Add strace support for printing arguments of chown()/lchown()
linux-user: Add strace support for printing arguments of lseek()
linux-user: Add strace support for printing argument of syscalls used for extended attributes
linux-user: Add strace support for a group of syscalls
linux-user: Extend strace support to enable argument printing after syscall execution
linux-user: syscall: ioctls: support DRM_IOCTL_VERSION
linux-user/sparc64: Fix the handling of window spill trap
target/sparc: Translate flushw opcode
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target')
| -rw-r--r-- | target/sparc/translate.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/target/sparc/translate.c b/target/sparc/translate.c index 9416a55..1a4efd4 100644 --- a/target/sparc/translate.c +++ b/target/sparc/translate.c @@ -3663,6 +3663,8 @@ static void disas_sparc_insn(DisasContext * dc, unsigned int insn) #endif gen_store_gpr(dc, rd, cpu_tmp0); break; +#endif +#if defined(TARGET_SPARC64) || !defined(CONFIG_USER_ONLY) } else if (xop == 0x2b) { /* rdtbr / V9 flushw */ #ifdef TARGET_SPARC64 gen_helper_flushw(cpu_env); |