Merge tag 'pull-target-arm-20230908' of https://git.linaro.org/people/pmaydell/qemu...

[mirror_qemu.git] / bsd-user / signal.c

diff --git a/bsd-user/signal.c b/bsd-user/signal.c
index 0bc6d2edbd9312f140acffb133d5bc841ae41f83..4db85a3485e008af640441c9e638ef74a937828a 100644 (file)
--- a/bsd-user/signal.c
+++ b/bsd-user/signal.c
@@ -19,7 +19,9 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/log.h"
 #include "qemu.h"
+#include "gdbstub/user.h"
 #include "signal-common.h"
 #include "trace.h"
 #include "hw/core/tcg-cpu-ops.h"
@@ -346,7 +348,8 @@ static int core_dump_signal(int sig)
 }
 
 /* Abort execution with signal. */
-static void QEMU_NORETURN dump_core_and_abort(int target_sig)
+static G_NORETURN
+void dump_core_and_abort(int target_sig)
 {
     CPUArchState *env = thread_cpu->env_ptr;
     CPUState *cpu = env_cpu(env);
@@ -784,10 +787,7 @@ static int reset_signal_mask(target_ucontext_t *ucontext)
     TaskState *ts = (TaskState *)thread_cpu->opaque;
 
     for (i = 0; i < TARGET_NSIG_WORDS; i++) {
-        if (__get_user(target_set.__bits[i],
-                    &ucontext->uc_sigmask.__bits[i])) {
-            return -TARGET_EFAULT;
-        }
+        __get_user(target_set.__bits[i], &ucontext->uc_sigmask.__bits[i]);
     }
     target_to_host_sigset_internal(&blocked, &target_set);
     ts->signal_mask = blocked;