From f213e72f2356b77768b9cb73814a3b26ad5a0099 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Tue, 17 May 2016 15:18:03 +0100 Subject: user-exec: Push resume-from-signal code out to handle_cpu_signal() Since the only caller of page_unprotect() which might cause it to need to call cpu_resume_from_signal() is handle_cpu_signal() in the user-mode code, push the longjump handling out to that function. Since this is the only caller of cpu_resume_from_signal() which passes a non-NULL puc argument, split the non-NULL handling into a new cpu_exit_tb_from_sighandler() function. This allows us to merge the softmmu and usermode implementations of the cpu_resume_from_signal() function, which are now identical. Signed-off-by: Peter Maydell Reviewed-by: Sergey Fedorov Acked-by: Eduardo Habkost Acked-by: Riku Voipio Message-id: 1463494687-25947-3-git-send-email-peter.maydell@linaro.org --- translate-all.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'translate-all.h') diff --git a/translate-all.h b/translate-all.h index 038464005f..ce6071bd9b 100644 --- a/translate-all.h +++ b/translate-all.h @@ -27,7 +27,7 @@ void tb_invalidate_phys_range(tb_page_addr_t start, tb_page_addr_t end); void tb_check_watchpoint(CPUState *cpu); #ifdef CONFIG_USER_ONLY -int page_unprotect(target_ulong address, uintptr_t pc, void *puc); +int page_unprotect(target_ulong address, uintptr_t pc); #endif #endif /* TRANSLATE_ALL_H */ -- cgit v1.2.1