sysctl: for irda update sysctl_checks list of binary paths

[linux-2.6] / drivers / kvm / irq.c

diff --git a/drivers/kvm/irq.c b/drivers/kvm/irq.c
index b08005ca7050252454b201b7b72c000610dca6f6..7628c7ff628ff1db90f3a9a4d20df792bb59f4ad 100644 (file)
--- a/drivers/kvm/irq.c
+++ b/drivers/kvm/irq.c
@@ -30,14 +30,16 @@
  */
 int kvm_cpu_has_interrupt(struct kvm_vcpu *v)
 {
-       struct kvm_pic *s = pic_irqchip(v->kvm);
-
-       if (s->output)  /* PIC */
-               return 1;
-       /*
-        * TODO: APIC
-        */
-       return 0;
+       struct kvm_pic *s;
+
+       if (kvm_apic_has_interrupt(v) == -1) {  /* LAPIC */
+               if (kvm_apic_accept_pic_intr(v)) {
+                       s = pic_irqchip(v->kvm);        /* PIC */
+                       return s->output;
+               } else
+                       return 0;
+       }
+       return 1;
 }
 EXPORT_SYMBOL_GPL(kvm_cpu_has_interrupt);
 
@@ -46,16 +48,51 @@ EXPORT_SYMBOL_GPL(kvm_cpu_has_interrupt);
  */
 int kvm_cpu_get_interrupt(struct kvm_vcpu *v)
 {
-       struct kvm_pic *s = pic_irqchip(v->kvm);
+       struct kvm_pic *s;
        int vector;
 
-       s->output = 0;
-       vector = kvm_pic_read_irq(s);
-       if (vector != -1)
-               return vector;
-       /*
-        * TODO: APIC
-        */
-       return -1;
+       vector = kvm_get_apic_interrupt(v);     /* APIC */
+       if (vector == -1) {
+               if (kvm_apic_accept_pic_intr(v)) {
+                       s = pic_irqchip(v->kvm);
+                       s->output = 0;          /* PIC */
+                       vector = kvm_pic_read_irq(s);
+               }
+       }
+       return vector;
 }
 EXPORT_SYMBOL_GPL(kvm_cpu_get_interrupt);
+
+static void vcpu_kick_intr(void *info)
+{
+#ifdef DEBUG
+       struct kvm_vcpu *vcpu = (struct kvm_vcpu *)info;
+       printk(KERN_DEBUG "vcpu_kick_intr %p \n", vcpu);
+#endif
+}
+
+void kvm_vcpu_kick(struct kvm_vcpu *vcpu)
+{
+       int ipi_pcpu = vcpu->cpu;
+
+       if (waitqueue_active(&vcpu->wq)) {
+               wake_up_interruptible(&vcpu->wq);
+               ++vcpu->stat.halt_wakeup;
+       }
+       if (vcpu->guest_mode)
+               smp_call_function_single(ipi_pcpu, vcpu_kick_intr, vcpu, 0, 0);
+}
+
+void kvm_inject_pending_timer_irqs(struct kvm_vcpu *vcpu)
+{
+       kvm_inject_apic_timer_irqs(vcpu);
+       /* TODO: PIT, RTC etc. */
+}
+EXPORT_SYMBOL_GPL(kvm_inject_pending_timer_irqs);
+
+void kvm_timer_intr_post(struct kvm_vcpu *vcpu, int vec)
+{
+       kvm_apic_timer_intr_post(vcpu, vec);
+       /* TODO: PIT, RTC etc. */
+}
+EXPORT_SYMBOL_GPL(kvm_timer_intr_post);