lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "KVM: Fix race between nmi injection and enabling nmi window"

Browse Source 
This reverts commit f86368493e.

Simpler fix to follow.

Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Marcelo Tosatti
2011-04-01 11:25:03 -03:00
committed by Avi Kivity
parent 3291892450
commit c761e5868e
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/x86/kvm/x86.c
View File

@@ -361,8 +361,8 @@ void kvm_propagate_fault(struct kvm_vcpu *vcpu, struct x86_exception *fault)
void kvm_inject_nmi(struct kvm_vcpu *vcpu) void kvm_inject_nmi(struct kvm_vcpu *vcpu)
{ {
kvm_make_request(KVM_REQ_NMI, vcpu);
kvm_make_request(KVM_REQ_EVENT, vcpu); kvm_make_request(KVM_REQ_EVENT, vcpu);
vcpu->arch.nmi_pending = 1;
} }
EXPORT_SYMBOL_GPL(kvm_inject_nmi); EXPORT_SYMBOL_GPL(kvm_inject_nmi);
@@ -5208,8 +5208,6 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
r = 1; r = 1;
goto out; goto out;
} }
if (kvm_check_request(KVM_REQ_NMI, vcpu))
vcpu->arch.nmi_pending = true;
} }
r = kvm_mmu_reload(vcpu); r = kvm_mmu_reload(vcpu);

1
include/linux/kvm_host.h
View File

@@ -43,7 +43,6 @@
#define KVM_REQ_DEACTIVATE_FPU 10 #define KVM_REQ_DEACTIVATE_FPU 10
#define KVM_REQ_EVENT 11 #define KVM_REQ_EVENT 11
#define KVM_REQ_APF_HALT 12 #define KVM_REQ_APF_HALT 12
#define KVM_REQ_NMI 13
#define KVM_USERSPACE_IRQ_SOURCE_ID 0 #define KVM_USERSPACE_IRQ_SOURCE_ID 0