Changeset 5264 in vbox

Timestamp:

Oct 12, 2007 4:48:19 PM (17 years ago)

Author:

vboxsync

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

25257

Message:

Quit unconditionally on a guru meditation.

File:

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

trunk/src/VBox/VMM/EM.cpp

@@ -2359 +2359 @@
     }
 
-    /* 
+    /*
      * Allocate handy pages (just in case the above actions have consumed some pages).
      */
@@ -3068 +3068 @@
         }
 
-        /* 
+        /*
          * Allocate handy pages.
          */
@@ -3439 +3439 @@
                 case EMSTATE_GURU_MEDITATION:
                 {
-                    /** @todo this ain't entirely safe. make a better return code check and specify this in DBGF/emR3Debug. */
                     TMVirtualPause(pVM);
                     TMCpuTickPause(pVM);
                     VMMR3FatalDump(pVM, rc);
-                    int rc2 = emR3Debug(pVM, rc);
-                    if (rc2 == VERR_DBGF_NOT_ATTACHED || rc2 == VINF_EM_OFF)
-                    {
-                        VMMR3Unlock(pVM);
-                        STAM_REL_PROFILE_ADV_STOP(&pVM->em.s.StatTotal, x);
-                        return rc;
-                    }
-                    TMVirtualResume(pVM);
-                    TMCpuTickResume(pVM);
-                    rc = rc2;
-                    /** @todo we're not doing the right thing in emR3Debug and will cause code to be executed on disconnect and stuff.. */
-                    Log2(("EMR3ExecuteVM: enmr3Debug -> %Vrc (state %d)\n", rc, pVM->em.s.enmState));
-                    break;
+                    emR3Debug(pVM, rc);
+                    VMMR3Unlock(pVM);
+                    STAM_REL_PROFILE_ADV_STOP(&pVM->em.s.StatTotal, x);
+                    return rc;
                 }