From 1f74255ebfd772de88ceb1b01f927d760b45554f Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Mon, 3 May 2010 17:38:06 +0300
Subject: [PATCH] --- yaml --- r: 202361 b: refs/heads/master c:
 36633f32ba4c238403d19584754b30fe469d6dcb h: refs/heads/master i:   202359:
 a43e1e4123889cb99d990830f7ba4735ec5f8a82 v: v3

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

diff --git a/[refs] b/[refs]
index 0927a8e43e49..a68e6f180a74 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 073d46133ab0b42154f6b8429f4f66dbe2760bda
+refs/heads/master: 36633f32ba4c238403d19584754b30fe469d6dcb
diff --git a/trunk/arch/x86/kvm/i8259.c b/trunk/arch/x86/kvm/i8259.c
index caf6e1b3d957..bc10f0bd3819 100644
--- a/trunk/arch/x86/kvm/i8259.c
+++ b/trunk/arch/x86/kvm/i8259.c
@@ -176,10 +176,7 @@ static void pic_update_irq(struct kvm_pic *s)
 		pic_set_irq1(&s->pics[0], 2, 0);
 	}
 	irq = pic_get_irq(&s->pics[0]);
-	if (irq >= 0)
-		pic_irq_request(s->kvm, 1);
-	else
-		pic_irq_request(s->kvm, 0);
+	pic_irq_request(s->kvm, irq >= 0);
 }
 
 void kvm_pic_update_irq(struct kvm_pic *s)