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

Commit e459e322 authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Avi Kivity
Browse files

KVM: MMU: move the relevant mmu code to mmu.c 



Move the mmu code in kvm_arch_vcpu_init() to kvm_mmu_create()

Signed-off-by: default avatarXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent 9edb17d5

arch/x86/include/asm/kvm_host.h

+6 −0
Original line number Diff line number Diff line
@@ -752,6 +752,7 @@ void __kvm_mmu_free_some_pages(struct kvm_vcpu *vcpu); 
int kvm_mmu_load(struct kvm_vcpu *vcpu);

void kvm_mmu_unload(struct kvm_vcpu *vcpu);

void kvm_mmu_sync_roots(struct kvm_vcpu *vcpu);

gpa_t translate_nested_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access);

gpa_t kvm_mmu_gva_to_gpa_read(struct kvm_vcpu *vcpu, gva_t gva,

			      struct x86_exception *exception);

gpa_t kvm_mmu_gva_to_gpa_fetch(struct kvm_vcpu *vcpu, gva_t gva,
@@ -773,6 +774,11 @@ void kvm_disable_tdp(void); 
int complete_pio(struct kvm_vcpu *vcpu);

bool kvm_check_iopl(struct kvm_vcpu *vcpu);



static inline gpa_t translate_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access)

{

	return gpa;

}



static inline struct kvm_mmu_page *page_header(hpa_t shadow_page)

{

	struct page *page = pfn_to_page(shadow_page >> PAGE_SHIFT);

arch/x86/kvm/mmu.c

+5 −1
Original line number Diff line number Diff line
@@ -3839,7 +3839,11 @@ static int alloc_mmu_pages(struct kvm_vcpu *vcpu) 
int kvm_mmu_create(struct kvm_vcpu *vcpu)

{

	ASSERT(vcpu);

	ASSERT(!VALID_PAGE(vcpu->arch.mmu.root_hpa));



	vcpu->arch.walk_mmu = &vcpu->arch.mmu;

	vcpu->arch.mmu.root_hpa = INVALID_PAGE;

	vcpu->arch.mmu.translate_gpa = translate_gpa;

	vcpu->arch.nested_mmu.translate_gpa = translate_nested_gpa;



	return alloc_mmu_pages(vcpu);

}

arch/x86/kvm/x86.c

+1 −10
Original line number Diff line number Diff line
@@ -3430,12 +3430,7 @@ void kvm_get_segment(struct kvm_vcpu *vcpu, 
	kvm_x86_ops->get_segment(vcpu, var, seg);

}



static gpa_t translate_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access)

{

	return gpa;

}



static gpa_t translate_nested_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access)

gpa_t translate_nested_gpa(struct kvm_vcpu *vcpu, gpa_t gpa, u32 access)

{

	gpa_t t_gpa;

	struct x86_exception exception;
@@ -5915,10 +5910,6 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu) 
	kvm = vcpu->kvm;



	vcpu->arch.emulate_ctxt.ops = &emulate_ops;

	vcpu->arch.walk_mmu = &vcpu->arch.mmu;

	vcpu->arch.mmu.root_hpa = INVALID_PAGE;

	vcpu->arch.mmu.translate_gpa = translate_gpa;

	vcpu->arch.nested_mmu.translate_gpa = translate_nested_gpa;

	if (!irqchip_in_kernel(kvm) || kvm_vcpu_is_bsp(vcpu))

		vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;

	else