From 168e3ec020c471cc926fe2b3dbe19b6ae0c069cb Mon Sep 17 00:00:00 2001
From: Eddie Dong <eddie.dong@intel.com>
Date: Wed, 10 Oct 2007 12:14:25 +0200
Subject: [PATCH] --- yaml --- r: 80676 b: refs/heads/master c:
 2fcceae145645ec6a4fab0a806bb674d7484d97b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 169d640127e5..dcc3ff8a7900 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60395224d94945544f1f9dce5566981844bf0e77
+refs/heads/master: 2fcceae145645ec6a4fab0a806bb674d7484d97b
diff --git a/trunk/drivers/kvm/i8259.c b/trunk/drivers/kvm/i8259.c
index a679157bc599..f0dc2eeadf0b 100644
--- a/trunk/drivers/kvm/i8259.c
+++ b/trunk/drivers/kvm/i8259.c
@@ -181,10 +181,8 @@ int kvm_pic_read_irq(struct kvm_pic *s)
 	return intno;
 }
 
-static void pic_reset(void *opaque)
+void kvm_pic_reset(struct kvm_kpic_state *s)
 {
-	struct kvm_kpic_state *s = opaque;
-
 	s->last_irr = 0;
 	s->irr = 0;
 	s->imr = 0;
@@ -209,7 +207,7 @@ static void pic_ioport_write(void *opaque, u32 addr, u32 val)
 	addr &= 1;
 	if (addr == 0) {
 		if (val & 0x10) {
-			pic_reset(s);	/* init */
+			kvm_pic_reset(s);	/* init */
 			/*
 			 * deassert a pending interrupt
 			 */
diff --git a/trunk/drivers/kvm/irq.h b/trunk/drivers/kvm/irq.h
index 508280ea6fcf..e08ae1002bd8 100644
--- a/trunk/drivers/kvm/irq.h
+++ b/trunk/drivers/kvm/irq.h
@@ -139,6 +139,7 @@ int kvm_apic_accept_pic_intr(struct kvm_vcpu *vcpu);
 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_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);