From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Usb1m-0007Z5-S4 for qemu-devel@nongnu.org; Fri, 28 Jun 2013 11:56:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Usb1k-0003fk-DJ for qemu-devel@nongnu.org; Fri, 28 Jun 2013 11:56:02 -0400 Received: from cantor2.suse.de ([195.135.220.15]:44141 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Usb1k-0003fM-3b for qemu-devel@nongnu.org; Fri, 28 Jun 2013 11:56:00 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Fri, 28 Jun 2013 17:55:35 +0200 Message-Id: <1372434946-18489-14-git-send-email-afaerber@suse.de> In-Reply-To: <1372434946-18489-1-git-send-email-afaerber@suse.de> References: <1372434946-18489-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 13/24] kvm: Change kvm_set_signal_mask() argument to CPUState List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Marcelo Tosatti , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Gleb Natapov , "open list:Overall" CPUArchState is no longer needed. Prepares for changing qemu_kvm_init_cpu_signals() argument to CPUState. Acked-by: Paolo Bonzini Reviewed-by: Richard Henderson Signed-off-by: Andreas F=C3=A4rber --- 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 37369ae..7d6b166 100644 --- a/cpus.c +++ b/cpus.c @@ -570,6 +570,7 @@ static void dummy_signal(int sig) =20 static void qemu_kvm_init_cpu_signals(CPUArchState *env) { + CPUState *cpu =3D ENV_GET_CPU(env); int r; sigset_t set; struct sigaction sigact; @@ -581,7 +582,7 @@ static void qemu_kvm_init_cpu_signals(CPUArchState *e= nv) pthread_sigmask(SIG_BLOCK, NULL, &set); sigdelset(&set, SIG_IPI); sigdelset(&set, SIGBUS); - r =3D kvm_set_signal_mask(env, &set); + r =3D 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_tra= p); #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 =20 int kvm_on_sigbus_vcpu(CPUState *cpu, int code, void *addr); diff --git a/kvm-all.c b/kvm-all.c index eee294b..f1031e0 100644 --- a/kvm-all.c +++ b/kvm-all.c @@ -2039,9 +2039,8 @@ void kvm_remove_all_breakpoints(CPUArchState *curre= nt_env) } #endif /* !KVM_CAP_SET_GUEST_DEBUG */ =20 -int kvm_set_signal_mask(CPUArchState *env, const sigset_t *sigset) +int kvm_set_signal_mask(CPUState *cpu, const sigset_t *sigset) { - CPUState *cpu =3D ENV_GET_CPU(env); struct kvm_signal_mask *sigmask; int r; =20 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) } =20 #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(); } --=20 1.8.1.4