Commit 836a1b3c authored by Avi Kivity's avatar Avi Kivity Committed by Marcelo Tosatti
Browse files

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



They have more general scope than the mmu.

Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 3eeb3288

arch/x86/kvm/emulate.c

+0 −1
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ 
#include <asm/kvm_emulate.h>



#include "x86.h"

#include "mmu.h"		/* for is_long_mode() */



/*

 * Opcode effective-address decode tables.

arch/x86/kvm/mmu.c

+1 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
 */



#include "mmu.h"

#include "x86.h"

#include "kvm_cache_regs.h"



#include <linux/kvm_host.h>

arch/x86/kvm/mmu.h

+0 −24
Original line number Diff line number Diff line
@@ -58,30 +58,6 @@ static inline int kvm_mmu_reload(struct kvm_vcpu *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)

{

	return pte & PT_PRESENT_MASK;

arch/x86/kvm/x86.h

+24 −0
Original line number Diff line number Diff line
@@ -41,4 +41,28 @@ static inline bool is_protmode(struct kvm_vcpu *vcpu) 
	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