From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH qom-next 51/59] target-i386: Pass X86CPU to kvm_handle_halt() Date: Wed, 23 May 2012 05:08:14 +0200 Message-ID: <1337742502-28565-52-git-send-email-afaerber@suse.de> References: <1337742502-28565-1-git-send-email-afaerber@suse.de> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Avi Kivity (supporter:X86), Marcelo Tosatti (supporter:X86), kvm@vger.kernel.org (open list:X86) To: qemu-devel@nongnu.org Return-path: Received: from cantor2.suse.de ([195.135.220.15]:35651 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933450Ab2EWDJV (ORCPT ); Tue, 22 May 2012 23:09:21 -0400 In-Reply-To: <1337742502-28565-1-git-send-email-afaerber@suse.de> Sender: kvm-owner@vger.kernel.org List-ID: Needed for moving interrupt_request and halted fields to CPUState. Signed-off-by: Andreas F=C3=A4rber --- target-i386/kvm.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 21de2e1..f7651bf 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1757,8 +1757,10 @@ int kvm_arch_process_async_events(CPUX86State *e= nv) return env->halted; } =20 -static int kvm_handle_halt(CPUX86State *env) +static int kvm_handle_halt(X86CPU *cpu) { + CPUX86State *env =3D &cpu->env; + if (!((env->interrupt_request & CPU_INTERRUPT_HARD) && (env->eflags & IF_MASK)) && !(env->interrupt_request & CPU_INTERRUPT_NMI)) { @@ -1972,13 +1974,14 @@ static bool host_supports_vmx(void) =20 int kvm_arch_handle_exit(CPUX86State *env, struct kvm_run *run) { + X86CPU *cpu =3D x86_env_get_cpu(env); uint64_t code; int ret; =20 switch (run->exit_reason) { case KVM_EXIT_HLT: DPRINTF("handle_hlt\n"); - ret =3D kvm_handle_halt(env); + ret =3D kvm_handle_halt(cpu); break; case KVM_EXIT_SET_TPR: ret =3D 0; --=20 1.7.7 From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:45536) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1x3-0001NX-0t for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SX1ww-0005rD-2I for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:28 -0400 Received: from cantor2.suse.de ([195.135.220.15]:35649 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SX1wv-0005qS-Sf for qemu-devel@nongnu.org; Tue, 22 May 2012 23:09:21 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 23 May 2012 05:08:14 +0200 Message-Id: <1337742502-28565-52-git-send-email-afaerber@suse.de> In-Reply-To: <1337742502-28565-1-git-send-email-afaerber@suse.de> References: <1337742502-28565-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] [PATCH qom-next 51/59] target-i386: Pass X86CPU to kvm_handle_halt() 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?= , "open list:X86" , Avi Kivity Needed for moving interrupt_request and halted fields to CPUState. Signed-off-by: Andreas F=C3=A4rber --- target-i386/kvm.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 21de2e1..f7651bf 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1757,8 +1757,10 @@ int kvm_arch_process_async_events(CPUX86State *env= ) return env->halted; } =20 -static int kvm_handle_halt(CPUX86State *env) +static int kvm_handle_halt(X86CPU *cpu) { + CPUX86State *env =3D &cpu->env; + if (!((env->interrupt_request & CPU_INTERRUPT_HARD) && (env->eflags & IF_MASK)) && !(env->interrupt_request & CPU_INTERRUPT_NMI)) { @@ -1972,13 +1974,14 @@ static bool host_supports_vmx(void) =20 int kvm_arch_handle_exit(CPUX86State *env, struct kvm_run *run) { + X86CPU *cpu =3D x86_env_get_cpu(env); uint64_t code; int ret; =20 switch (run->exit_reason) { case KVM_EXIT_HLT: DPRINTF("handle_hlt\n"); - ret =3D kvm_handle_halt(env); + ret =3D kvm_handle_halt(cpu); break; case KVM_EXIT_SET_TPR: ret =3D 0; --=20 1.7.7