Changeset 76011 in vbox for trunk/src

Timestamp:

Dec 6, 2018 11:51:06 AM (6 years ago)

Author:

vboxsync

Message:

VMM: VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM fixes.

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllCImplSvmInstr.cpp.h (modified) (1 diff)
• VMMR0/HMSVMR0.cpp (modified) (1 diff)
• VMMR0/HMVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMAll/IEMAllCImplSvmInstr.cpp.h

@@ -340 +340 @@
 # if defined(VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM) && defined(IN_RING3)
     /* CLGI/STGI may not have been intercepted and thus not executed in IEM. */
-    if (   HMIsEnabled(pVM)
+    if (   HMIsEnabled(pVCpu->CTX_SUFF(pVM))
         && HMSvmIsVGifActive(pVCpu->CTX_SUFF(pVM)))
         return EMR3SetExecutionPolicy(pVCpu->CTX_SUFF(pVM)->pUVM, EMEXECPOLICY_IEM_ALL, false);

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

@@ -4307 +4307 @@
 
 #ifdef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
-    Log2(("hmR0SvmPreRunGuest: Rescheduling to IEM due to nested-hwvirt or forced IEM exec -> VINF_EM_RESCHEDULE_REM\n"));
-    return VINF_EM_RESCHEDULE_REM;
+    if (CPUMIsGuestInSvmNestedHwVirtMode(pCtx)) /* Redundant check to avoid unreachable code warning. */
+    {
+        Log2(("hmR0SvmPreRunGuest: Rescheduling to IEM due to nested-hwvirt or forced IEM exec -> VINF_EM_RESCHEDULE_REM\n"));
+        return VINF_EM_RESCHEDULE_REM;
+    }
 #endif
 

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

@@ -8440 +8440 @@
 
 #ifdef VBOX_WITH_NESTED_HWVIRT_ONLY_IN_IEM
-    Log2(("hmR0VmxPreRunGuest: Rescheduling to IEM due to nested-hwvirt or forced IEM exec -> VINF_EM_RESCHEDULE_REM\n"));
-    RT_NOREF3(pVCpu, pVmxTransient, fStepping);
-    return VINF_EM_RESCHEDULE_REM;
+    if (CPUMIsGuestVmxEnabled(&pVCpu->cpum.GstCtx))
+    {
+        Log2(("hmR0VmxPreRunGuest: Rescheduling to IEM due to nested-hwvirt or forced IEM exec -> VINF_EM_RESCHEDULE_REM\n"));
+        RT_NOREF3(pVCpu, pVmxTransient, fStepping);
+        return VINF_EM_RESCHEDULE_REM;
+    }
 #endif