diff options
author | Amit Shah <amit.shah@qumranet.com> | 2008-08-18 08:07:05 -0400 |
---|---|---|
committer | Avi Kivity <avi@qumranet.com> | 2008-10-15 04:15:21 -0400 |
commit | 29c8fa32c5d1e2d26d53ad9467b3a13130014cdf (patch) | |
tree | 84cdc705f85678c502faf9a1b602ca9a93efc4a8 /arch/x86/kvm/i8254.c | |
parent | 94c935a1ee7a9c134f0ebed656384186619d05cb (diff) |
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/i8254.c')
-rw-r--r-- | arch/x86/kvm/i8254.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/x86/kvm/i8254.c b/arch/x86/kvm/i8254.c index c842060c6c04..fdaa0f00e478 100644 --- a/arch/x86/kvm/i8254.c +++ b/arch/x86/kvm/i8254.c | |||
@@ -596,10 +596,8 @@ void kvm_free_pit(struct kvm *kvm) | |||
596 | static void __inject_pit_timer_intr(struct kvm *kvm) | 596 | static void __inject_pit_timer_intr(struct kvm *kvm) |
597 | { | 597 | { |
598 | mutex_lock(&kvm->lock); | 598 | mutex_lock(&kvm->lock); |
599 | kvm_ioapic_set_irq(kvm->arch.vioapic, 0, 1); | 599 | kvm_set_irq(kvm, 0, 1); |
600 | kvm_ioapic_set_irq(kvm->arch.vioapic, 0, 0); | 600 | kvm_set_irq(kvm, 0, 0); |
601 | kvm_pic_set_irq(pic_irqchip(kvm), 0, 1); | ||
602 | kvm_pic_set_irq(pic_irqchip(kvm), 0, 0); | ||
603 | mutex_unlock(&kvm->lock); | 601 | mutex_unlock(&kvm->lock); |
604 | } | 602 | } |
605 | 603 | ||