From b7674e506102b11b5fd2c10dd5707f2685e4ed93 Mon Sep 17 00:00:00 2001 From: Marcelo Tosatti Date: Fri, 1 Apr 2011 11:25:03 -0300 Subject: [PATCH] --- yaml --- r: 247993 b: refs/heads/master c: c761e5868e6737abe0464636ebd7fcbb6814c626 h: refs/heads/master i: 247991: bb8d96783dc156b5891a8fc6ce22a3d84a09d7d2 v: v3 --- [refs] | 2 +- trunk/arch/x86/kvm/x86.c | 4 +--- trunk/include/linux/kvm_host.h | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 9e332d329311..b7ec7e5d2814 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3291892450e670c4f170e271cd0c4b63d5a8e41a +refs/heads/master: c761e5868e6737abe0464636ebd7fcbb6814c626 diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c index a38fb9bb342b..b9402d5fa0e9 100644 --- a/trunk/arch/x86/kvm/x86.c +++ b/trunk/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/trunk/include/linux/kvm_host.h b/trunk/include/linux/kvm_host.h index 57d7092d7717..7ca831e55186 100644 --- a/trunk/include/linux/kvm_host.h +++ b/trunk/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