[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] linux-user: Implement force_sigsegv() via force
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PATCH 6/6] linux-user: Implement force_sigsegv() via force_sig() |
Date: |
Thu, 28 Jul 2016 16:44:50 +0100 |
Now that we have a force_sig() with the semantics we need,
we can implement force_sigsegv() to call it rather than
open-coding the call to queue_signal().
Signed-off-by: Peter Maydell <address@hidden>
---
linux-user/signal.c | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/linux-user/signal.c b/linux-user/signal.c
index cadb989..6f975b9 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -512,8 +512,7 @@ void signal_init(void)
}
}
-#if !defined(TARGET_OPENRISC) && !defined(TARGET_UNICORE32) && \
- !defined(TARGET_X86_64)
+#if !(defined(TARGET_X86_64) || defined(TARGET_UNICORE32))
/* Force a synchronously taken signal. The kernel force_sig() function
* also forces the signal to "not blocked, not ignored", but for QEMU
* that work is done in process_pending_signals().
@@ -531,9 +530,6 @@ static void force_sig(int sig)
info._sifields._kill._uid = 0;
queue_signal(env, info.si_signo, QEMU_SI_KILL, &info);
}
-#endif
-
-#if !(defined(TARGET_X86_64) || defined(TARGET_UNICORE32))
/* Force a SIGSEGV if we couldn't write to memory trying to set
* up the signal frame. oldsig is the signal we were trying to handle
@@ -541,22 +537,13 @@ static void force_sig(int sig)
*/
static void force_sigsegv(int oldsig)
{
- CPUState *cpu = thread_cpu;
- CPUArchState *env = cpu->env_ptr;
- target_siginfo_t info;
-
if (oldsig == SIGSEGV) {
/* Make sure we don't try to deliver the signal again; this will
* end up with handle_pending_signal() calling dump_core_and_abort().
*/
sigact_table[oldsig - 1]._sa_handler = TARGET_SIG_DFL;
}
- info.si_signo = TARGET_SIGSEGV;
- info.si_errno = 0;
- info.si_code = TARGET_SI_KERNEL;
- info._sifields._kill._pid = 0;
- info._sifields._kill._uid = 0;
- queue_signal(env, info.si_signo, QEMU_SI_KILL, &info);
+ force_sig(TARGET_SIGSEGV);
}
#endif
--
1.9.1
- [Qemu-devel] [PATCH 0/6] linux-user: Handle SEGV on signal entry/exit correctly, Peter Maydell, 2016/07/28
- [Qemu-devel] [PATCH 4/6] linux-user: ARM: Give SIGSEGV if signal frame setup fails, Peter Maydell, 2016/07/28
- [Qemu-devel] [PATCH 3/6] linux-user: SIGSEGV on signal entry need not be fatal, Peter Maydell, 2016/07/28
- [Qemu-devel] [PATCH 6/6] linux-user: Implement force_sigsegv() via force_sig(),
Peter Maydell <=
- [Qemu-devel] [PATCH 2/6] linux-user: Pass si_type information to queue_signal() explicitly, Peter Maydell, 2016/07/28
- [Qemu-devel] [PATCH 1/6] linux-user: Recheck for pending synchronous signals too, Peter Maydell, 2016/07/28
- [Qemu-devel] [PATCH 5/6] linux-user: SIGSEGV from sigreturn need not be fatal, Peter Maydell, 2016/07/28