From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52807) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uoc69-0000Mw-T7 for qemu-devel@nongnu.org; Mon, 17 Jun 2013 12:16:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Uoc64-0007nS-Th for qemu-devel@nongnu.org; Mon, 17 Jun 2013 12:16:05 -0400 Received: from mail-wi0-x236.google.com ([2a00:1450:400c:c05::236]:42000) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Uoc64-0007nA-OY for qemu-devel@nongnu.org; Mon, 17 Jun 2013 12:16:00 -0400 Received: by mail-wi0-f182.google.com with SMTP id m6so2352195wiv.9 for ; Mon, 17 Jun 2013 09:16:00 -0700 (PDT) Sender: Paolo Bonzini Message-ID: <51BF363A.1010202@redhat.com> Date: Mon, 17 Jun 2013 18:15:54 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1371398269-6213-1-git-send-email-afaerber@suse.de> <1371398269-6213-8-git-send-email-afaerber@suse.de> In-Reply-To: <1371398269-6213-8-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 07/29] kvm: Change kvm_set_signal_mask() 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: > CPUArchState is no longer needed. > > Signed-off-by: Andreas Färber > --- > 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