From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42623) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Usb1v-0007hL-1F 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-0003j8-CR for qemu-devel@nongnu.org; Fri, 28 Jun 2013 11:56:10 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44170 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Usb1o-0003iD-3j for qemu-devel@nongnu.org; Fri, 28 Jun 2013 11:56:04 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 822BFA5527 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:41 +0200 Message-Id: <1372434946-18489-20-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 19/24] cpus: Change cpu_handle_guest_debug() 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?= CPUArchState is no longer needed. Prepares for changing qemu_kvm_cpu_thread_fn() opaque to CPUState. Reviewed-by: Richard Henderson Signed-off-by: Andreas F=C3=A4rber --- cpus.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cpus.c b/cpus.c index 54acced..6016891 100644 --- a/cpus.c +++ b/cpus.c @@ -459,10 +459,8 @@ static bool cpu_can_run(CPUState *cpu) return true; } =20 -static void cpu_handle_guest_debug(CPUArchState *env) +static void cpu_handle_guest_debug(CPUState *cpu) { - CPUState *cpu =3D ENV_GET_CPU(env); - gdb_set_stop_cpu(cpu); qemu_system_debug_request(); cpu->stopped =3D true; @@ -754,7 +752,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg) if (cpu_can_run(cpu)) { r =3D kvm_cpu_exec(cpu); if (r =3D=3D EXCP_DEBUG) { - cpu_handle_guest_debug(env); + cpu_handle_guest_debug(cpu); } } qemu_kvm_wait_io_event(cpu); @@ -1172,7 +1170,7 @@ static void tcg_exec_all(void) if (cpu_can_run(cpu)) { r =3D tcg_cpu_exec(env); if (r =3D=3D EXCP_DEBUG) { - cpu_handle_guest_debug(env); + cpu_handle_guest_debug(cpu); break; } } else if (cpu->stop || cpu->stopped) { --=20 1.8.1.4