aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/x86.c
diff options
context:
space:
mode:
authorAmit Shah <amit.shah@qumranet.com>2008-08-18 15:07:05 +0300
committerAvi Kivity <avi@qumranet.com>2008-10-15 10:15:21 +0200
commit29c8fa32c5d1e2d26d53ad9467b3a13130014cdf (patch)
tree84cdc705f85678c502faf9a1b602ca9a93efc4a8 /arch/x86/kvm/x86.c
parentKVM: SVM: Fix typo (diff)
downloadlinux-dev-29c8fa32c5d1e2d26d53ad9467b3a13130014cdf.tar.xz
linux-dev-29c8fa32c5d1e2d26d53ad9467b3a13130014cdf.zip
KVM: Use kvm_set_irq to inject interrupts
... instead of using the pic and ioapic variants Signed-off-by: Amit Shah <amit.shah@qumranet.com> Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'arch/x86/kvm/x86.c')
-rw-r--r--arch/x86/kvm/x86.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index fffdf4f69c5a..5b3c8821b191 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -1956,13 +1956,7 @@ long kvm_arch_vm_ioctl(struct file *filp,
goto out;
if (irqchip_in_kernel(kvm)) {
mutex_lock(&kvm->lock);
- if (irq_event.irq < 16)
- kvm_pic_set_irq(pic_irqchip(kvm),
- irq_event.irq,
- irq_event.level);
- kvm_ioapic_set_irq(kvm->arch.vioapic,
- irq_event.irq,
- irq_event.level);
+ kvm_set_irq(kvm, irq_event.irq, irq_event.level);
mutex_unlock(&kvm->lock);
r = 0;
}