---

yaml --- r: 297125 b: refs/heads/master c: a52315e h: refs/heads/master i: 297123: ad904f5 v: v3
git-mirror · Mar 5, 2012 · 220fc40 · 220fc40
1 parent 0fb088b
commit 220fc40
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: b93a35532767a2cf78bdbc88730d5c28aa66b941
+refs/heads/master: a52315e1d549dad80ff443151927226c11fd8c2b
diff --git a/trunk/arch/x86/kvm/lapic.c b/trunk/arch/x86/kvm/lapic.c
@@ -433,7 +433,7 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode,
 		break;
 
 	case APIC_DM_INIT:
-		if (level) {
+		if (!trig_mode || level) {
 			result = 1;
 			vcpu->arch.mp_state = KVM_MP_STATE_INIT_RECEIVED;
 			kvm_make_request(KVM_REQ_EVENT, vcpu);