diff options
| author | Hollis Blanchard <hollisb@us.ibm.com> | 2007-12-03 22:30:25 +0100 |
|---|---|---|
| committer | Avi Kivity <avi@qumranet.com> | 2008-01-30 16:53:17 +0100 |
| commit | e01a1b570f66ad318239517adbcc2cbe368d0a46 (patch) | |
| tree | 2400a276ef5db5087319a9ab92b3917243071db0 | |
| parent | KVM: Portability: Move IO device definitions to its own header file (diff) | |
| download | linux-e01a1b570f66ad318239517adbcc2cbe368d0a46.tar.xz linux-e01a1b570f66ad318239517adbcc2cbe368d0a46.zip | |
KVM: Portability: Stop including x86-specific headers in kvm_main.c
Signed-off-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
| -rw-r--r-- | drivers/kvm/i8259.c | 1 | ||||
| -rw-r--r-- | drivers/kvm/irq.h | 7 | ||||
| -rw-r--r-- | drivers/kvm/kvm.h | 9 | ||||
| -rw-r--r-- | drivers/kvm/kvm_main.c | 3 | ||||
| -rw-r--r-- | drivers/kvm/x86.h | 8 |
5 files changed, 19 insertions, 9 deletions
diff --git a/drivers/kvm/i8259.c b/drivers/kvm/i8259.c index f0dc2eeadf0b..b3cad632f3d5 100644 --- 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 index 803b9c7db57b..730a87c173e5 100644 --- a/drivers/kvm/irq.h +++ b/drivers/kvm/irq.h @@ -22,9 +22,14 @@ #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); struct kvm_kpic_state { diff --git a/drivers/kvm/kvm.h b/drivers/kvm/kvm.h index a1b7d1c00bde..0d3555bf5333 100644 --- a/drivers/kvm/kvm.h +++ b/drivers/kvm/kvm.h @@ -288,11 +288,6 @@ static inline int irqchip_in_kernel(struct kvm *kvm) 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, ...) \ do { \ @@ -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 index 14b376ead3da..0f11046b94fa 100644 --- 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 index 78ab1e108d8b..4b7acc76bb34 100644 --- a/drivers/kvm/x86.h +++ b/drivers/kvm/x86.h @@ -12,6 +12,7 @@ #define KVM_X86_H #include "kvm.h" +#include "irq.h" #include <linux/types.h> #include <linux/mm.h> @@ -19,6 +20,8 @@ #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)) #define CR3_L_MODE_RESERVED_BITS (CR3_NONPAE_RESERVED_BITS|0xFFFFFF0000000000ULL) @@ -156,6 +159,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 */ int (*disabled_by_bios)(void); /* __init */ |