From 3df1df6bb1e9ccb92adc7e5a064f96bb2948656d Mon Sep 17 00:00:00 2001
From: Gleb Natapov <gleb@redhat.com>
Date: Mon, 10 Dec 2012 14:05:55 +0200
Subject: [PATCH] --- yaml --- r: 356783 b: refs/heads/master c:
 f3200d00ea42e485772ff92d6d649aa8eeb640c0 h: refs/heads/master i:   356781:
 3416044581a4835852a974927576a09501ec058f   356779:
 71e03415cba002857cab33edc186478f89b09be1   356775:
 7e2109a3450454ff611892f88ba437e9f68c3730   356767:
 cabfdb0a1f8cda0e6f94981332ec76609d4bd986 v: v3

---
 [refs]                     |  2 +-
 trunk/arch/x86/kvm/i8259.c |  2 ++
 trunk/arch/x86/kvm/irq.c   | 26 ++++++++------------------
 3 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/[refs] b/[refs]
index 0b3298d92e1b..9b3ae937ad2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5e2c688351f4aee9981918661b6c1679f4155f06
+refs/heads/master: f3200d00ea42e485772ff92d6d649aa8eeb640c0
diff --git a/trunk/arch/x86/kvm/i8259.c b/trunk/arch/x86/kvm/i8259.c
index 848206df0967..cc31f7c06d3d 100644
--- a/trunk/arch/x86/kvm/i8259.c
+++ b/trunk/arch/x86/kvm/i8259.c
@@ -241,6 +241,8 @@ int kvm_pic_read_irq(struct kvm *kvm)
 	int irq, irq2, intno;
 	struct kvm_pic *s = pic_irqchip(kvm);
 
+	s->output = 0;
+
 	pic_lock(s);
 	irq = pic_get_irq(&s->pics[0]);
 	if (irq >= 0) {
diff --git a/trunk/arch/x86/kvm/irq.c b/trunk/arch/x86/kvm/irq.c
index 7e06ba1618bd..ebd98d0c4f6e 100644
--- a/trunk/arch/x86/kvm/irq.c
+++ b/trunk/arch/x86/kvm/irq.c
@@ -48,14 +48,10 @@ int kvm_cpu_has_interrupt(struct kvm_vcpu *v)
 	if (!irqchip_in_kernel(v->kvm))
 		return v->arch.interrupt.pending;
 
-	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;
+	if (kvm_apic_accept_pic_intr(v) && pic_irqchip(v->kvm)->output)
+		return pic_irqchip(v->kvm)->output;	/* PIC */
+
+	return kvm_apic_has_interrupt(v) != -1;	/* LAPIC */
 }
 EXPORT_SYMBOL_GPL(kvm_cpu_has_interrupt);
 
@@ -65,20 +61,14 @@ EXPORT_SYMBOL_GPL(kvm_cpu_has_interrupt);
 int kvm_cpu_get_interrupt(struct kvm_vcpu *v)
 {
 	struct kvm_pic *s;
-	int vector;
 
 	if (!irqchip_in_kernel(v->kvm))
 		return v->arch.interrupt.nr;
 
-	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(v->kvm);
-		}
-	}
-	return vector;
+	if (kvm_apic_accept_pic_intr(v) && pic_irqchip(v->kvm)->output)
+		return kvm_pic_read_irq(v->kvm);	/* PIC */
+
+	return kvm_get_apic_interrupt(v);	/* APIC */
 }
 EXPORT_SYMBOL_GPL(kvm_cpu_get_interrupt);