diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-05-27 02:06:09 +0200 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-06-28 13:25:13 +0200 |
| commit | 64f6b3469d5983141707dfc5ec2e8f5f60af1ba0 (patch) | |
| tree | 4edd0b3c56ad137956441c98eb9d77ea3bffdd7e | |
| parent | 1458c363139a54f50ea336edc612d8c5e9142220 (diff) | |
| download | focaccia-qemu-64f6b3469d5983141707dfc5ec2e8f5f60af1ba0.tar.gz focaccia-qemu-64f6b3469d5983141707dfc5ec2e8f5f60af1ba0.zip | |
gdbstub: Set gdb_set_stop_cpu() argument to CPUState
Use CPUState::env_ptr for now. Prepares for changing cpu_handle_guest_debug() argument to CPUState. Reviewed-by: Richard Henderson <rth@twiddle.net> Signed-off-by: Andreas Färber <afaerber@suse.de>
| -rw-r--r-- | cpus.c | 2 | ||||
| -rw-r--r-- | gdbstub.c | 4 | ||||
| -rw-r--r-- | include/exec/gdbstub.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/cpus.c b/cpus.c index 12f6f328a3..54accede3a 100644 --- a/cpus.c +++ b/cpus.c @@ -463,7 +463,7 @@ static void cpu_handle_guest_debug(CPUArchState *env) { CPUState *cpu = ENV_GET_CPU(env); - gdb_set_stop_cpu(env); + gdb_set_stop_cpu(cpu); qemu_system_debug_request(); cpu->stopped = true; } diff --git a/gdbstub.c b/gdbstub.c index 0f15c7c344..3101a43404 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -2506,8 +2506,10 @@ static int gdb_handle_packet(GDBState *s, const char *line_buf) return RS_IDLE; } -void gdb_set_stop_cpu(CPUArchState *env) +void gdb_set_stop_cpu(CPUState *cpu) { + CPUArchState *env = cpu->env_ptr; + gdbserver_state->c_cpu = env; gdbserver_state->g_cpu = env; } diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index ba20afa091..ded4160e57 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -16,7 +16,7 @@ typedef void (*gdb_syscall_complete_cb)(CPUArchState *env, void gdb_do_syscall(gdb_syscall_complete_cb cb, const char *fmt, ...); int use_gdb_syscalls(void); -void gdb_set_stop_cpu(CPUArchState *env); +void gdb_set_stop_cpu(CPUState *cpu); void gdb_exit(CPUArchState *, int); #ifdef CONFIG_USER_ONLY int gdb_queuesig (void); |