From 569be10bf76ae2b0808d2b991041735d5d623807 Mon Sep 17 00:00:00 2001
From: Eddie Dong <eddie.dong@intel.com>
Date: Wed, 10 Oct 2007 12:15:54 +0200
Subject: [PATCH] --- yaml --- r: 80677 b: refs/heads/master c:
 8c392696e749171531d155ea5cefdfc1c970fd18 h: refs/heads/master i:   80675:
 3ad2498ff86b0532a8684910dfd6c7f64ba331b5 v: v3

---
 [refs]                     |  2 +-
 trunk/drivers/kvm/ioapic.c | 17 +++++++++++++----
 trunk/drivers/kvm/irq.h    |  1 +
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index dcc3ff8a7900..6666e5be3ab7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fcceae145645ec6a4fab0a806bb674d7484d97b
+refs/heads/master: 8c392696e749171531d155ea5cefdfc1c970fd18
diff --git a/trunk/drivers/kvm/ioapic.c b/trunk/drivers/kvm/ioapic.c
index e14b7c724e67..cf1d50b3549b 100644
--- a/trunk/drivers/kvm/ioapic.c
+++ b/trunk/drivers/kvm/ioapic.c
@@ -371,18 +371,27 @@ static void ioapic_mmio_write(struct kvm_io_device *this, gpa_t addr, int len,
 	}
 }
 
+void kvm_ioapic_reset(struct kvm_ioapic *ioapic)
+{
+	int i;
+
+	for (i = 0; i < IOAPIC_NUM_PINS; i++)
+		ioapic->redirtbl[i].fields.mask = 1;
+	ioapic->base_address = IOAPIC_DEFAULT_BASE_ADDRESS;
+	ioapic->ioregsel = 0;
+	ioapic->irr = 0;
+	ioapic->id = 0;
+}
+
 int kvm_ioapic_init(struct kvm *kvm)
 {
 	struct kvm_ioapic *ioapic;
-	int i;
 
 	ioapic = kzalloc(sizeof(struct kvm_ioapic), GFP_KERNEL);
 	if (!ioapic)
 		return -ENOMEM;
 	kvm->vioapic = ioapic;
-	for (i = 0; i < IOAPIC_NUM_PINS; i++)
-		ioapic->redirtbl[i].fields.mask = 1;
-	ioapic->base_address = IOAPIC_DEFAULT_BASE_ADDRESS;
+	kvm_ioapic_reset(ioapic);
 	ioapic->dev.read = ioapic_mmio_read;
 	ioapic->dev.write = ioapic_mmio_write;
 	ioapic->dev.in_range = ioapic_in_range;
diff --git a/trunk/drivers/kvm/irq.h b/trunk/drivers/kvm/irq.h
index e08ae1002bd8..5ad3cfd7622d 100644
--- a/trunk/drivers/kvm/irq.h
+++ b/trunk/drivers/kvm/irq.h
@@ -140,6 +140,7 @@ int kvm_get_apic_interrupt(struct kvm_vcpu *vcpu);
 int kvm_create_lapic(struct kvm_vcpu *vcpu);
 void kvm_lapic_reset(struct kvm_vcpu *vcpu);
 void kvm_pic_reset(struct kvm_kpic_state *s);
+void kvm_ioapic_reset(struct kvm_ioapic *ioapic);
 void kvm_free_lapic(struct kvm_vcpu *vcpu);
 u64 kvm_lapic_get_cr8(struct kvm_vcpu *vcpu);
 void kvm_lapic_set_tpr(struct kvm_vcpu *vcpu, unsigned long cr8);