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

Commit 450917b6 authored by Tianyu Lan's avatar Tianyu Lan Committed by Paolo Bonzini
Browse files

KVM/MMU: Simplify __kvm_sync_page() function 



Merge check of "sp->role.cr4_pae != !!is_pae(vcpu))" and "vcpu->
arch.mmu.sync_page(vcpu, sp) == 0". kvm_mmu_prepare_zap_page()
is called under both these conditions.

Signed-off-by: default avatarLan Tianyu <Tianyu.Lan@microsoft.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 208320ba

arch/x86/kvm/mmu.c

+2 −6
Original line number Diff line number Diff line
@@ -2136,12 +2136,8 @@ static void kvm_mmu_commit_zap_page(struct kvm *kvm, 
static bool __kvm_sync_page(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,

			    struct list_head *invalid_list)

{

	if (sp->role.cr4_pae != !!is_pae(vcpu)) {

		kvm_mmu_prepare_zap_page(vcpu->kvm, sp, invalid_list);

		return false;

	}



	if (vcpu->arch.mmu.sync_page(vcpu, sp) == 0) {

	if (sp->role.cr4_pae != !!is_pae(vcpu)

	    || vcpu->arch.mmu.sync_page(vcpu, sp) == 0) {

		kvm_mmu_prepare_zap_page(vcpu->kvm, sp, invalid_list);

		return false;

	}