Changeset 19797 in vbox

Timestamp:

May 18, 2009 3:28:49 PM (15 years ago)

Author:

vboxsync

Message:

Release all taken locks in VMMR3FatalDump instead.

Location:

trunk/src/VBox/VMM

Files:

• VMEmt.cpp (modified) (2 diffs)
• VMMGuruMeditation.cpp (modified) (2 diffs)

trunk/src/VBox/VMM/VMEmt.cpp

@@ -34 +34 @@
 #include <VBox/vm.h>
 #include <VBox/uvm.h>
-#include <VBox/mm.h>
-#include <VBox/pgm.h>
-#include <VBox/iom.h>
-#include <VBox/pdm.h>
 
 #include <VBox/err.h>
@@ -228 +224 @@
                 if (   EMGetState(pVCpu) == EMSTATE_GURU_MEDITATION
                     && pVM->enmVMState == VMSTATE_RUNNING)
-                {
-                    Log(("Release locks owned by this EMT\n"));
-                    /* Release owned locks to make sure other VCPUs can continue in case they were waiting for one. */
-                    MMR3ReleaseOwnedLocks(pVM);
-                    PGMR3ReleaseOwnedLocks(pVM);
-                    PDMR3ReleaseOwnedLocks(pVM);
-                    IOMR3ReleaseOwnedLocks(pVM);
-                    EMR3ReleaseOwnedLocks(pVM);
-
                     vmR3SetState(pVM, VMSTATE_GURU_MEDITATION);
-                }
             }
         }

trunk/src/VBox/VMM/VMMGuruMeditation.cpp

@@ -30 +30 @@
 #include "VMMInternal.h"
 #include <VBox/vm.h>
+#include <VBox/mm.h>
+#include <VBox/iom.h>
+#include <VBox/em.h>
 
 #include <VBox/err.h>
@@ -208 +211 @@
     PCDBGFINFOHLP           pHlp = &Hlp.Core;
     vmmR3FatalDumpInfoHlpInit(&Hlp);
+
+    /* Release owned locks to make sure other VCPUs can continue in case they were waiting for one. */
+    MMR3ReleaseOwnedLocks(pVM);
+    PGMR3ReleaseOwnedLocks(pVM);
+    PDMR3ReleaseOwnedLocks(pVM);
+    IOMR3ReleaseOwnedLocks(pVM);
+    EMR3ReleaseOwnedLocks(pVM);
 
     /*