|
@@ -10704,6 +10704,11 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,
|
|
|
struct vcpu_vmx *vmx = to_vmx(vcpu);
|
|
|
u32 exec_control, vmcs12_exec_ctrl;
|
|
|
|
|
|
+ if (vmx->nested.dirty_vmcs12) {
|
|
|
+ prepare_vmcs02_full(vcpu, vmcs12, from_vmentry);
|
|
|
+ vmx->nested.dirty_vmcs12 = false;
|
|
|
+ }
|
|
|
+
|
|
|
/*
|
|
|
* First, the fields that are shadowed. This must be kept in sync
|
|
|
* with vmx_shadow_fields.h.
|
|
@@ -10941,11 +10946,6 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12,
|
|
|
/* Note: modifies VM_ENTRY/EXIT_CONTROLS and GUEST/HOST_IA32_EFER */
|
|
|
vmx_set_efer(vcpu, vcpu->arch.efer);
|
|
|
|
|
|
- if (vmx->nested.dirty_vmcs12) {
|
|
|
- prepare_vmcs02_full(vcpu, vmcs12, from_vmentry);
|
|
|
- vmx->nested.dirty_vmcs12 = false;
|
|
|
- }
|
|
|
-
|
|
|
/* Shadow page tables on either EPT or shadow page tables. */
|
|
|
if (nested_vmx_load_cr3(vcpu, vmcs12->guest_cr3, nested_cpu_has_ept(vmcs12),
|
|
|
entry_failure_code))
|