kvm: fix kvm reboot crash when MAXSMP is used

[safe/jmp/linux-2.6] / virt / kvm / irq_comm.c

diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c
index be8aba7..864ac54 100644 (file)
--- a/virt/kvm/irq_comm.c
+++ b/virt/kvm/irq_comm.c
@@ -21,9 +21,7 @@
 
 #include <linux/kvm_host.h>
 
-#ifdef CONFIG_X86
 #include <asm/msidef.h>
-#endif
 
 #include "irq.h"
 
@@ -48,7 +46,7 @@ static int kvm_set_ioapic_irq(struct kvm_kernel_irq_routing_entry *e,
 static int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e,
                       struct kvm *kvm, int level)
 {
-       int vcpu_id;
+       int vcpu_id, r = -1;
        struct kvm_vcpu *vcpu;
        struct kvm_ioapic *ioapic = ioapic_irqchip(kvm);
        int dest_id = (e->msi.address_lo & MSI_ADDR_DEST_ID_MASK)
@@ -73,7 +71,7 @@ static int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e,
                vcpu = kvm_get_lowest_prio_vcpu(ioapic->kvm, vector,
                                deliver_bitmask);
                if (vcpu != NULL)
-                       kvm_apic_set_irq(vcpu, vector, trig_mode);
+                       r = kvm_apic_set_irq(vcpu, vector, trig_mode);
                else
                        printk(KERN_INFO "kvm: null lowest priority vcpu!\n");
                break;
@@ -83,14 +81,17 @@ static int kvm_set_msi(struct kvm_kernel_irq_routing_entry *e,
                                continue;
                        deliver_bitmask &= ~(1 << vcpu_id);
                        vcpu = ioapic->kvm->vcpus[vcpu_id];
-                       if (vcpu)
-                               kvm_apic_set_irq(vcpu, vector, trig_mode);
+                       if (vcpu) {
+                               if (r < 0)
+                                       r = 0;
+                               r += kvm_apic_set_irq(vcpu, vector, trig_mode);
+                       }
                }
                break;
        default:
                break;
        }
-       return 1;
+       return r;
 }
 
 /* This should be called with the kvm->lock mutex held
@@ -232,8 +233,8 @@ void kvm_free_irq_routing(struct kvm *kvm)
        __kvm_free_irq_routing(&kvm->irq_routing);
 }
 
-int setup_routing_entry(struct kvm_kernel_irq_routing_entry *e,
-                       const struct kvm_irq_routing_entry *ue)
+static int setup_routing_entry(struct kvm_kernel_irq_routing_entry *e,
+                              const struct kvm_irq_routing_entry *ue)
 {
        int r = -EINVAL;
        int delta;