|
@@ -7893,6 +7893,8 @@ static int enter_vmx_operation(struct kvm_vcpu *vcpu)
|
|
|
HRTIMER_MODE_REL_PINNED);
|
|
|
vmx->nested.preemption_timer.function = vmx_preemption_timer_fn;
|
|
|
|
|
|
+ vmx->nested.vpid02 = allocate_vpid();
|
|
|
+
|
|
|
vmx->nested.vmxon = true;
|
|
|
return 0;
|
|
|
|
|
@@ -10369,11 +10371,9 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)
|
|
|
goto free_vmcs;
|
|
|
}
|
|
|
|
|
|
- if (nested) {
|
|
|
+ if (nested)
|
|
|
nested_vmx_setup_ctls_msrs(&vmx->nested.msrs,
|
|
|
kvm_vcpu_apicv_active(&vmx->vcpu));
|
|
|
- vmx->nested.vpid02 = allocate_vpid();
|
|
|
- }
|
|
|
|
|
|
vmx->nested.posted_intr_nv = -1;
|
|
|
vmx->nested.current_vmptr = -1ull;
|
|
@@ -10390,7 +10390,6 @@ static struct kvm_vcpu *vmx_create_vcpu(struct kvm *kvm, unsigned int id)
|
|
|
return &vmx->vcpu;
|
|
|
|
|
|
free_vmcs:
|
|
|
- free_vpid(vmx->nested.vpid02);
|
|
|
free_loaded_vmcs(vmx->loaded_vmcs);
|
|
|
free_msrs:
|
|
|
kfree(vmx->guest_msrs);
|