From bb8d96783dc156b5891a8fc6ce22a3d84a09d7d2 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Wed, 23 Mar 2011 15:02:47 +0200 Subject: [PATCH] --- yaml --- r: 247991 b: refs/heads/master c: 654f06fc651b01782015185e5b049197255463a3 h: refs/heads/master i: 247989: c72d95b198c4270050091ba9d493b70f6f8cc80e 247987: 95632a9141f617f9e52bc3dd7c35118717dc436e 247983: 6e679cbd4c6a15748a4d1a864c786a82a8bb7035 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/vmx.c | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 44b0da84ad15..316690d606ea 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89a9fb78b5bd8bece353449079726556ecab41df +refs/heads/master: 654f06fc651b01782015185e5b049197255463a3 diff --git a/trunk/arch/x86/kvm/vmx.c b/trunk/arch/x86/kvm/vmx.c index 1bdb49de6a22..2b99ae72481f 100644 --- a/trunk/arch/x86/kvm/vmx.c +++ b/trunk/arch/x86/kvm/vmx.c @@ -3532,11 +3532,7 @@ static int handle_task_switch(struct kvm_vcpu *vcpu) switch (type) { case INTR_TYPE_NMI_INTR: vcpu->arch.nmi_injected = false; - if (cpu_has_virtual_nmis()) { - vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO, - GUEST_INTR_STATE_NMI); - vmx->nmi_known_unmasked = false; - } + vmx_set_nmi_mask(vcpu, true); break; case INTR_TYPE_EXT_INTR: case INTR_TYPE_SOFT_INTR: @@ -3991,9 +3987,7 @@ static void __vmx_complete_interrupts(struct vcpu_vmx *vmx, * Clear bit "block by NMI" before VM entry if a NMI * delivery faulted. */ - vmcs_clear_bits(GUEST_INTERRUPTIBILITY_INFO, - GUEST_INTR_STATE_NMI); - vmx->nmi_known_unmasked = true; + vmx_set_nmi_mask(&vmx->vcpu, false); break; case INTR_TYPE_SOFT_EXCEPTION: vmx->vcpu.arch.event_exit_inst_len =