Signed-off-by: Andreas Färber <afaer...@suse.de> --- cpus.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/cpus.c b/cpus.c index dba69bc..f629a15 100644 --- a/cpus.c +++ b/cpus.c @@ -463,10 +463,8 @@ static bool cpu_can_run(CPUState *cpu) return true; } -static void cpu_handle_guest_debug(CPUArchState *env) +static void cpu_handle_guest_debug(CPUState *cpu) { - CPUState *cpu = ENV_GET_CPU(env); - gdb_set_stop_cpu(cpu); qemu_system_debug_request(); cpu->stopped = true; @@ -759,7 +757,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) if (cpu_can_run(cpu)) { r = kvm_cpu_exec(cpu); if (r == EXCP_DEBUG) { - cpu_handle_guest_debug(env); + cpu_handle_guest_debug(cpu); } } qemu_kvm_wait_io_event(cpu); @@ -1173,7 +1171,7 @@ static void tcg_exec_all(void) if (cpu_can_run(cpu)) { r = tcg_cpu_exec(env); if (r == EXCP_DEBUG) { - cpu_handle_guest_debug(env); + cpu_handle_guest_debug(cpu); break; } } else if (cpu->stop || cpu->stopped) { -- 1.8.1.4