---

yaml --- r: 202350 b: refs/heads/master c: aefd18f h: refs/heads/master v: v3
git-mirror · Aug 1, 2010 · 1deafa3 · 1deafa3
1 parent e70f024
commit 1deafa3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e7dca5c0eba63e4ba8e3586c4b37863fd7fadb5a
+refs/heads/master: aefd18f01ee848448d834c80e601ccff61515811
diff --git a/trunk/virt/kvm/irq_comm.c b/trunk/virt/kvm/irq_comm.c
@@ -100,7 +100,7 @@ int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src,
 			if (r < 0)
 				r = 0;
 			r += kvm_apic_set_irq(vcpu, irq);
-		} else {
+		} else if (kvm_lapic_enabled(vcpu)) {
 			if (!lowest)
 				lowest = vcpu;
 			else if (kvm_apic_compare_prio(vcpu, lowest) < 0)