diff options
author | Gleb Natapov <gleb@redhat.com> | 2009-04-21 10:44:57 -0400 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2009-06-10 04:48:45 -0400 |
commit | 863e8e658ee9ac6e5931b295eb7428456e450a0f (patch) | |
tree | 96198a74491bd96ba81d05e3773b19951f050744 /arch/x86/kvm/x86.c | |
parent | 8061823a25218174f30c3dd943989e1d72f7d06e (diff) |
KVM: VMX: Consolidate userspace and kernel interrupt injection for VMX
Use the same callback to inject irq/nmi events no matter what irqchip is
in use. Only from VMX for now.
Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 4c2eb7c0e1fb..a84c96a7ea5e 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c | |||
@@ -3173,7 +3173,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) | |||
3173 | if (vcpu->arch.exception.pending) | 3173 | if (vcpu->arch.exception.pending) |
3174 | __queue_exception(vcpu); | 3174 | __queue_exception(vcpu); |
3175 | else if (irqchip_in_kernel(vcpu->kvm)) | 3175 | else if (irqchip_in_kernel(vcpu->kvm)) |
3176 | kvm_x86_ops->inject_pending_irq(vcpu); | 3176 | kvm_x86_ops->inject_pending_irq(vcpu, kvm_run); |
3177 | else | 3177 | else |
3178 | kvm_x86_ops->inject_pending_vectors(vcpu, kvm_run); | 3178 | kvm_x86_ops->inject_pending_vectors(vcpu, kvm_run); |
3179 | 3179 | ||