Necessary for the next refactoring patch. Signed-off-by: Marcelo Tosatti Index: qemu-iothread-4/vl.c =================================================================== --- qemu-iothread-4.orig/vl.c +++ qemu-iothread-4/vl.c @@ -3504,6 +3504,7 @@ static QEMUResetEntry *first_reset_entry static int reset_requested; static int shutdown_requested; static int powerdown_requested; +static int debug_requested; int qemu_shutdown_requested(void) { @@ -3526,6 +3527,13 @@ int qemu_powerdown_requested(void) return r; } +static int qemu_debug_requested(void) +{ + int r = debug_requested; + debug_requested = 0; + return r; +} + void qemu_register_reset(QEMUResetHandler *func, void *opaque) { QEMUResetEntry **pre, *re; @@ -3955,6 +3963,8 @@ static int vm_can_run(void) return 0; if (shutdown_requested) return 0; + if (debug_requested) + return 0; return 1; } @@ -3981,6 +3991,7 @@ static void main_loop(void) ret = qemu_cpu_exec(env); if (ret == EXCP_DEBUG) { gdb_set_stop_cpu(env); + debug_requested = 1; break; } } @@ -3991,11 +4002,11 @@ static void main_loop(void) #ifdef CONFIG_PROFILER dev_time += profile_getclock() - ti; #endif - } while (ret != EXCP_DEBUG && vm_can_run()); + } while (vm_can_run()); - if (ret == EXCP_DEBUG) - vm_stop(EXCP_DEBUG); + if (qemu_debug_requested()) + vm_stop(EXCP_DEBUG); if (qemu_shutdown_requested()) { if (no_shutdown) { vm_stop(0); --