Changeset 79488 in vbox

Timestamp:

Jul 3, 2019 6:08:41 AM (5 years ago)

Author:

vboxsync

Message:

VMM/HMVMXR0: Nested VMX: bugref:9180 Bits.

File:

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

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

@@ -14156 +14156 @@
     STAM_PROFILE_ADV_START(&pVCpu->hm.s.StatExitXcptNmi, y3);
 
-    Assert(!pVmxTransient->fIsNestedGuest);
     PVMXVMCSINFO pVmcsInfo = pVmxTransient->pVmcsInfo;
     int rc = hmR0VmxReadExitIntInfoVmcs(pVmxTransient);
@@ -16295 +16294 @@
     {
 #if !defined(HMVMX_ALWAYS_TRAP_ALL_XCPTS) && !defined(HMVMX_ALWAYS_TRAP_PF)
-        Assert(pVCpu->hm.s.fUsingDebugLoop);
+        Assert(pVmxTransient->fIsNestedGuest || pVCpu->hm.s.fUsingDebugLoop);
 #endif
         pVCpu->hm.s.Event.fPending = false;                  /* In case it's a contributory or vectoring #PF. */
@@ -17004 +17003 @@
          * External interrupts:
          *    This should only happen when "acknowledge external interrupts on VM-exit"
-         *    control is set. However, we don't set it when executing guests or
-         *    nested-guests. For nested-guests it is emulated while injecting interrupts into
+         *    control is set. However, we never set this when executing a guest or
+         *    nested-guest. For nested-guests it is emulated while injecting interrupts into
          *    the guest.
          */