From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42613) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Usb1u-0007h6-Jj for qemu-devel@nongnu.org; Fri, 28 Jun 2013 11:56:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Usb1o-0003is-8c for qemu-devel@nongnu.org; Fri, 28 Jun 2013 11:56:10 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44169 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Usb1o-0003i1-08 for qemu-devel@nongnu.org; Fri, 28 Jun 2013 11:56:04 -0400 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 6CFCDA5511 for ; Fri, 28 Jun 2013 17:56:03 +0200 (CEST) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 28 Jun 2013 17:55:40 +0200 Message-Id: <1372434946-18489-19-git-send-email-afaerber@suse.de> In-Reply-To: <1372434946-18489-1-git-send-email-afaerber@suse.de> References: <1372434946-18489-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PULL 18/24] gdbstub: Set gdb_set_stop_cpu() argument to CPUState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= Use CPUState::env_ptr for now. Prepares for changing cpu_handle_guest_debug() argument to CPUState. Reviewed-by: Richard Henderson Signed-off-by: Andreas F=C3=A4rber --- cpus.c | 2 +- gdbstub.c | 4 +++- include/exec/gdbstub.h | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cpus.c b/cpus.c index 12f6f32..54acced 100644 --- a/cpus.c +++ b/cpus.c @@ -463,7 +463,7 @@ static void cpu_handle_guest_debug(CPUArchState *env) { CPUState *cpu =3D ENV_GET_CPU(env); =20 - gdb_set_stop_cpu(env); + gdb_set_stop_cpu(cpu); qemu_system_debug_request(); cpu->stopped =3D true; } diff --git a/gdbstub.c b/gdbstub.c index 0f15c7c..3101a43 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -2506,8 +2506,10 @@ static int gdb_handle_packet(GDBState *s, const ch= ar *line_buf) return RS_IDLE; } =20 -void gdb_set_stop_cpu(CPUArchState *env) +void gdb_set_stop_cpu(CPUState *cpu) { + CPUArchState *env =3D cpu->env_ptr; + gdbserver_state->c_cpu =3D env; gdbserver_state->g_cpu =3D env; } diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index ba20afa..ded4160 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -16,7 +16,7 @@ typedef void (*gdb_syscall_complete_cb)(CPUArchState *e= nv, =20 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); --=20 1.8.1.4