diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2011-04-01 11:25:03 -0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-05-11 07:56:57 -0400 |
| commit | c761e5868e6737abe0464636ebd7fcbb6814c626 (patch) | |
| tree | 5a185274864ab3cc400ba72087c8dc75c8e138bb | |
| parent | 3291892450e670c4f170e271cd0c4b63d5a8e41a (diff) | |
| download | kernel_samsung_smdk4412-c761e5868e6737abe0464636ebd7fcbb6814c626.zip kernel_samsung_smdk4412-c761e5868e6737abe0464636ebd7fcbb6814c626.tar.gz kernel_samsung_smdk4412-c761e5868e6737abe0464636ebd7fcbb6814c626.tar.bz2 | |
Revert "KVM: Fix race between nmi injection and enabling nmi window"
This reverts commit f86368493ec038218e8663cc1b6e5393cd8e008a.
Simpler fix to follow.
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | arch/x86/kvm/x86.c | 4 | ||||
| -rw-r--r-- | include/linux/kvm_host.h | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index a38fb9b..b9402d5 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -361,8 +361,8 @@ void kvm_propagate_fault(struct kvm_vcpu *vcpu, struct x86_exception *fault) void kvm_inject_nmi(struct kvm_vcpu *vcpu) { - kvm_make_request(KVM_REQ_NMI, vcpu); kvm_make_request(KVM_REQ_EVENT, vcpu); + vcpu->arch.nmi_pending = 1; } EXPORT_SYMBOL_GPL(kvm_inject_nmi); @@ -5208,8 +5208,6 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) r = 1; goto out; } - if (kvm_check_request(KVM_REQ_NMI, vcpu)) - vcpu->arch.nmi_pending = true; } r = kvm_mmu_reload(vcpu); diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index 57d7092..7ca831e 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@ -43,7 +43,6 @@ #define KVM_REQ_DEACTIVATE_FPU 10 #define KVM_REQ_EVENT 11 #define KVM_REQ_APF_HALT 12 -#define KVM_REQ_NMI 13 #define KVM_USERSPACE_IRQ_SOURCE_ID 0 |