From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PULL 05/43] kvm: Free current_cpu identifier Date: Wed, 10 Jul 2013 16:33:42 +0200 Message-ID: <1373466860-32732-6-git-send-email-afaerber@suse.de> References: <1373466860-32732-1-git-send-email-afaerber@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Gleb Natapov , Paolo Bonzini , kvm@vger.kernel.org (open list:Overall) To: qemu-devel@nongnu.org Return-path: Received: from cantor2.suse.de ([195.135.220.15]:60952 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754423Ab3GJOed (ORCPT ); Wed, 10 Jul 2013 10:34:33 -0400 In-Reply-To: <1373466860-32732-1-git-send-email-afaerber@suse.de> Sender: kvm-owner@vger.kernel.org List-ID: Since CPU loops are done as last step in kvm_{insert,remove}_breakpoint= () and kvm_remove_all_breakpoints(), we do not need to distinguish between invoking CPU and iterated CPUs and can thereby free the identifier for use as a global variable. Acked-by: Paolo Bonzini Signed-off-by: Andreas F=C3=A4rber --- include/sysemu/kvm.h | 10 +++++----- kvm-all.c | 39 +++++++++++++++++---------------------- kvm-stub.c | 6 +++--- 3 files changed, 25 insertions(+), 30 deletions(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index a14cfe9..7596aca 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -169,11 +169,11 @@ void *kvm_arch_ram_alloc(ram_addr_t size); void kvm_setup_guest_memory(void *start, size_t size); void kvm_flush_coalesced_mmio_buffer(void); =20 -int kvm_insert_breakpoint(CPUArchState *current_env, target_ulong addr= , +int kvm_insert_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type); -int kvm_remove_breakpoint(CPUArchState *current_env, target_ulong addr= , +int kvm_remove_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type); -void kvm_remove_all_breakpoints(CPUArchState *current_env); +void kvm_remove_all_breakpoints(CPUArchState *env); int kvm_update_guest_debug(CPUArchState *env, unsigned long reinject_t= rap); #ifndef _WIN32 int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset); @@ -252,9 +252,9 @@ struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CP= UState *cpu, =20 int kvm_sw_breakpoints_active(CPUState *cpu); =20 -int kvm_arch_insert_sw_breakpoint(CPUState *current_cpu, +int kvm_arch_insert_sw_breakpoint(CPUState *cpu, struct kvm_sw_breakpoint *bp); -int kvm_arch_remove_sw_breakpoint(CPUState *current_cpu, +int kvm_arch_remove_sw_breakpoint(CPUState *cpu, struct kvm_sw_breakpoint *bp); int kvm_arch_insert_hw_breakpoint(target_ulong addr, target_ulong len, int type); diff --git a/kvm-all.c b/kvm-all.c index de658de..ed13d57 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1903,16 +1903,15 @@ int kvm_update_guest_debug(CPUArchState *env, u= nsigned long reinject_trap) return data.err; } =20 -int kvm_insert_breakpoint(CPUArchState *current_env, target_ulong addr= , +int kvm_insert_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type) { - CPUState *current_cpu =3D ENV_GET_CPU(current_env); + CPUState *cpu =3D ENV_GET_CPU(env); struct kvm_sw_breakpoint *bp; - CPUArchState *env; int err; =20 if (type =3D=3D GDB_BREAKPOINT_SW) { - bp =3D kvm_find_sw_breakpoint(current_cpu, addr); + bp =3D kvm_find_sw_breakpoint(cpu, addr); if (bp) { bp->use_count++; return 0; @@ -1925,14 +1924,13 @@ int kvm_insert_breakpoint(CPUArchState *current= _env, target_ulong addr, =20 bp->pc =3D addr; bp->use_count =3D 1; - err =3D kvm_arch_insert_sw_breakpoint(current_cpu, bp); + err =3D kvm_arch_insert_sw_breakpoint(cpu, bp); if (err) { g_free(bp); return err; } =20 - QTAILQ_INSERT_HEAD(¤t_cpu->kvm_state->kvm_sw_breakpoints= , - bp, entry); + QTAILQ_INSERT_HEAD(&cpu->kvm_state->kvm_sw_breakpoints, bp, en= try); } else { err =3D kvm_arch_insert_hw_breakpoint(addr, len, type); if (err) { @@ -1949,16 +1947,15 @@ int kvm_insert_breakpoint(CPUArchState *current= _env, target_ulong addr, return 0; } =20 -int kvm_remove_breakpoint(CPUArchState *current_env, target_ulong addr= , +int kvm_remove_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type) { - CPUState *current_cpu =3D ENV_GET_CPU(current_env); + CPUState *cpu =3D ENV_GET_CPU(env); struct kvm_sw_breakpoint *bp; - CPUArchState *env; int err; =20 if (type =3D=3D GDB_BREAKPOINT_SW) { - bp =3D kvm_find_sw_breakpoint(current_cpu, addr); + bp =3D kvm_find_sw_breakpoint(cpu, addr); if (!bp) { return -ENOENT; } @@ -1968,12 +1965,12 @@ int kvm_remove_breakpoint(CPUArchState *current= _env, target_ulong addr, return 0; } =20 - err =3D kvm_arch_remove_sw_breakpoint(current_cpu, bp); + err =3D kvm_arch_remove_sw_breakpoint(cpu, bp); if (err) { return err; } =20 - QTAILQ_REMOVE(¤t_cpu->kvm_state->kvm_sw_breakpoints, bp,= entry); + QTAILQ_REMOVE(&cpu->kvm_state->kvm_sw_breakpoints, bp, entry); g_free(bp); } else { err =3D kvm_arch_remove_hw_breakpoint(addr, len, type); @@ -1991,16 +1988,14 @@ int kvm_remove_breakpoint(CPUArchState *current= _env, target_ulong addr, return 0; } =20 -void kvm_remove_all_breakpoints(CPUArchState *current_env) +void kvm_remove_all_breakpoints(CPUArchState *env) { - CPUState *current_cpu =3D ENV_GET_CPU(current_env); + CPUState *cpu =3D ENV_GET_CPU(env); struct kvm_sw_breakpoint *bp, *next; - KVMState *s =3D current_cpu->kvm_state; - CPUArchState *env; - CPUState *cpu; + KVMState *s =3D cpu->kvm_state; =20 QTAILQ_FOREACH_SAFE(bp, &s->kvm_sw_breakpoints, entry, next) { - if (kvm_arch_remove_sw_breakpoint(current_cpu, bp) !=3D 0) { + if (kvm_arch_remove_sw_breakpoint(cpu, bp) !=3D 0) { /* Try harder to find a CPU that currently sees the breakp= oint. */ for (env =3D first_cpu; env !=3D NULL; env =3D env->next_c= pu) { cpu =3D ENV_GET_CPU(env); @@ -2026,19 +2021,19 @@ int kvm_update_guest_debug(CPUArchState *env, u= nsigned long reinject_trap) return -EINVAL; } =20 -int kvm_insert_breakpoint(CPUArchState *current_env, target_ulong addr= , +int kvm_insert_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type) { return -EINVAL; } =20 -int kvm_remove_breakpoint(CPUArchState *current_env, target_ulong addr= , +int kvm_remove_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type) { return -EINVAL; } =20 -void kvm_remove_all_breakpoints(CPUArchState *current_env) +void kvm_remove_all_breakpoints(CPUArchState *env) { } #endif /* !KVM_CAP_SET_GUEST_DEBUG */ diff --git a/kvm-stub.c b/kvm-stub.c index dec7a83..583c636 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -83,19 +83,19 @@ int kvm_update_guest_debug(CPUArchState *env, unsig= ned long reinject_trap) return -ENOSYS; } =20 -int kvm_insert_breakpoint(CPUArchState *current_env, target_ulong addr= , +int kvm_insert_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type) { return -EINVAL; } =20 -int kvm_remove_breakpoint(CPUArchState *current_env, target_ulong addr= , +int kvm_remove_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type) { return -EINVAL; } =20 -void kvm_remove_all_breakpoints(CPUArchState *current_env) +void kvm_remove_all_breakpoints(CPUArchState *env) { } =20 --=20 1.8.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33199) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwvTX-0008ER-RA for qemu-devel@nongnu.org; Wed, 10 Jul 2013 10:34:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UwvTV-0003Ys-G2 for qemu-devel@nongnu.org; Wed, 10 Jul 2013 10:34:35 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60945 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UwvTV-0003YX-1L for qemu-devel@nongnu.org; Wed, 10 Jul 2013 10:34:33 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 10 Jul 2013 16:33:42 +0200 Message-Id: <1373466860-32732-6-git-send-email-afaerber@suse.de> In-Reply-To: <1373466860-32732-1-git-send-email-afaerber@suse.de> References: <1373466860-32732-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 05/43] kvm: Free current_cpu identifier List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Gleb Natapov , "open list:Overall" Since CPU loops are done as last step in kvm_{insert,remove}_breakpoint() and kvm_remove_all_breakpoints(), we do not need to distinguish between invoking CPU and iterated CPUs and can thereby free the identifier for use as a global variable. Acked-by: Paolo Bonzini Signed-off-by: Andreas F=C3=A4rber --- include/sysemu/kvm.h | 10 +++++----- kvm-all.c | 39 +++++++++++++++++---------------------- kvm-stub.c | 6 +++--- 3 files changed, 25 insertions(+), 30 deletions(-) diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h index a14cfe9..7596aca 100644 --- a/include/sysemu/kvm.h +++ b/include/sysemu/kvm.h @@ -169,11 +169,11 @@ void *kvm_arch_ram_alloc(ram_addr_t size); void kvm_setup_guest_memory(void *start, size_t size); void kvm_flush_coalesced_mmio_buffer(void); =20 -int kvm_insert_breakpoint(CPUArchState *current_env, target_ulong addr, +int kvm_insert_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type); -int kvm_remove_breakpoint(CPUArchState *current_env, target_ulong addr, +int kvm_remove_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type); -void kvm_remove_all_breakpoints(CPUArchState *current_env); +void kvm_remove_all_breakpoints(CPUArchState *env); 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); @@ -252,9 +252,9 @@ struct kvm_sw_breakpoint *kvm_find_sw_breakpoint(CPUS= tate *cpu, =20 int kvm_sw_breakpoints_active(CPUState *cpu); =20 -int kvm_arch_insert_sw_breakpoint(CPUState *current_cpu, +int kvm_arch_insert_sw_breakpoint(CPUState *cpu, struct kvm_sw_breakpoint *bp); -int kvm_arch_remove_sw_breakpoint(CPUState *current_cpu, +int kvm_arch_remove_sw_breakpoint(CPUState *cpu, struct kvm_sw_breakpoint *bp); int kvm_arch_insert_hw_breakpoint(target_ulong addr, target_ulong len, int type); diff --git a/kvm-all.c b/kvm-all.c index de658de..ed13d57 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -1903,16 +1903,15 @@ int kvm_update_guest_debug(CPUArchState *env, uns= igned long reinject_trap) return data.err; } =20 -int kvm_insert_breakpoint(CPUArchState *current_env, target_ulong addr, +int kvm_insert_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type) { - CPUState *current_cpu =3D ENV_GET_CPU(current_env); + CPUState *cpu =3D ENV_GET_CPU(env); struct kvm_sw_breakpoint *bp; - CPUArchState *env; int err; =20 if (type =3D=3D GDB_BREAKPOINT_SW) { - bp =3D kvm_find_sw_breakpoint(current_cpu, addr); + bp =3D kvm_find_sw_breakpoint(cpu, addr); if (bp) { bp->use_count++; return 0; @@ -1925,14 +1924,13 @@ int kvm_insert_breakpoint(CPUArchState *current_e= nv, target_ulong addr, =20 bp->pc =3D addr; bp->use_count =3D 1; - err =3D kvm_arch_insert_sw_breakpoint(current_cpu, bp); + err =3D kvm_arch_insert_sw_breakpoint(cpu, bp); if (err) { g_free(bp); return err; } =20 - QTAILQ_INSERT_HEAD(¤t_cpu->kvm_state->kvm_sw_breakpoints, - bp, entry); + QTAILQ_INSERT_HEAD(&cpu->kvm_state->kvm_sw_breakpoints, bp, entr= y); } else { err =3D kvm_arch_insert_hw_breakpoint(addr, len, type); if (err) { @@ -1949,16 +1947,15 @@ int kvm_insert_breakpoint(CPUArchState *current_e= nv, target_ulong addr, return 0; } =20 -int kvm_remove_breakpoint(CPUArchState *current_env, target_ulong addr, +int kvm_remove_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type) { - CPUState *current_cpu =3D ENV_GET_CPU(current_env); + CPUState *cpu =3D ENV_GET_CPU(env); struct kvm_sw_breakpoint *bp; - CPUArchState *env; int err; =20 if (type =3D=3D GDB_BREAKPOINT_SW) { - bp =3D kvm_find_sw_breakpoint(current_cpu, addr); + bp =3D kvm_find_sw_breakpoint(cpu, addr); if (!bp) { return -ENOENT; } @@ -1968,12 +1965,12 @@ int kvm_remove_breakpoint(CPUArchState *current_e= nv, target_ulong addr, return 0; } =20 - err =3D kvm_arch_remove_sw_breakpoint(current_cpu, bp); + err =3D kvm_arch_remove_sw_breakpoint(cpu, bp); if (err) { return err; } =20 - QTAILQ_REMOVE(¤t_cpu->kvm_state->kvm_sw_breakpoints, bp, e= ntry); + QTAILQ_REMOVE(&cpu->kvm_state->kvm_sw_breakpoints, bp, entry); g_free(bp); } else { err =3D kvm_arch_remove_hw_breakpoint(addr, len, type); @@ -1991,16 +1988,14 @@ int kvm_remove_breakpoint(CPUArchState *current_e= nv, target_ulong addr, return 0; } =20 -void kvm_remove_all_breakpoints(CPUArchState *current_env) +void kvm_remove_all_breakpoints(CPUArchState *env) { - CPUState *current_cpu =3D ENV_GET_CPU(current_env); + CPUState *cpu =3D ENV_GET_CPU(env); struct kvm_sw_breakpoint *bp, *next; - KVMState *s =3D current_cpu->kvm_state; - CPUArchState *env; - CPUState *cpu; + KVMState *s =3D cpu->kvm_state; =20 QTAILQ_FOREACH_SAFE(bp, &s->kvm_sw_breakpoints, entry, next) { - if (kvm_arch_remove_sw_breakpoint(current_cpu, bp) !=3D 0) { + if (kvm_arch_remove_sw_breakpoint(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); @@ -2026,19 +2021,19 @@ int kvm_update_guest_debug(CPUArchState *env, uns= igned long reinject_trap) return -EINVAL; } =20 -int kvm_insert_breakpoint(CPUArchState *current_env, target_ulong addr, +int kvm_insert_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type) { return -EINVAL; } =20 -int kvm_remove_breakpoint(CPUArchState *current_env, target_ulong addr, +int kvm_remove_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type) { return -EINVAL; } =20 -void kvm_remove_all_breakpoints(CPUArchState *current_env) +void kvm_remove_all_breakpoints(CPUArchState *env) { } #endif /* !KVM_CAP_SET_GUEST_DEBUG */ diff --git a/kvm-stub.c b/kvm-stub.c index dec7a83..583c636 100644 --- a/kvm-stub.c +++ b/kvm-stub.c @@ -83,19 +83,19 @@ int kvm_update_guest_debug(CPUArchState *env, unsigne= d long reinject_trap) return -ENOSYS; } =20 -int kvm_insert_breakpoint(CPUArchState *current_env, target_ulong addr, +int kvm_insert_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type) { return -EINVAL; } =20 -int kvm_remove_breakpoint(CPUArchState *current_env, target_ulong addr, +int kvm_remove_breakpoint(CPUArchState *env, target_ulong addr, target_ulong len, int type) { return -EINVAL; } =20 -void kvm_remove_all_breakpoints(CPUArchState *current_env) +void kvm_remove_all_breakpoints(CPUArchState *env) { } =20 --=20 1.8.1.4