Changeset 71419 in vbox

Timestamp:

Mar 21, 2018 10:06:50 AM (7 years ago)

Author:

vboxsync

Message:

VMM/HM: Nested hw.virt: Don't double restore fields that are already restored by hardware-assisted SVM or IEM in the HM hook for the VM-exit.

File:

• trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMAll/HMSVMAll.cpp

@@ -153 +153 @@
          * The fields that are guaranteed to be read-only during SVM guest execution
          * can safely be restored from our VMCB cache. Other fields like control registers
-         * can potentially be modified (if the nested-hypervisor is not intercepting writes)
-         * and thus we restore the actual virtual CPU values of these registers.
+         * are already updated by hardware-assisted SVM or by IEM. We only restore those
+         * fields that are potentially modified by hardware-assisted SVM.
          */
         pVmcbNstGstCtrl->u16InterceptRdCRx             = pNstGstVmcbCache->u16InterceptRdCRx;
@@ -162 +162 @@
         pVmcbNstGstCtrl->u32InterceptXcpt              = pNstGstVmcbCache->u32InterceptXcpt;
         pVmcbNstGstCtrl->u64InterceptCtrl              = pNstGstVmcbCache->u64InterceptCtrl;
-        pVmcbNstGstState->u64CR0                       = pCtx->cr0;
-        pVmcbNstGstState->u64CR3                       = pCtx->cr3;
-        pVmcbNstGstState->u64CR4                       = pCtx->cr4;
-        pVmcbNstGstState->u64EFER                      = pCtx->msrEFER;
         pVmcbNstGstState->u64DBGCTL                    = pNstGstVmcbCache->u64DBGCTL;
         pVmcbNstGstCtrl->u32VmcbCleanBits              = pNstGstVmcbCache->u32VmcbCleanBits;