From 220fc402ab3765633840d05c98688c725c727529 Mon Sep 17 00:00:00 2001
From: Julian Stecklina <js@alien8.de>
Date: Mon, 16 Jan 2012 14:02:20 +0100
Subject: [PATCH] --- yaml --- r: 297125 b: refs/heads/master c:
 a52315e1d549dad80ff443151927226c11fd8c2b h: refs/heads/master i:   297123:
 ad904f51454f0e7826d9fbc6e9a93f74a31a1cba v: v3

---
 [refs]                     | 2 +-
 trunk/arch/x86/kvm/lapic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a3612e5cba38..a6b1b1b966e9 100644
--- 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
index cfdc6e0ef002..3ee1d83c695d 100644
--- 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);