Changeset 79378 in vbox

Timestamp:

Jun 27, 2019 8:06:26 AM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

131616

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Fix VMX-preemption timer VM-exits and implemented Mov-to-CR3, Mov-to-CR8 VM-exits when executing the nested-guest.

File:

• trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

@@ -13677 +13677 @@
         {
             /** @todo NSTVMX: Preempt timer. */
-            return hmR0VmxExitErrUnexpected(pVCpu, pVmxTransient);
+            return hmR0VmxExitPreemptTimer(pVCpu, pVmxTransient);
         }
 
@@ -17097 +17097 @@
             Assert(iGReg < RT_ELEMENTS(pVCpu->cpum.GstCtx.aGRegs));
             uint64_t const uNewCrX = pVCpu->cpum.GstCtx.aGRegs[iGReg].u64;
-            if (CPUMIsGuestVmxMovToCr0Cr4InterceptSet(pVCpu, &pVCpu->cpum.GstCtx, iCrReg, uNewCrX))
+
+            bool fIntercept;
+            switch (iCrReg)
+            {
+                case 0:
+                case 4:
+                    fIntercept = CPUMIsGuestVmxMovToCr0Cr4InterceptSet(pVCpu, &pVCpu->cpum.GstCtx, iCrReg, uNewCrX);
+                    break;
+
+                case 3:
+                    fIntercept = CPUMIsGuestVmxMovToCr3InterceptSet(pVCpu, uNewCrX);
+                    break;
+
+                case 8:
+                    fIntercept = CPUMIsGuestVmxProcCtlsSet(pVCpu, &pVCpu->cpum.GstCtx, VMX_PROC_CTLS_CR8_LOAD_EXIT);
+                    break;
+
+                default:
+                    fIntercept = false;
+                    break;
+            }
+            if (fIntercept)
             {
                 VMXVEXITINFO ExitInfo;