Re: [Qemu-devel] [PATCH qom-cpu v2 07/29] kvm: Change kvm_set_signal_mask() argument to CPUState

[Paolo Bonzini]

Il 16/06/2013 17:57, Andreas Färber ha scritto:
> CPUArchState is no longer needed.
> 
> Signed-off-by: Andreas Färber <address@hidden>
> ---
>  cpus.c               | 3 ++-
>  include/sysemu/kvm.h | 2 +-
>  kvm-all.c            | 3 +--
>  kvm-stub.c           | 2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/cpus.c b/cpus.c
> index fe19962..fca5e1f 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -570,6 +570,7 @@ static void dummy_signal(int sig)
>  
>  static void qemu_kvm_init_cpu_signals(CPUArchState *env)
>  {
> +    CPUState *cpu = ENV_GET_CPU(env);
>      int r;
>      sigset_t set;
>      struct sigaction sigact;
> @@ -581,7 +582,7 @@ static void qemu_kvm_init_cpu_signals(CPUArchState *env)
>      pthread_sigmask(SIG_BLOCK, NULL, &set);
>      sigdelset(&set, SIG_IPI);
>      sigdelset(&set, SIGBUS);
> -    r = kvm_set_signal_mask(env, &set);
> +    r = kvm_set_signal_mask(cpu, &set);
>      if (r) {
>          fprintf(stderr, "kvm_set_signal_mask: %s\n", strerror(-r));
>          exit(1);
> diff --git a/include/sysemu/kvm.h b/include/sysemu/kvm.h
> index 06da2b3..5adb044 100644
> --- a/include/sysemu/kvm.h
> +++ b/include/sysemu/kvm.h
> @@ -166,7 +166,7 @@ int kvm_remove_breakpoint(CPUArchState *current_env, 
> target_ulong addr,
>  void kvm_remove_all_breakpoints(CPUArchState *current_env);
>  int kvm_update_guest_debug(CPUArchState *env, unsigned long reinject_trap);
>  #ifndef _WIN32
> -int kvm_set_signal_mask(CPUArchState *env, const sigset_t *sigset);
> +int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset);
>  #endif
>  
>  int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr);
> diff --git a/kvm-all.c b/kvm-all.c
> index e7202ff..88297b1 100644
> --- a/kvm-all.c
> +++ b/kvm-all.c
> @@ -2034,9 +2034,8 @@ void kvm_remove_all_breakpoints(CPUArchState 
> *current_env)
>  }
>  #endif /* !KVM_CAP_SET_GUEST_DEBUG */
>  
> -int kvm_set_signal_mask(CPUArchState *env, const sigset_t *sigset)
> +int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset)
>  {
> -    CPUState *cpu = ENV_GET_CPU(env);
>      struct kvm_signal_mask *sigmask;
>      int r;
>  
> diff --git a/kvm-stub.c b/kvm-stub.c
> index 128faf7..50af700 100644
> --- a/kvm-stub.c
> +++ b/kvm-stub.c
> @@ -100,7 +100,7 @@ void kvm_remove_all_breakpoints(CPUArchState *current_env)
>  }
>  
>  #ifndef _WIN32
> -int kvm_set_signal_mask(CPUArchState *env, const sigset_t *sigset)
> +int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset)
>  {
>      abort();
>  }
> 

Acked-by: Paolo Bonzini <address@hidden>