From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54713) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UrtdJ-0008Eg-P6 for qemu-devel@nongnu.org; Wed, 26 Jun 2013 13:36:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UrtdH-0005e9-CL for qemu-devel@nongnu.org; Wed, 26 Jun 2013 13:35:53 -0400 Received: from cantor2.suse.de ([195.135.220.15]:59206 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UrtdH-0005dl-1i for qemu-devel@nongnu.org; Wed, 26 Jun 2013 13:35:51 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 26 Jun 2013 19:35:32 +0200 Message-Id: <1372268143-3894-4-git-send-email-afaerber@suse.de> In-Reply-To: <1372268143-3894-1-git-send-email-afaerber@suse.de> References: <1372268143-3894-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] [PATCH qom-cpu v3 03/14] kvm: Change kvm_remove_all_breakpoints() argument to CPUState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcelo Tosatti , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Gleb Natapov , "open list:Overall" Acked-by: Paolo Bonzini Reviewed-by: Richard Henderson Signed-off-by: Andreas F=C3=A4rber --- gdbstub.c | 2 +- include/sysemu/kvm.h | 2 +- kvm-all.c | 6 +++--- kvm-stub.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gdbstub.c b/gdbstub.c index 3101a43..9e7f7a1 100644 --- a/gdbstub.c +++ b/gdbstub.c @@ -2019,7 +2019,7 @@ static void gdb_breakpoint_remove_all(void) CPUArchState *env; =20 if (kvm_enabled()) { - kvm_remove_all_breakpoints(gdbserver_state->c_cpu); + kvm_remove_all_breakpoints(ENV_GET_CPU(gdbserver_state->c_cpu)); return; } =20 diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index c88aee9..9460d5a 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -163,7 +163,7 @@ int kvm_insert_breakpoint(CPUArchState *env, target_u= long addr, target_ulong len, int type); int kvm_remove_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type); -void kvm_remove_all_breakpoints(CPUArchState *env); +void kvm_remove_all_breakpoints(CPUState *cpu); int kvm_update_guest_debug(CPUArchState *env, unsigned long reinject_tra= p); #ifndef _WIN32 int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset); diff --git a/kvm-all.c b/kvm-all.c index d074597..ee0ee02 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1981,11 +1981,11 @@ int kvm_remove_breakpoint(CPUArchState *env, targ= et_ulong addr, return 0; } =20 -void kvm_remove_all_breakpoints(CPUArchState *env) +void kvm_remove_all_breakpoints(CPUState *cpu) { - CPUState *cpu =3D ENV_GET_CPU(env); struct kvm_sw_breakpoint *bp, *next; KVMState *s =3D cpu->kvm_state; + CPUArchState *env; =20 QTAILQ_FOREACH_SAFE(bp, &s->kvm_sw_breakpoints, entry, next) { if (kvm_arch_remove_sw_breakpoint(cpu, bp) !=3D 0) { @@ -2026,7 +2026,7 @@ int kvm_remove_breakpoint(CPUArchState *env, target= _ulong addr, return -EINVAL; } =20 -void kvm_remove_all_breakpoints(CPUArchState *env) +void kvm_remove_all_breakpoints(CPUState *cpu) { } #endif /* !KVM_CAP_SET_GUEST_DEBUG */ diff --git a/kvm-stub.c b/kvm-stub.c index 76da61e..a6c2b01 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -95,7 +95,7 @@ int kvm_remove_breakpoint(CPUArchState *env, target_ulo= ng addr, return -EINVAL; } =20 -void kvm_remove_all_breakpoints(CPUArchState *env) +void kvm_remove_all_breakpoints(CPUState *cpu) { } =20 --=20 1.8.1.4