Il 16/06/2013 17:57, Andreas Färber ha scritto:
> Signed-off-by: Andreas Färber <afaer...@suse.de>
> ---
> 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 <pbonz...@redhat.com>
> 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)
> {
> }
>
>
