diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-03-19 14:14:15 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-03-19 14:14:15 +0000 |
| commit | 4c8821d13405056776d0255bb78925dac91996c3 (patch) | |
| tree | eebc05d5f8c8609a31f9bcc5181e4d20b684360e /linux-user/qemu.h | |
| parent | c1b94a0ed2332b08ea7799c003c3ee9996782a3c (diff) | |
| parent | e0eb210ec0c1cd262e3f642133ee93acdaf60aa0 (diff) | |
| download | focaccia-qemu-4c8821d13405056776d0255bb78925dac91996c3.tar.gz focaccia-qemu-4c8821d13405056776d0255bb78925dac91996c3.zip | |
Merge remote-tracking branch 'remotes/riku/linux-user-for-upstream' into staging
* remotes/riku/linux-user-for-upstream: linux-user: Implement capget, capset linux-user: Don't allow guest to block SIGSEGV signal: added a wrapper for sigprocmask function linux-user: Don't reserve space for commpage for AArch64 linux-user: implement F_[GS]ETOWN_EX linux-user: Don't return uninitialized value for atomic_barrier syscall linux-user/signal.c: Correct error path for AArch64 do_rt_sigreturn Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'linux-user/qemu.h')
| -rw-r--r-- | linux-user/qemu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/linux-user/qemu.h b/linux-user/qemu.h index c2f74f33d6..36d4a738ea 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -126,6 +126,7 @@ typedef struct TaskState { #endif uint32_t stack_base; int used; /* non zero if used */ + bool sigsegv_blocked; /* SIGSEGV blocked by guest */ struct image_info *info; struct linux_binprm *bprm; @@ -235,6 +236,7 @@ int host_to_target_signal(int sig); 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); #ifdef TARGET_I386 /* vm86.c */ |