ivshmem: Fix 64 bit memory bar configuration

[mirror_qemu.git] / cpu-exec-common.c

diff --git a/cpu-exec-common.c b/cpu-exec-common.c
index 6bdda6b6b0e3657338150e641b15a2ef6da6c222..0cb4ae60eff91c25dd2986e5d29bcc59e7f36fdf 100644 (file)
--- a/cpu-exec-common.c
+++ b/cpu-exec-common.c
@@ -20,16 +20,14 @@
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "sysemu/cpus.h"
+#include "exec/exec-all.h"
 #include "exec/memory-internal.h"
 
 bool exit_request;
 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)
+/* exit the current TB, but without causing any exception to be raised */
+void cpu_loop_exit_noexc(CPUState *cpu)
 {
     /* XXX: restore cpu registers saved in host registers */
 
@@ -37,6 +35,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()) {