Commit 62ad0755 authored by Sheng Yang's avatar Sheng Yang Committed by Avi Kivity
Browse files

KVM: x86: Clean up duplicate assignment 



mmu.free() already set root_hpa to INVALID_PAGE, no need to do it again in the
destory_kvm_mmu().

kvm_x86_ops->set_cr4() and set_efer() already assign cr4/efer to
vcpu->arch.cr4/efer, no need to do it again later.

Signed-off-by: default avatarSheng Yang <sheng@linux.intel.com>
Signed-off-by: default avatarMarcelo Tosatti <mtosatti@redhat.com>
parent 222b7c52

arch/x86/kvm/mmu.c

+2 −3
Original line number Diff line number Diff line
@@ -2478,10 +2478,9 @@ static int init_kvm_mmu(struct kvm_vcpu *vcpu) 
static void destroy_kvm_mmu(struct kvm_vcpu *vcpu)

{

	ASSERT(vcpu);

	if (VALID_PAGE(vcpu->arch.mmu.root_hpa)) {

	if (VALID_PAGE(vcpu->arch.mmu.root_hpa))

		/* mmu.free() should set root_hpa = INVALID_PAGE */

		vcpu->arch.mmu.free(vcpu);

		vcpu->arch.mmu.root_hpa = INVALID_PAGE;

	}

}



int kvm_mmu_reset_context(struct kvm_vcpu *vcpu)

arch/x86/kvm/x86.c

+1 −3
Original line number Diff line number Diff line
@@ -486,7 +486,7 @@ int __kvm_set_cr4(struct kvm_vcpu *vcpu, unsigned long cr4) 
		return 1;



	kvm_x86_ops->set_cr4(vcpu, cr4);

	vcpu->arch.cr4 = cr4;



	kvm_mmu_reset_context(vcpu);



	return 0;
@@ -721,8 +721,6 @@ static int set_efer(struct kvm_vcpu *vcpu, u64 efer) 


	kvm_x86_ops->set_efer(vcpu, efer);



	vcpu->arch.efer = efer;



	vcpu->arch.mmu.base_role.nxe = (efer & EFER_NX) && !tdp_enabled;

	kvm_mmu_reset_context(vcpu);

CRA Git | Maintained and supported by SUSTech CRA and CCSE