Changeset 17422 in vbox for trunk

Timestamp:

Mar 5, 2009 8:33:58 PM (16 years ago)

Author:

vboxsync

Message:

VMM: Do not forcibly enable RC logging in VMMGCLogEnabled! Renamed it to VMMGCLogRestore and made VMMGCLogDisable return a state indicator that should be passed to it.

Location:

trunk

Files:

• include/VBox/vmm.h (modified) (1 diff)
• src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (2 diffs)
• src/VBox/VMM/VMMGC/VMMGC.cpp (modified) (1 diff)

trunk/include/VBox/vmm.h

@@ -316 +316 @@
 VMMRCDECL(void)     VMMGCGuestToHost(PVM pVM, int rc);
 VMMRCDECL(int)      VMMGCCallHost(PVM pVM, VMMCALLHOST enmOperation, uint64_t uArg);
-VMMRCDECL(void)     VMMGCLogDisable(PVM pVM);
-VMMRCDECL(void)     VMMGCLogEnable(PVM pVM);
+VMMRCDECL(bool)     VMMGCLogDisable(PVM pVM);
+VMMRCDECL(void)     VMMGCLogRestore(PVM pVM, bool fLog);
 VMMRCDECL(void)     VMMGCLogFlushIfFull(PVM pVM);
 /** @} */

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -4690 +4690 @@
 #  ifdef IN_RC
     /** NOTE: We can't deal with jumps to ring 3 here as we're now in an inconsistent state! */
-    VMMGCLogDisable(pVM);
+    bool fLog = VMMGCLogDisable(pVM);
 #  endif
 
@@ -4729 +4729 @@
 
 #  ifdef IN_RC
-    VMMGCLogEnable(pVM);
+    VMMGCLogRestore(pVM, fLog);
 #  endif
 

trunk/src/VBox/VMM/VMMGC/VMMGC.cpp

@@ -195 +195 @@
 
 /**
- * Disables the GC logger temporarily
+ * Disables the GC logger temporarily, restore with VMMGCLogRestore.
  *
  * @param   pVM             The VM handle.
  */
-VMMRCDECL(void) VMMGCLogDisable(PVM pVM)
-{
-    if (pVM->vmm.s.pRCLoggerRC)
+VMMRCDECL(bool) VMMGCLogDisable(PVM pVM)
+{
+    bool fLog = pVM->vmm.s.pRCLoggerRC
+             && !(pVM->vmm.s.pRCLoggerRC->fFlags & RTLOGFLAGS_DISABLED);
+    if (fLog)
         pVM->vmm.s.pRCLoggerRC->fFlags |= RTLOGFLAGS_DISABLED;
-}
-
-
-/**
- * Enables the GC logger again
+    return fLog;
+}
+
+
+/**
+ * Restores the GC logger after a call to VMMGCLogDisable.
  *
  * @param   pVM             The VM handle.
- */
-VMMRCDECL(void) VMMGCLogEnable(PVM pVM)
-{
-    if (pVM->vmm.s.pRCLoggerRC)
+ * @param   fLog            What VMMGCLogDisable returned.
+ */
+VMMRCDECL(void) VMMGCLogRestore(PVM pVM, bool fLog)
+{
+    if (fLog && pVM->vmm.s.pRCLoggerRC)
         pVM->vmm.s.pRCLoggerRC->fFlags &= ~RTLOGFLAGS_DISABLED;
 }