SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cpus: Change cpu_handle_guest_debug() argument to CPUState

Browse Source 
CPUArchState is no longer needed.

Prepares for changing qemu_kvm_cpu_thread_fn() opaque to CPUState.

Reviewed-by: Richard Henderson <rth@twiddle.net>
Signed-off-by: Andreas Färber <afaerber@suse.de>
This commit is contained in:
Andreas Färber 2013-05-27 02:07:49 +02:00
parent 64f6b3469d
commit 913250464f
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cpus.c
View File

@ -459,10 +459,8 @@ static bool cpu_can_run(CPUState *cpu)
return true; 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); gdb_set_stop_cpu(cpu);
qemu_system_debug_request(); qemu_system_debug_request();
cpu->stopped = true; cpu->stopped = true;
@ -754,7 +752,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg)
if (cpu_can_run(cpu)) { if (cpu_can_run(cpu)) {
r = kvm_cpu_exec(cpu); r = kvm_cpu_exec(cpu);
if (r == EXCP_DEBUG) { if (r == EXCP_DEBUG) {
cpu_handle_guest_debug(env); cpu_handle_guest_debug(cpu);
} }
} }
qemu_kvm_wait_io_event(cpu); qemu_kvm_wait_io_event(cpu);
@ -1172,7 +1170,7 @@ static void tcg_exec_all(void)
if (cpu_can_run(cpu)) { if (cpu_can_run(cpu)) {
r = tcg_cpu_exec(env); r = tcg_cpu_exec(env);
if (r == EXCP_DEBUG) { if (r == EXCP_DEBUG) {
cpu_handle_guest_debug(env); cpu_handle_guest_debug(cpu);
break; break;
} }
} else if (cpu->stop || cpu->stopped) { } else if (cpu->stop || cpu->stopped) {