From 48d3182e6652c9c3a7c7b30efa61624c8aae9672 Mon Sep 17 00:00:00 2001
From: Avi Kivity <avi@redhat.com>
Date: Mon, 30 Aug 2010 12:18:24 +0300
Subject: [PATCH] --- yaml --- r: 215813 b: refs/heads/master c:
 9ed049c3b6230b68985da31f8243d4bec95e0b3a h: refs/heads/master i:   215811:
 b6567d74112551c185a40ab31b6b8d751a3bd977 v: v3

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

diff --git a/[refs] b/[refs]
index 1ad3eb84bb3b..b4f4cf11a76b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7d9ddaedd8a9d0442fda5b5a90f22a33becbd235
+refs/heads/master: 9ed049c3b6230b68985da31f8243d4bec95e0b3a
diff --git a/trunk/arch/x86/kvm/i8259.c b/trunk/arch/x86/kvm/i8259.c
index 4b7b73ce2098..6e77471951e8 100644
--- a/trunk/arch/x86/kvm/i8259.c
+++ b/trunk/arch/x86/kvm/i8259.c
@@ -308,13 +308,17 @@ static void pic_ioport_write(void *opaque, u32 addr, u32 val)
 	addr &= 1;
 	if (addr == 0) {
 		if (val & 0x10) {
-			kvm_pic_reset(s);	/* init */
-			/*
-			 * deassert a pending interrupt
-			 */
-			pic_irq_request(s->pics_state->kvm, 0);
-			s->init_state = 1;
 			s->init4 = val & 1;
+			s->last_irr = 0;
+			s->imr = 0;
+			s->priority_add = 0;
+			s->special_mask = 0;
+			s->read_reg_select = 0;
+			if (!s->init4) {
+				s->special_fully_nested_mode = 0;
+				s->auto_eoi = 0;
+			}
+			s->init_state = 1;
 			if (val & 0x02)
 				printk(KERN_ERR "single mode not supported");
 			if (val & 0x08)