From patchwork Wed Oct 31 01:00:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [35/35] target-i386: Pass X86CPU to kvm_handle_halt() Date: Tue, 30 Oct 2012 15:00:06 -0000 From: =?utf-8?q?Andreas_F=C3=A4rber_=3Cafaerber=40suse=2Ede=3E?= X-Patchwork-Id: 195701 Message-Id: <1351645206-3041-36-git-send-email-afaerber@suse.de> To: qemu-devel@nongnu.org Cc: "open list:X86" , Marcelo Tosatti , =?UTF-8?q?Andreas=20F=C3=A4rber?= , anthony@codemonkey.ws, Avi Kivity Needed for moving interrupt_request and halted fields to CPUState. Signed-off-by: Andreas Färber --- target-i386/kvm.c | 7 +++++-- 1 Datei geändert, 5 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) diff --git a/target-i386/kvm.c b/target-i386/kvm.c index 7da816f..9ccbcb5 100644 --- a/target-i386/kvm.c +++ b/target-i386/kvm.c @@ -1786,8 +1786,10 @@ int kvm_arch_process_async_events(CPUX86State *env) return env->halted; } -static int kvm_handle_halt(CPUX86State *env) +static int kvm_handle_halt(X86CPU *cpu) { + CPUX86State *env = &cpu->env; + if (!((env->interrupt_request & CPU_INTERRUPT_HARD) && (env->eflags & IF_MASK)) && !(env->interrupt_request & CPU_INTERRUPT_NMI)) { @@ -2001,13 +2003,14 @@ static bool host_supports_vmx(void) int kvm_arch_handle_exit(CPUX86State *env, struct kvm_run *run) { + X86CPU *cpu = x86_env_get_cpu(env); uint64_t code; int ret; switch (run->exit_reason) { case KVM_EXIT_HLT: DPRINTF("handle_hlt\n"); - ret = kvm_handle_halt(env); + ret = kvm_handle_halt(cpu); break; case KVM_EXIT_SET_TPR: ret = 0;