From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53228) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uoc7z-0003Ce-DQ for qemu-devel@nongnu.org; Mon, 17 Jun 2013 12:18:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uoc7y-0008On-43 for qemu-devel@nongnu.org; Mon, 17 Jun 2013 12:17:59 -0400 Received: from mail-wg0-x22b.google.com ([2a00:1450:400c:c00::22b]:36157) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uoc7x-0008Og-V8 for qemu-devel@nongnu.org; Mon, 17 Jun 2013 12:17:58 -0400 Received: by mail-wg0-f43.google.com with SMTP id z11so2565651wgg.10 for ; Mon, 17 Jun 2013 09:17:57 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <51BF36B1.1030505@redhat.com> Date: Mon, 17 Jun 2013 18:17:53 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1371398269-6213-1-git-send-email-afaerber@suse.de> <1371398269-6213-21-git-send-email-afaerber@suse.de> In-Reply-To: <1371398269-6213-21-git-send-email-afaerber@suse.de> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH qom-cpu v2 20/29] kvm: Change kvm_remove_all_breakpoints() argument to CPUState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: =?UTF-8?B?QW5kcmVhcyBGw6RyYmVy?= Cc: Marcelo Tosatti , qemu-devel@nongnu.org, Gleb Natapov , Overall Il 16/06/2013 17:57, Andreas Färber ha scritto: > Signed-off-by: Andreas Färber > --- > gdbstub.c | 2 +- > include/sysemu/kvm.h | 2 +- > kvm-all.c | 5 ++--- > kvm-stub.c | 2 +- > 4 files changed, 5 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; > > if (kvm_enabled()) { > - kvm_remove_all_breakpoints(gdbserver_state->c_cpu); > + kvm_remove_all_breakpoints(ENV_GET_CPU(gdbserver_state->c_cpu)); Planning to make gdbserver_state take a CPUState, too? Anyway, KVM changes are trivial: Acked-by: Paolo Bonzini > return; > } > > diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h > index fe8bc40..c767488 100644 > --- a/include/sysemu/kvm.h > +++ b/include/sysemu/kvm.h > @@ -163,7 +163,7 @@ int kvm_insert_breakpoint(CPUArchState *current_env, target_ulong addr, > target_ulong len, int type); > int kvm_remove_breakpoint(CPUArchState *current_env, target_ulong addr, > target_ulong len, int type); > -void kvm_remove_all_breakpoints(CPUArchState *current_env); > +void kvm_remove_all_breakpoints(CPUState *current_cpu); > int kvm_update_guest_debug(CPUArchState *env, unsigned long reinject_trap); > #ifndef _WIN32 > int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset); > diff --git a/kvm-all.c b/kvm-all.c > index 90b89cd..b3ba6aa 100644 > --- a/kvm-all.c > +++ b/kvm-all.c > @@ -1979,9 +1979,8 @@ int kvm_remove_breakpoint(CPUArchState *current_env, target_ulong addr, > return 0; > } > > -void kvm_remove_all_breakpoints(CPUArchState *current_env) > +void kvm_remove_all_breakpoints(CPUState *current_cpu) > { > - CPUState *current_cpu = ENV_GET_CPU(current_env); > struct kvm_sw_breakpoint *bp, *next; > KVMState *s = current_cpu->kvm_state; > CPUArchState *env; > @@ -2026,7 +2025,7 @@ int kvm_remove_breakpoint(CPUArchState *current_env, target_ulong addr, > return -EINVAL; > } > > -void kvm_remove_all_breakpoints(CPUArchState *current_env) > +void kvm_remove_all_breakpoints(CPUState *current_cpu) > { > } > #endif /* !KVM_CAP_SET_GUEST_DEBUG */ > diff --git a/kvm-stub.c b/kvm-stub.c > index 5457fe8..f614f92 100644 > --- a/kvm-stub.c > +++ b/kvm-stub.c > @@ -95,7 +95,7 @@ int kvm_remove_breakpoint(CPUArchState *current_env, target_ulong addr, > return -EINVAL; > } > > -void kvm_remove_all_breakpoints(CPUArchState *current_env) > +void kvm_remove_all_breakpoints(CPUState *current_cpu) > { > } > >