Changeset 24267 in vbox

Timestamp:

Nov 2, 2009 3:33:06 PM (15 years ago)

Author:

vboxsync

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

54239

Message:

VMSetError: Do a LogRel if no callbacks.

File:

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

trunk/src/VBox/VMM/VM.cpp

@@ -3555 +3555 @@
      * Log the error.
      */
-    RTLogPrintf("VMSetError: %s(%d) %s\n", pszFile, iLine, pszFunction);
     va_list va3;
     va_copy(va3, *pArgs);
-    RTLogPrintfV(pszFormat, va3);
+    RTLogPrintf("VMSetError: %s(%d) %s\n%N\n", pszFile, iLine, pszFunction, pszFormat, &va3);
     va_end(va3);
-    RTLogPrintf("\n");
 #endif
 
@@ -3572 +3570 @@
      * Call the at error callbacks.
      */
+    bool fCalledSomeone = false;
     RTCritSectEnter(&pUVM->vm.s.AtErrorCritSect);
     for (PVMATERROR pCur = pUVM->vm.s.pAtError; pCur; pCur = pCur->pNext)
@@ -3579 +3578 @@
         pCur->pfnAtError(pUVM->pVM, pCur->pvUser, rc, RT_SRC_POS_ARGS, pszFormat, va2);
         va_end(va2);
+        fCalledSomeone = true;
     }
     RTCritSectLeave(&pUVM->vm.s.AtErrorCritSect);
+
+    /*
+     * Write the error to the release log if there weren't anyone to callback.
+     */
+    if (!fCalledSomeone)
+    {
+        va_list va3;
+        va_copy(va3, *pArgs);
+        RTLogRelPrintf("VMSetError: %s(%d) %s\nVMSetError: %N\n", pszFile, iLine, pszFunction, pszFormat, &va3);
+        va_end(va3);
+    }
 }