diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-05-17 15:18:03 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-06-09 15:55:02 +0100 |
| commit | f213e72f2356b77768b9cb73814a3b26ad5a0099 (patch) | |
| tree | f49afba3203cac181be2cc1b5db37ac4fc584ab9 /cpu-exec-common.c | |
| parent | 75809229bbf28b371afce14921ff5be98ddc5faa (diff) | |
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 <peter.maydell@linaro.org>
Reviewed-by: Sergey Fedorov <sergey.fedorov@linaro.org>
Acked-by: Eduardo Habkost <ehabkost@redhat.com>
Acked-by: Riku Voipio <riku.voipio@linaro.org>
Message-id: 1463494687-25947-3-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'cpu-exec-common.c')
| -rw-r--r-- | cpu-exec-common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpu-exec-common.c b/cpu-exec-common.c index 132cd03cde..0cb5b6381b 100644 --- a/cpu-exec-common.c +++ b/cpu-exec-common.c @@ -29,7 +29,6 @@ CPUState *tcg_current_cpu; /* exit the current TB from a signal handler. The host registers are restored in a state compatible with the CPU emulator */ -#if defined(CONFIG_SOFTMMU) void cpu_resume_from_signal(CPUState *cpu, void *puc) { /* XXX: restore cpu registers saved in host registers */ @@ -38,6 +37,7 @@ void cpu_resume_from_signal(CPUState *cpu, void *puc) siglongjmp(cpu->jmp_env, 1); } +#if defined(CONFIG_SOFTMMU) void cpu_reloading_memory_map(void) { if (qemu_in_vcpu_thread()) { |