Signed-off-by: Hollis Blanchard [EMAIL PROTECTED]
---
5 files changed, 19 insertions(+), 9 deletions(-)
drivers/kvm/i8259.c|1 +
drivers/kvm/irq.h |7 ++-
drivers/kvm/kvm.h |9 -
drivers/kvm/kvm_main.c |3 ---
drivers/kvm/x86.h |8
diff --git a/drivers/kvm/i8259.c b/drivers/kvm/i8259.c
--- a/drivers/kvm/i8259.c
+++ b/drivers/kvm/i8259.c
@@ -27,6 +27,7 @@
*/
#include linux/mm.h
#include irq.h
+#include kvm.h
/*
* set irq level. If an edge is detected, then the IRR is set to 1
diff --git a/drivers/kvm/irq.h b/drivers/kvm/irq.h
--- a/drivers/kvm/irq.h
+++ b/drivers/kvm/irq.h
@@ -22,8 +22,13 @@
#ifndef __IRQ_H
#define __IRQ_H
-#include kvm.h
+#include linux/mm_types.h
+#include linux/hrtimer.h
+#include asm/kvm.h
#include iodev.h
+
+struct kvm;
+struct kvm_vcpu;
typedef void irq_request_func(void *opaque, int level);
diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h
--- a/drivers/kvm/kvm.h
+++ b/drivers/kvm/kvm.h
@@ -287,11 +287,6 @@ static inline int irqchip_in_kernel(stru
{
return pic_irqchip(kvm) != NULL;
}
-
-struct descriptor_table {
- u16 limit;
- unsigned long base;
-} __attribute__((packed));
/* The guest did something we don't support. */
#define pr_unimpl(vcpu, fmt, ...) \
@@ -457,4 +452,8 @@ struct kvm_stats_debugfs_item {
};
extern struct kvm_stats_debugfs_item debugfs_entries[];
+#if defined(CONFIG_X86)
+#include x86.h
#endif
+
+#endif
diff --git a/drivers/kvm/kvm_main.c b/drivers/kvm/kvm_main.c
--- a/drivers/kvm/kvm_main.c
+++ b/drivers/kvm/kvm_main.c
@@ -16,8 +16,6 @@
*/
#include kvm.h
-#include x86.h
-#include irq.h
#include iodev.h
#include linux/kvm.h
@@ -46,7 +44,6 @@
#include asm/processor.h
#include asm/io.h
#include asm/uaccess.h
-#include asm/desc.h
#include asm/pgtable.h
MODULE_AUTHOR(Qumranet);
diff --git a/drivers/kvm/x86.h b/drivers/kvm/x86.h
--- a/drivers/kvm/x86.h
+++ b/drivers/kvm/x86.h
@@ -12,12 +12,15 @@
#define KVM_X86_H
#include kvm.h
+#include irq.h
#include linux/types.h
#include linux/mm.h
#include linux/kvm.h
#include linux/kvm_para.h
+
+#include asm/desc.h
#define CR3_PAE_RESERVED_BITS ((X86_CR3_PWT | X86_CR3_PCD) - 1)
#define CR3_NONPAE_RESERVED_BITS ((PAGE_SIZE-1) ~(X86_CR3_PWT | X86_CR3_PCD))
@@ -155,6 +158,11 @@ struct kvm_vcpu {
struct x86_emulate_ctxt emulate_ctxt;
};
+
+struct descriptor_table {
+ u16 limit;
+ unsigned long base;
+} __attribute__((packed));
struct kvm_x86_ops {
int (*cpu_has_kvm_support)(void); /* __init */
-
SF.Net email is sponsored by: The Future of Linux Business White Paper
from Novell. From the desktop to the data center, Linux is going
mainstream. Let it simplify your IT future.
http://altfarm.mediaplex.com/ad/ck/8857-50307-18918-4
___
kvm-devel mailing list
kvm-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-devel
