Changeset 67156 in vbox for trunk/src/VBox/VMM/VMMR0

Timestamp:

May 31, 2017 9:10:12 AM (8 years ago)

Author:

vboxsync

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

115832

Message:

VMM/HMSVMR0, VMM/HMSVMAll: Nested Hw.virt: Fixes.

File:

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

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

@@ -1804 +1804 @@
     STAM_PROFILE_ADV_START(&pVCpu->hm.s.StatLoadGuestState, x);
 
-#ifdef VBOX_WITH_NESTED_HWVIRT
-    /* Nested Hw. virt through SVM R0 execution is not yet implemented, IEM only, we shouldn't get here. */
-    if (CPUMIsGuestInNestedHwVirtMode(pCtx))
-        return VERR_NOT_IMPLEMENTED;
-#endif
-
     int rc = hmR0SvmLoadGuestControlRegs(pVCpu, pVmcb, pCtx);
     AssertLogRelMsgRCReturn(rc, ("hmR0SvmLoadGuestControlRegs! rc=%Rrc (pVM=%p pVCpu=%p)\n", rc, pVM, pVCpu), rc);
@@ -2972 +2966 @@
 {
     HMSVM_ASSERT_PREEMPT_SAFE();
+
+#ifdef VBOX_WITH_NESTED_HWVIRT_IN_IEM
+    /* Nested Hw. virt through SVM R0 execution is not yet implemented, IEM only, we shouldn't get here. */
+    if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx))
+        return VINF_EM_RESCHEDULE_REM;
+#endif
 
     /* Check force flag actions that might require us to go back to ring-3. */