diff options
Diffstat (limited to 'drivers/kvm/x86.h')
-rw-r--r-- | drivers/kvm/x86.h | 8 |
1 files changed, 8 insertions, 0 deletions
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 @@ | |||
12 | #define KVM_X86_H | 12 | #define KVM_X86_H |
13 | 13 | ||
14 | #include "kvm.h" | 14 | #include "kvm.h" |
15 | #include "irq.h" | ||
15 | 16 | ||
16 | #include <linux/types.h> | 17 | #include <linux/types.h> |
17 | #include <linux/mm.h> | 18 | #include <linux/mm.h> |
@@ -19,6 +20,8 @@ | |||
19 | #include <linux/kvm.h> | 20 | #include <linux/kvm.h> |
20 | #include <linux/kvm_para.h> | 21 | #include <linux/kvm_para.h> |
21 | 22 | ||
23 | #include <asm/desc.h> | ||
24 | |||
22 | #define CR3_PAE_RESERVED_BITS ((X86_CR3_PWT | X86_CR3_PCD) - 1) | 25 | #define CR3_PAE_RESERVED_BITS ((X86_CR3_PWT | X86_CR3_PCD) - 1) |
23 | #define CR3_NONPAE_RESERVED_BITS ((PAGE_SIZE-1) & ~(X86_CR3_PWT | X86_CR3_PCD)) | 26 | #define CR3_NONPAE_RESERVED_BITS ((PAGE_SIZE-1) & ~(X86_CR3_PWT | X86_CR3_PCD)) |
24 | #define CR3_L_MODE_RESERVED_BITS (CR3_NONPAE_RESERVED_BITS|0xFFFFFF0000000000ULL) | 27 | #define CR3_L_MODE_RESERVED_BITS (CR3_NONPAE_RESERVED_BITS|0xFFFFFF0000000000ULL) |
@@ -156,6 +159,11 @@ struct kvm_vcpu { | |||
156 | struct x86_emulate_ctxt emulate_ctxt; | 159 | struct x86_emulate_ctxt emulate_ctxt; |
157 | }; | 160 | }; |
158 | 161 | ||
162 | struct descriptor_table { | ||
163 | u16 limit; | ||
164 | unsigned long base; | ||
165 | } __attribute__((packed)); | ||
166 | |||
159 | struct kvm_x86_ops { | 167 | struct kvm_x86_ops { |
160 | int (*cpu_has_kvm_support)(void); /* __init */ | 168 | int (*cpu_has_kvm_support)(void); /* __init */ |
161 | int (*disabled_by_bios)(void); /* __init */ | 169 | int (*disabled_by_bios)(void); /* __init */ |