Changeset 77578 in vbox for trunk/src/VBox/VMM/VMMR0/HMVMXR0.cpp

Timestamp:

Mar 6, 2019 10:02:07 AM (6 years ago)

Author:

vboxsync

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

129194

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Fleshing out nested-guest run loop, skeleton.

File:

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

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

@@ -9014 +9014 @@
 }
 
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+/**
+ * Runs the nested-guest code using VT-x the normal way.
+ *
+ * @returns VBox status code.
+ * @param   pVCpu       The cross context virtual CPU structure.
+ * @sa      hmR0VmxRunGuestCodeNormal.
+ */
+static VBOXSTRICTRC hmR0VmxRunGuestCodeNested(PVMCPU pVCpu)
+{
+    RT_NOREF(pVCpu);
+    return VERR_NOT_IMPLEMENTED;
+}
+#endif /* VBOX_WITH_NESTED_HWVIRT_VMX */
 
 
@@ -10344 +10358 @@
 
     VBOXSTRICTRC rcStrict;
-    if (   !pVCpu->hm.s.fUseDebugLoop
-        && (!VBOXVMM_ANY_PROBES_ENABLED() || !hmR0VmxAnyExpensiveProbesEnabled())
-        && !DBGFIsStepping(pVCpu)
-        && !pVCpu->CTX_SUFF(pVM)->dbgf.ro.cEnabledInt3Breakpoints)
-        rcStrict = hmR0VmxRunGuestCodeNormal(pVCpu);
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
+    bool const fInNestedGuestMode = CPUMIsGuestInVmxNonRootMode(pCtx);
+#else
+    bool const fInNestedGuestMode = false;
+#endif
+    if (!fInNestedGuestMode)
+    {
+        if (   !pVCpu->hm.s.fUseDebugLoop
+            && (!VBOXVMM_ANY_PROBES_ENABLED() || !hmR0VmxAnyExpensiveProbesEnabled())
+            && !DBGFIsStepping(pVCpu)
+            && !pVCpu->CTX_SUFF(pVM)->dbgf.ro.cEnabledInt3Breakpoints)
+            rcStrict = hmR0VmxRunGuestCodeNormal(pVCpu);
+        else
+            rcStrict = hmR0VmxRunGuestCodeDebug(pVCpu);
+    }
+#ifdef VBOX_WITH_NESTED_HWVIRT_VMX
     else
-        rcStrict = hmR0VmxRunGuestCodeDebug(pVCpu);
+        rcStrict = VINF_VMX_VMLAUNCH_VMRESUME;
+
+    if (rcStrict == VINF_VMX_VMLAUNCH_VMRESUME)
+        rcStrict = hmR0VmxRunGuestCodeNested(pVCpu);
+#endif
 
     if (rcStrict == VERR_EM_INTERPRETER)
@@ -13536 +13565 @@
     VBOXSTRICTRC rcStrict = IEMExecDecodedVmlaunchVmresume(pVCpu, pVmxTransient->cbInstr, VMXINSTRID_VMLAUNCH);
     if (RT_LIKELY(rcStrict == VINF_SUCCESS))
+    {
+        rcStrict = VINF_VMX_VMLAUNCH_VMRESUME;
         ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_ALL_GUEST);
+    }
     Assert(rcStrict != VINF_IEM_RAISED_XCPT);
     return rcStrict;
@@ -13666 +13698 @@
     VBOXSTRICTRC rcStrict = IEMExecDecodedVmlaunchVmresume(pVCpu, pVmxTransient->cbInstr, VMXINSTRID_VMRESUME);
     if (RT_LIKELY(rcStrict == VINF_SUCCESS))
+    {
+        rcStrict = VINF_VMX_VMLAUNCH_VMRESUME;
         ASMAtomicUoOrU64(&pVCpu->hm.s.fCtxChanged, HM_CHANGED_ALL_GUEST);
+    }
     Assert(rcStrict != VINF_IEM_RAISED_XCPT);
     return rcStrict;