1 files changed, 6 insertions, 6 deletions

diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c
index 3f80df186476..21cb6cd88765 100644
--- a/arch/x86/kvm/vmx/nested.c
+++ b/arch/x86/kvm/vmx/nested.c
@@ -192,7 +192,7 @@ static void nested_vmx_abort(struct kvm_vcpu *vcpu, u32 indicator)
 
 static void vmx_disable_shadow_vmcs(struct vcpu_vmx *vmx)
 {
-        vmcs_clear_bits(SECONDARY_VM_EXEC_CONTROL, SECONDARY_EXEC_SHADOW_VMCS);
+        secondary_exec_controls_clearbit(vmx, SECONDARY_EXEC_SHADOW_VMCS);
         vmcs_write64(VMCS_LINK_POINTER, -1ull);
 }
 
@@ -287,6 +287,7 @@ static void vmx_switch_vmcs(struct kvm_vcpu *vcpu, struct loaded_vmcs *vmcs)
         vm_exit_controls_reset_shadow(vmx);
         pin_controls_reset_shadow(vmx);
         exec_controls_reset_shadow(vmx);
+        secondary_exec_controls_reset_shadow(vmx);
         vmx_segment_cache_clear(vmx);
 }
 
@@ -2083,7 +2084,7 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct vmcs12 *vmcs12)
                         vmcs_write16(GUEST_INTR_STATUS,
                                 vmcs12->guest_intr_status);
 
-                vmcs_write32(SECONDARY_VM_EXEC_CONTROL, exec_control);
+                secondary_exec_controls_init(vmx, exec_control);
         }
 
         /*
@@ -2853,8 +2854,8 @@ static void nested_get_vmcs12_pages(struct kvm_vcpu *vcpu)
                         hpa = page_to_phys(vmx->nested.apic_access_page);
                         vmcs_write64(APIC_ACCESS_ADDR, hpa);
                 } else {
-                        vmcs_clear_bits(SECONDARY_VM_EXEC_CONTROL,
-                                        SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES);
+                        secondary_exec_controls_clearbit(vmx,
+                                SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES);
                 }
         }
 
@@ -4667,8 +4668,7 @@ static void set_current_vmptr(struct vcpu_vmx *vmx, gpa_t vmptr)
 {
         vmx->nested.current_vmptr = vmptr;
         if (enable_shadow_vmcs) {
-                vmcs_set_bits(SECONDARY_VM_EXEC_CONTROL,
-                              SECONDARY_EXEC_SHADOW_VMCS);
+                secondary_exec_controls_setbit(vmx, SECONDARY_EXEC_SHADOW_VMCS);
                 vmcs_write64(VMCS_LINK_POINTER,
                              __pa(vmx->vmcs01.shadow_vmcs));
                 vmx->nested.need_vmcs12_to_shadow_sync = true;