summaryrefslogtreecommitdiffstats
path: root/arch/x86/kvm/irq.h
diff options
context:
space:
mode:
authorAvi Kivity <avi@redhat.com>2010-05-03 17:34:34 +0300
committerAvi Kivity <avi@redhat.com>2010-08-01 10:47:03 +0300
commit073d46133ab0b42154f6b8429f4f66dbe2760bda (patch)
tree5b092dba4f6d1f65e3b91a28ebc45a17397150ee /arch/x86/kvm/irq.h
parentb74a07beed0e64bfba413dcb70dd6749c57f43dc (diff)
downloadlinux-stable-073d46133ab0b42154f6b8429f4f66dbe2760bda.tar.gz
linux-stable-073d46133ab0b42154f6b8429f4f66dbe2760bda.tar.bz2
linux-stable-073d46133ab0b42154f6b8429f4f66dbe2760bda.zip
KVM: i8259: reduce excessive abstraction for pic_irq_request()
Part of the i8259 code pretends it isn't part of kvm, but we know better. Reduce excessive abstraction, eliminating callbacks and void pointers. Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/x86/kvm/irq.h')
-rw-r--r--arch/x86/kvm/irq.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/kvm/irq.h b/arch/x86/kvm/irq.h
index cd1f362f413d..ffed06871c5c 100644
--- a/arch/x86/kvm/irq.h
+++ b/arch/x86/kvm/irq.h
@@ -38,8 +38,6 @@
struct kvm;
struct kvm_vcpu;
-typedef void irq_request_func(void *opaque, int level);
-
struct kvm_kpic_state {
u8 last_irr; /* edge detection */
u8 irr; /* interrupt request register */
@@ -67,8 +65,6 @@ struct kvm_pic {
unsigned pending_acks;
struct kvm *kvm;
struct kvm_kpic_state pics[2]; /* 0 is master pic, 1 is slave pic */
- irq_request_func *irq_request;
- void *irq_request_opaque;
int output; /* intr from master PIC */
struct kvm_io_device dev;
void (*ack_notifier)(void *opaque, int irq);