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

KVM: Use kvm_set_irq to inject interrupts

Browse Source 
... 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>
This commit is contained in:
Amit Shah
2008-08-18 15:07:05 +03:00
committed by Avi Kivity
parent 94c935a1ee
commit 29c8fa32c5
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kvm/i8254.c
View File

@@ -596,10 +596,8 @@ void kvm_free_pit(struct kvm *kvm)
static void __inject_pit_timer_intr(struct kvm *kvm) static void __inject_pit_timer_intr(struct kvm *kvm)
{ {
mutex_lock(&kvm->lock); mutex_lock(&kvm->lock);
kvm_ioapic_set_irq(kvm->arch.vioapic, 0, 1); kvm_set_irq(kvm, 0, 1);
kvm_ioapic_set_irq(kvm->arch.vioapic, 0, 0); kvm_set_irq(kvm, 0, 0);
kvm_pic_set_irq(pic_irqchip(kvm), 0, 1);
kvm_pic_set_irq(pic_irqchip(kvm), 0, 0);
mutex_unlock(&kvm->lock); mutex_unlock(&kvm->lock);
} }

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

@@ -1956,13 +1956,7 @@ long kvm_arch_vm_ioctl(struct file *filp,
goto out; goto out;
if (irqchip_in_kernel(kvm)) { if (irqchip_in_kernel(kvm)) {
mutex_lock(&kvm->lock); mutex_lock(&kvm->lock);
if (irq_event.irq < 16) kvm_set_irq(kvm, irq_event.irq, irq_event.level);
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);
mutex_unlock(&kvm->lock); mutex_unlock(&kvm->lock);
r = 0; r = 0;
} }