Changeset 65275 in vbox for trunk/src/VBox

Timestamp:

Jan 13, 2017 8:42:10 AM (8 years ago)

Author:

vboxsync

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

112832

Message:

VMM/HMVMXR0: Fixed an extra VMMRZCallRing3Enable when cleaning up the code in r112790.

File:

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

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

@@ -8409 +8409 @@
     else
     {
-        VMMRZCallRing3Enable(pVCpu);
         Assert(rcStrict == VINF_EM_RESCHEDULE_REM || RT_FAILURE_NP(rcStrict));
         return rcStrict;
@@ -8553 +8552 @@
             AssertMsg(rcStrict == VINF_EM_RESCHEDULE_REM,
                       ("hmR0VmxLoadGuestStateOptimal: hmR0VmxLoadGuestState failed! rc=%Rrc\n", VBOXSTRICTRC_VAL(rcStrict)));
+            Assert(!VMMRZCallRing3IsEnabled(pVCpu));
             return rcStrict;
         }
@@ -8711 +8711 @@
         if (!RTThreadPreemptIsPending(NIL_RTTHREAD))
         {
-            /* We've injected any pending events. This is really the point of no return (to ring-3). */
             pVCpu->hm.s.Event.fPending = false;
 
+            /*
+             * We've injected any pending events. This is really the point of no return (to ring-3).
+             *
+             * Note! The caller expects to continue with interrupts & longjmps disabled on successful
+             * returns from this function, so don't enable them here.
+             */
             return VINF_SUCCESS;
         }