evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

KVM: Move cr0/cr4/efer related helpers to x86.h

Browse source 
They have more general scope than the mmu.

Signed-off-by: Avi Kivity <avi@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Avi Kivity 2010-01-21 15:31:49 +02:00 • committed by Marcelo Tosatti
parent 3eeb3288bc
commit 836a1b3c34
4 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
arch/x86/kvm/emulate.c
View file

@ -33,7 +33,6 @@
#include <asm/kvm_emulate.h> #include <asm/kvm_emulate.h>
#include "x86.h" #include "x86.h"
#include "mmu.h" /* for is_long_mode() */
/* /*
* Opcode effective-address decode tables. * Opcode effective-address decode tables.

1
arch/x86/kvm/mmu.c
View file

@ -18,6 +18,7 @@
*/ */
#include "mmu.h" #include "mmu.h"
#include "x86.h"
#include "kvm_cache_regs.h" #include "kvm_cache_regs.h"
#include <linux/kvm_host.h> #include <linux/kvm_host.h>

24
arch/x86/kvm/mmu.h
View file

@ -58,30 +58,6 @@ static inline int kvm_mmu_reload(struct kvm_vcpu *vcpu)
return kvm_mmu_load(vcpu); return kvm_mmu_load(vcpu);
} }
static inline int is_long_mode(struct kvm_vcpu *vcpu)
{
#ifdef CONFIG_X86_64
return vcpu->arch.shadow_efer & EFER_LMA;
#else
return 0;
#endif
}
static inline int is_pae(struct kvm_vcpu *vcpu)
{
return kvm_read_cr4_bits(vcpu, X86_CR4_PAE);
}
static inline int is_pse(struct kvm_vcpu *vcpu)
{
return kvm_read_cr4_bits(vcpu, X86_CR4_PSE);
}
static inline int is_paging(struct kvm_vcpu *vcpu)
{
return kvm_read_cr0_bits(vcpu, X86_CR0_PG);
}
static inline int is_present_gpte(unsigned long pte) static inline int is_present_gpte(unsigned long pte)
{ {
return pte & PT_PRESENT_MASK; return pte & PT_PRESENT_MASK;

24
arch/x86/kvm/x86.h
View file

@ -41,4 +41,28 @@ static inline bool is_protmode(struct kvm_vcpu *vcpu)
return kvm_read_cr0_bits(vcpu, X86_CR0_PE); return kvm_read_cr0_bits(vcpu, X86_CR0_PE);
} }
static inline int is_long_mode(struct kvm_vcpu *vcpu)
{
#ifdef CONFIG_X86_64
return vcpu->arch.shadow_efer & EFER_LMA;
#else
return 0;
#endif
}
static inline int is_pae(struct kvm_vcpu *vcpu)
{
return kvm_read_cr4_bits(vcpu, X86_CR4_PAE);
}
static inline int is_pse(struct kvm_vcpu *vcpu)
{
return kvm_read_cr4_bits(vcpu, X86_CR4_PSE);
}
static inline int is_paging(struct kvm_vcpu *vcpu)
{
return kvm_read_cr0_bits(vcpu, X86_CR0_PG);
}
#endif #endif