Commit 35fbe0d4 authored by Xiaoyao Li's avatar Xiaoyao Li Committed by Paolo Bonzini
Browse files

KVM: VMX: Write VPID to vmcs when creating vcpu 



Move the code that writes vmx->vpid to vmcs from vmx_vcpu_reset() to
vmx_vcpu_setup(), because vmx->vpid is allocated when creating vcpu and
never changed. So we don't need to update the vmcs.vpid when resetting
vcpu.

Signed-off-by: default avatarXiaoyao Li <xiaoyao.li@intel.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 4be94672

arch/x86/kvm/vmx/vmx.c

+3 −3
Original line number Diff line number Diff line
@@ -4252,6 +4252,9 @@ static void vmx_vcpu_setup(struct vcpu_vmx *vmx) 


	set_cr4_guest_host_mask(vmx);



	if (vmx->vpid != 0)

		vmcs_write16(VIRTUAL_PROCESSOR_ID, vmx->vpid);



	if (vmx_xsaves_supported())

		vmcs_write64(XSS_EXIT_BITMAP, VMX_XSS_EXIT_BITMAP);
@@ -4354,9 +4357,6 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) 


	kvm_make_request(KVM_REQ_APIC_PAGE_RELOAD, vcpu);



	if (vmx->vpid != 0)

		vmcs_write16(VIRTUAL_PROCESSOR_ID, vmx->vpid);



	cr0 = X86_CR0_NW | X86_CR0_CD | X86_CR0_ET;

	vmx->vcpu.arch.cr0 = cr0;

	vmx_set_cr0(vcpu, cr0); /* enter rmode */