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

Commit e1732991 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

x86/kvm/mmu: get rid of redundant kvm_mmu_setup() 



Just inline the contents into the sole caller, kvm_init_mmu is now
public.

Suggested-by: default avatarVitaly Kuznetsov <vkuznets@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarSean Christopherson <sean.j.christopherson@intel.com>
parent 14c07ad8

arch/x86/include/asm/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -1188,7 +1188,6 @@ void kvm_mmu_module_exit(void); 


void kvm_mmu_destroy(struct kvm_vcpu *vcpu);

int kvm_mmu_create(struct kvm_vcpu *vcpu);

void kvm_mmu_setup(struct kvm_vcpu *vcpu);

void kvm_mmu_init_vm(struct kvm *kvm);

void kvm_mmu_uninit_vm(struct kvm *kvm);

void kvm_mmu_set_mask_ptes(u64 user_mask, u64 accessed_mask,

arch/x86/kvm/mmu.c

+0 −12
Original line number Diff line number Diff line
@@ -5442,18 +5442,6 @@ int kvm_mmu_create(struct kvm_vcpu *vcpu) 
	return alloc_mmu_pages(vcpu);

}



void kvm_mmu_setup(struct kvm_vcpu *vcpu)

{

	MMU_WARN_ON(VALID_PAGE(vcpu->arch.mmu->root_hpa));



	/*

	 * kvm_mmu_setup() is called only on vCPU initialization.  

	 * Therefore, no need to reset mmu roots as they are not yet

	 * initialized.

	 */

	kvm_init_mmu(vcpu, false);

}



static void kvm_mmu_invalidate_zap_pages_in_memslot(struct kvm *kvm,

			struct kvm_memory_slot *slot,

			struct kvm_page_track_notifier_node *node)

arch/x86/kvm/x86.c

+1 −1
Original line number Diff line number Diff line
@@ -8484,7 +8484,7 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu) 
	kvm_vcpu_mtrr_init(vcpu);

	vcpu_load(vcpu);

	kvm_vcpu_reset(vcpu, false);

	kvm_mmu_setup(vcpu);

	kvm_init_mmu(vcpu, false);

	vcpu_put(vcpu);

	return 0;

}