From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59058) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ull4N-0000Z1-Kg for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:14:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ull4M-0000k0-9f for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:14:27 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44437 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ull4M-0000jo-3E for qemu-devel@nongnu.org; Sun, 09 Jun 2013 15:14:26 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sun, 9 Jun 2013 21:13:00 +0200 Message-Id: <1370805206-26574-34-git-send-email-afaerber@suse.de> In-Reply-To: <1370805206-26574-1-git-send-email-afaerber@suse.de> References: <1370805206-26574-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 33/59] kvm: Simplify kvm_remove_all_breakpoints() further 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" Use new qemu_for_each_cpu(). Signed-off-by: Andreas F=C3=A4rber --- kvm-all.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/kvm-all.c b/kvm-all.c index d5ed831..312106d 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1986,24 +1986,36 @@ int kvm_remove_breakpoint(CPUArchState *current_e= nv, target_ulong addr, return 0; } =20 +typedef struct KVMRemoveBreakpointData { + struct kvm_sw_breakpoint *bp; + bool removed; +} KVMRemoveBreakpointData; + +static void kvm_remove_all_breakpoints_one(CPUState *cpu, void *data) +{ + KVMRemoveBreakpointData *s =3D data; + + if (s->removed) { + return; + } + s->removed =3D kvm_arch_remove_sw_breakpoint(cpu, s->bp) =3D=3D 0; +} + void kvm_remove_all_breakpoints(CPUArchState *current_env) { CPUState *current_cpu =3D ENV_GET_CPU(current_env); struct kvm_sw_breakpoint *bp, *next; KVMState *s =3D current_cpu->kvm_state; - CPUArchState *env; - CPUState *cpu; int err; =20 QTAILQ_FOREACH_SAFE(bp, &s->kvm_sw_breakpoints, entry, next) { if (kvm_arch_remove_sw_breakpoint(current_cpu, bp) !=3D 0) { /* Try harder to find a CPU that currently sees the breakpoi= nt. */ - for (env =3D first_cpu; env !=3D NULL; env =3D env->next_cpu= ) { - cpu =3D ENV_GET_CPU(env); - if (kvm_arch_remove_sw_breakpoint(cpu, bp) =3D=3D 0) { - break; - } - } + KVMRemoveBreakpointData data =3D { + .bp =3D bp, + .removed =3D false, + }; + qemu_for_each_cpu(kvm_remove_all_breakpoints_one, &data); } QTAILQ_REMOVE(&s->kvm_sw_breakpoints, bp, entry); g_free(bp); --=20 1.8.1.4