Changeset 48748 in vbox for trunk

Timestamp:

Sep 28, 2013 3:21:23 AM (11 years ago)

Author:

vboxsync

Message:

EFI: Logging.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• MdePkg/Include/Library/DebugLib.h (modified) (3 diffs)
• VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c (modified) (2 diffs)
• VBoxPkg/VBoxFsDxe/fsw_efi.c (modified) (1 diff)

trunk/src/VBox/Devices/EFI/Firmware/MdePkg/Include/Library/DebugLib.h

@@ -477 +477 @@
 CHAR16 *VBoxDebugHandleDevicePath2Str(IN EFI_HANDLE hHandle);
 # endif
+VOID EFIAPI VBoxLogWorker(const char *pszFormat, ...);
+
 /** See RT_XSTR */
 # define VBOX_XSTR(str)                         VBOX_STR(str)
@@ -484 +486 @@
 #  define VBoxLogFlowFuncEnter()                DEBUG((DEBUG_INFO, "%a:" VBOX_XSTR(__LINE__) ": ENTER\n", __FUNCTION__))
 #  define VBoxLogFlowFuncLeave()                DEBUG((DEBUG_INFO, "%a:" VBOX_XSTR(__LINE__) ": LEAVE\n", __FUNCTION__))
-#  define VBoxLogFlowFuncLeaveRC(rc)            DEBUG((DEBUG_INFO, "%a:" VBOX_XSTR(__LINE__) ": LEAVE " #rc "=%r\n", \
-                                                       __FUNCTION__, rc))
 #  define VBoxLogFlowFuncMark()                 DEBUG((DEBUG_INFO, "%a:" VBOX_XSTR(__LINE__) "\n", __FUNCTION__))
-#  define VBoxLogFlowFuncMarkRC(rc)             DEBUG((DEBUG_INFO, "%a:" VBOX_XSTR(__LINE__) ": " #rc "=%r\n", __FUNCTION__, rc))
+#  define VBoxLogFlowFuncLeaveRC(rc) \
+    do { \
+        EFI_STATUS rcLog = (rc); \
+        DEBUG((DEBUG_INFO, "%a:" VBOX_XSTR(__LINE__) ": LEAVE " #rc "=0x%x (%r)\n", __FUNCTION__, rcLog, rcLog)); \
+    } while (0)
 #  define VBoxLogFlowFuncMarkVar(var, varfmt) \
-    DEBUG((DEBUG_INFO, "%a:" VBOX_XSTR(__LINE__) " " #var "=" varfmt "\n", __FUNCTION__, (var)))
-#  define VBoxLogFlowFuncMarkDP(dp)             DEBUG((DEBUG_INFO, "%a:" VBOX_XSTR(__LINE__) ": " #dp "=%s\n", \
-                                                       __FUNCTION__, VBoxDebugDevicePath2Str(dp)))
-#  define VBoxLogFlowFuncMarkHandleDP(dp)       DEBUG((DEBUG_INFO, "%a:" VBOX_XSTR(__LINE__) ": " #dp "=%s\n", \
-                                                       __FUNCTION__, VBoxDebugHandleDevicePath2Str(dp)))
+    DEBUG((DEBUG_INFO, "%a:" VBOX_XSTR(__LINE__) ": " #var "=" varfmt "\n", __FUNCTION__, (var)))
+#  define VBoxLogFlowFuncMarkRC(rc) \
+    do { \
+        EFI_STATUS rcLog = (rc); \
+        DEBUG((DEBUG_INFO, "%a:" VBOX_XSTR(__LINE__) ": " #rc "=0x%x (%r)\n", __FUNCTION__, rcLog, rcLog)); \
+    } while (0)
+#  define VBoxLogFlowFuncMarkDP(dp) \
+    DEBUG((DEBUG_INFO, "%a:" VBOX_XSTR(__LINE__) ": " #dp "=%s\n", __FUNCTION__, VBoxDebugDevicePath2Str(dp)))
+#  define VBoxLogFlowFuncMarkHandleDP(dp)\
+    DEBUG((DEBUG_INFO, "%a:" VBOX_XSTR(__LINE__) ": " #dp "=%s\n", __FUNCTION__, VBoxDebugHandleDevicePath2Str(dp)))
+#  define VBoxLog(a)                            VBoxLogWorker a
 # else
 #  define VBoxLogFlowFuncEnter()                do {} while (0)
@@ -499 +509 @@
 #  define VBoxLogFlowFuncLeaveRC(rc)            do {} while (0)
 #  define VBoxLogFlowFuncMark()                 do {} while (0)
+#  define VBoxLogFlowFuncMarkVar(var, varfmt)   do {} while (0)
 #  define VBoxLogFlowFuncMarkRC(rc)             do {} while (0)
-#  define VBoxLogFlowFuncMarkVar(var, varfmt)   do {} while (0)
 #  define VBoxLogFlowFuncMarkDP(dp)             do {} while (0)
 #  define VBoxLogLogFlowFuncMarkHandleDP(dp)    do {} while (0)
+#  define VBoxLog(a)                            do {} while (0)
 # endif
 #endif

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/Library/VBoxDebugLib/VBoxDebugLib.c

@@ -67 +67 @@
     szBuf[cch] = '\0';
 
+    /* Output the log string. */
     SavedFlags = ASMIntDisableFlags();
 
@@ -76 +77 @@
 
     ASMSetFlags(SavedFlags);
-
+}
+
+/**
+ * Our own log worker function, avoid the dbg/00000xxx prefix and makes it clear
+ * which log statements we added..
+ *
+ * @param   pszFormat           Format string. EFI style!
+ * @param   ...                 Argument referneced in the format string.
+ */
+VOID EFIAPI
+VBoxLogWorker(const char *pszFormat, ...)
+{
+    CHAR8       szBuf[384];
+    VA_LIST     va;
+    UINTN       cch;
+    RTCCUINTREG SavedFlags;
+
+    VA_START(va, pszFormat);
+    cch = AsciiVSPrint(szBuf, sizeof(szBuf), pszFormat, va);
+    VA_END(va);
+
+    /* make sure it's terminated and doesn't end with a newline */
+    if (cch >= sizeof(szBuf))
+        cch = sizeof(szBuf) - 1;
+    while (cch > 0 && (szBuf[cch - 1] == '\n' || szBuf[cch - 1] == '\r'))
+        cch--;
+    szBuf[cch] = '\0';
+
+    /* Output the log string. */
+    SavedFlags = ASMIntDisableFlags();
+
+    VBoxPrintString(szBuf);
+    VBoxPrintChar('\n');
+
+    ASMSetFlags(SavedFlags);
 }
 

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi.c

@@ -282 +282 @@
                                 pVolume);
 
-    VBoxLogFlowFuncMarkVar(Status, "%r");
+    VBoxLogFlowFuncMarkRC(Status);
     if (!EFI_ERROR(Status)) {
         // register the SimpleFileSystem protocol