Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 135f8c2b authored by Avi Kivity's avatar Avi Kivity
Browse files

KVM: MMU: Move SHADOW_PT_INDEX to mmu.c 



It is not specific to the paging mode, so can be made global (and reusable).

Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent 6eb06cb2

arch/x86/kvm/mmu.c

+2 −0
Original line number Diff line number Diff line
@@ -135,6 +135,8 @@ module_param(dbg, bool, 0644); 
#define ACC_USER_MASK    PT_USER_MASK

#define ACC_ALL          (ACC_EXEC_MASK | ACC_WRITE_MASK | ACC_USER_MASK)



#define SHADOW_PT_INDEX(addr, level) PT64_INDEX(addr, level)



struct kvm_rmap_desc {

	u64 *shadow_ptes[RMAP_EXT];

	struct kvm_rmap_desc *more;

arch/x86/kvm/paging_tmpl.h

+0 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
	#define PT_BASE_ADDR_MASK PT64_BASE_ADDR_MASK

	#define PT_DIR_BASE_ADDR_MASK PT64_DIR_BASE_ADDR_MASK

	#define PT_INDEX(addr, level) PT64_INDEX(addr, level)

	#define SHADOW_PT_INDEX(addr, level) PT64_INDEX(addr, level)

	#define PT_LEVEL_MASK(level) PT64_LEVEL_MASK(level)

	#define PT_LEVEL_BITS PT64_LEVEL_BITS

	#ifdef CONFIG_X86_64
@@ -46,7 +45,6 @@ 
	#define PT_BASE_ADDR_MASK PT32_BASE_ADDR_MASK

	#define PT_DIR_BASE_ADDR_MASK PT32_DIR_BASE_ADDR_MASK

	#define PT_INDEX(addr, level) PT32_INDEX(addr, level)

	#define SHADOW_PT_INDEX(addr, level) PT64_INDEX(addr, level)

	#define PT_LEVEL_MASK(level) PT32_LEVEL_MASK(level)

	#define PT_LEVEL_BITS PT32_LEVEL_BITS

	#define PT_MAX_FULL_LEVELS 2
@@ -504,7 +502,6 @@ static void FNAME(prefetch_page)(struct kvm_vcpu *vcpu, 
#undef FNAME

#undef PT_BASE_ADDR_MASK

#undef PT_INDEX

#undef SHADOW_PT_INDEX

#undef PT_LEVEL_MASK

#undef PT_DIR_BASE_ADDR_MASK

#undef PT_LEVEL_BITS