aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSheng Yang <sheng@linux.intel.com>2010-01-05 06:02:26 -0500
committerMarcelo Tosatti <mtosatti@redhat.com>2010-03-01 10:35:46 -0500
commitc9c5417455b0c2e3c164883354b5480e5aee3b36 (patch)
tree62aff332b7177eb277befa3f8d6c310471596692
parent97c4cfbe890a4ad82dde8660008d42b7b05dc488 (diff)
KVM: x86: Moving PT_*_LEVEL to mmu.h
We can use them in x86.c and vmx.c now... Signed-off-by: Sheng Yang <sheng@linux.intel.com> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
-rw-r--r--arch/x86/kvm/mmu.c4
-rw-r--r--arch/x86/kvm/mmu.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 25aabd00aa0..12ccf14f853 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -143,10 +143,6 @@ module_param(oos_shadow, bool, 0644);
143#define PFERR_RSVD_MASK (1U << 3) 143#define PFERR_RSVD_MASK (1U << 3)
144#define PFERR_FETCH_MASK (1U << 4) 144#define PFERR_FETCH_MASK (1U << 4)
145 145
146#define PT_PDPE_LEVEL 3
147#define PT_DIRECTORY_LEVEL 2
148#define PT_PAGE_TABLE_LEVEL 1
149
150#define RMAP_EXT 4 146#define RMAP_EXT 4
151 147
152#define ACC_EXEC_MASK 1 148#define ACC_EXEC_MASK 1
diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h
index 4567d8042b2..ff583423968 100644
--- a/arch/x86/kvm/mmu.h
+++ b/arch/x86/kvm/mmu.h
@@ -38,6 +38,10 @@
38#define PT32_ROOT_LEVEL 2 38#define PT32_ROOT_LEVEL 2
39#define PT32E_ROOT_LEVEL 3 39#define PT32E_ROOT_LEVEL 3
40 40
41#define PT_PDPE_LEVEL 3
42#define PT_DIRECTORY_LEVEL 2
43#define PT_PAGE_TABLE_LEVEL 1
44
41int kvm_mmu_get_spte_hierarchy(struct kvm_vcpu *vcpu, u64 addr, u64 sptes[4]); 45int kvm_mmu_get_spte_hierarchy(struct kvm_vcpu *vcpu, u64 addr, u64 sptes[4]);
42 46
43static inline void kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu) 47static inline void kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu)