diff options
| author | Peter Maydell | 2018-07-23 15:03:14 +0200 |
|---|---|---|
| committer | Peter Maydell | 2018-07-23 15:03:14 +0200 |
| commit | 55b1f14cefcb19ce6d5e28c4c83404230888aa7e (patch) | |
| tree | c4e9b01139251216e9918db89453831b38e9c1cf /linux-user/qemu.h | |
| parent | po: Don't include comments with location (diff) | |
| parent | linux-user/ppc: Implement swapcontext syscall (diff) | |
| download | qemu-55b1f14cefcb19ce6d5e28c4c83404230888aa7e.tar.gz qemu-55b1f14cefcb19ce6d5e28c4c83404230888aa7e.tar.xz qemu-55b1f14cefcb19ce6d5e28c4c83404230888aa7e.zip | |
Merge remote-tracking branch 'remotes/vivier2/tags/linux-user-for-3.0-pull-request' into staging
Some ppc/ppc64 fixes:
- we can run now most of the targets on a ppc64 host with 64kB pages
- add swapcontext syscall to run tests/test-coroutine in
debian-powerpc-user-cross
# gpg: Signature made Mon 23 Jul 2018 13:55:57 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/ppc: Implement swapcontext syscall
linux-user: fix ELF load alignment error
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/qemu.h')
| -rw-r--r-- | linux-user/qemu.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/linux-user/qemu.h b/linux-user/qemu.h index bb85c81aa4..b4959e41c6 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -51,6 +51,7 @@ struct image_info { abi_ulong file_string; uint32_t elf_flags; int personality; + abi_ulong alignment; /* The fields below are used in FDPIC mode. */ abi_ulong loadmap_addr; @@ -395,6 +396,8 @@ long do_sigreturn(CPUArchState *env); long do_rt_sigreturn(CPUArchState *env); abi_long do_sigaltstack(abi_ulong uss_addr, abi_ulong uoss_addr, abi_ulong sp); int do_sigprocmask(int how, const sigset_t *set, sigset_t *oldset); +abi_long do_swapcontext(CPUArchState *env, abi_ulong uold_ctx, + abi_ulong unew_ctx, abi_long ctx_size); /** * block_signals: block all signals while handling this guest syscall * |