Changeset 14679

Timestamp:

11/27/08 03:07:39 (1 month ago)

Author:

vboxsync

Message:

HWVMX,VMM: make 100% sure the logger doesn't screw us during the guest/host setup.

Files:

• trunk/include/VBox/vmm.h (modified) (1 diff)
• trunk/src/VBox/VMM/VMMR0/HWVMXR0.cpp (modified) (2 diffs)
• trunk/src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (6 diffs)

trunk/include/VBox/vmm.h

@@ -294 +294 @@
-VMMR0DECL(int)      VMMR0EntryEx(PVM pVM, VMMR0OPERATION enmOperation, PSUPVMMR0REQHDR pReq, uint64_t u64Arg, PSUPDRVSESSION);
-VMMR0DECL(int)      VMMR0CallHost(PVM pVM, VMMCALLHOST enmOperation, uint64_t uArg);
+VMMR0DECL(void)     VMMR0LogFlushDisable(PVMCPU pVCpu);
+VMMR0DECL(void)     VMMR0LogFlushEnable(PVMCPU pVCpu);
-
-/** @} */

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

@@ -1902 +1902 @@
-    idCpuCheck = RTMpCpuId();
-#endif
+#ifdef LOG_LOGGING
+    VMMR0LogFlushDisable(pVCpu);
+#endif
-    /* Save the host state first. */
-    rc  = VMXR0SaveHostState(pVM, pVCpu);
@@ -1990 +1993 @@
-
-    /* Note! NOW IT'S SAFE FOR LOGGING! */
+#ifdef LOG_LOGGING
+    VMMR0LogFlushEnable(pVCpu);
+#endif
-    Log2(("Raw exit reason %08x\n", exitReason));
-

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

@@ -1024 +1024 @@
-    if (    !VALID_PTR(pR0Logger)
-        ||  !VALID_PTR(pR0Logger + 1)
-        ||  !VALID_PTR(pLogger)
-        ||  pLogger->u32Magic != RTLOGGER_MAGIC)
-    {
@@ -1032 +1031 @@
-        return;
-    }
+    if (pR0Logger->fFlushingDisabled)
+        return; /* quietly */
-
-    PVM pVM = pR0Logger->pVM;
@@ -1055 +1056 @@
-        SUPR0Printf("vmmR0LoggerFlush: Jump buffer isn't armed!\n");
-#endif
-        pLogger->offScratch = 0;
-        return;
-    }
@@ -1063 +1063 @@
-
-/**
+ * Disables flushing of the ring-0 debug log.
+ *
+ * @param   pVCpu       The shared virtual cpu structure.
+ */
+VMMR0DECL(void) VMMR0LogFlushDisable(PVMCPU pVCpu)
+{
+    PVM pVM = pVCpu->pVMR0;
+    if (pVM->vmm.s.pR0LoggerR0)
+        pVM->vmm.s.pR0LoggerR0->fFlushingDisabled = true;
+}
+
+
+/**
+ * Enables flushing of the ring-0 debug log.
+ *
+ * @param   pVCpu       The shared virtual cpu structure.
+ */
+VMMR0DECL(void) VMMR0LogFlushEnable(PVMCPU pVCpu)
+{
+    PVM pVM = pVCpu->pVMR0;
+    if (pVM->vmm.s.pR0LoggerR0)
+        pVM->vmm.s.pR0LoggerR0->fFlushingDisabled = false;
+}
+
+
+/**
- * Jump back to ring-3 if we're the EMT and the longjmp is armed.
- *
@@ -1069 +1095 @@
-DECLEXPORT(bool) RTCALL RTAssertShouldPanic(void)
-{
+#if 0
+    return true;
+#else
-    PVM pVM = GVMMR0GetVMByEMT(NIL_RTNATIVETHREAD);
-    if (pVM)
@@ -1086 +1115 @@
-#else
-    return false;
+#endif
-#endif
-}