Changeset 48730 in vbox for trunk/src/VBox/Devices

Timestamp:

Sep 27, 2013 12:28:22 PM (11 years ago)

Author:

vboxsync

Message:

EFI: Use VBox prefix for our stuff so that it's obvious what's our stuff and what isn't. Also, I do NOT like anyone but iprt/log.h defining LogXXX macros!

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c (modified) (56 diffs)
• IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c (modified) (12 diffs)
• IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c (modified) (33 diffs)
• MdePkg/Include/Library/DebugLib.h (modified) (1 diff)
• OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c (modified) (10 diffs)
• PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.c (modified) (8 diffs)
• VBoxPkg/PartitionDxe/Apple.c (modified) (1 diff)
• VBoxPkg/PartitionDxe/ElTorito.c (modified) (1 diff)
• VBoxPkg/PartitionDxe/Gpt.c (modified) (1 diff)
• VBoxPkg/PartitionDxe/Mbr.c (modified) (1 diff)
• VBoxPkg/PartitionDxe/Partition.c (modified) (12 diffs)
• VBoxPkg/VBoxFsDxe/fsw_efi.c (modified) (10 diffs)
• VBoxPkg/VBoxVariable/InitVariable.c (modified) (13 diffs)

trunk/src/VBox/Devices/EFI/Firmware/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsBoot.c

@@ -466 +466 @@
         //  machinename is ia32, ia64, x64, ...
         //
-        LogFlowFuncMark();
+        VBoxLogFlowFuncMark();
         FullDevicePath = FileDevicePath (Handle, EFI_REMOVABLE_MEDIA_FILE_NAME);
         if (FullDevicePath != NULL) {
@@ -619 +619 @@
   EFI_HANDLE                Handle;
   EFI_HANDLE                ImageHandle;
-  EFI_DEVICE_PATH_PROTOCOL  *FilePath = NULL;
+  EFI_DEVICE_PATH_PROTOCOL  *FilePath;
   EFI_LOADED_IMAGE_PROTOCOL *ImageInfo;
   EFI_DEVICE_PATH_PROTOCOL  *WorkingDevicePath;
@@ -756 +756 @@
                     );
 
-    LogFlowFuncMarkRC(Status);
+    VBoxLogFlowFuncMarkRC(Status);
     //
     // If we didn't find an image directly, we need to try as if it is a removable device boot option
@@ -767 +767 @@
       //
       Handle = BdsLibGetBootableHandle(DevicePath);
-      LogFlowFuncMarkVar(Handle, "%p");
+      VBoxLogFlowFuncMarkVar(Handle, "%p");
       if (Handle == NULL) {
         goto Done;
@@ -777 +777 @@
 #ifdef VBOX
     /* @todo: improve Mac Detection */
+    FilePath = NULL;
     if (   Option->LoadOptionsSize
         || StrnCmp(Option->OptionName, L"Boot0080", 8) == 0)
@@ -782 +783 @@
         if (Option->LoadOptionsSize)
         {
-            LogFlowFuncMarkVar(Option->LoadOptions, "%s");
+            VBoxLogFlowFuncMarkVar(Option->LoadOptions, "%s");
             if (StrnCmp(L"config=", (CHAR16 *)Option->LoadOptions, 7) == 0)
             {
@@ -793 +794 @@
                 pszTemp0 = &pszConfigValue[fQouted ? 2 : 1];
                 pszTemp1 = pszTemp0;
-                LogFlowFuncMarkVar(pszTemp0, "%s");
-                LogFlowFuncMarkVar(pszTemp1, "%s");
+                VBoxLogFlowFuncMarkVar(pszTemp0, "%s");
+                VBoxLogFlowFuncMarkVar(pszTemp1, "%s");
                 pszFolder = AllocateZeroPool((StrLen(pszConfigValue) + StrLen(L"\\boot.efi") + 1) * sizeof(UINT16));
                 while (pszTemp0)
                 {
-                    LogFlowFuncMarkVar(pszTemp0, "%s");
-                    LogFlowFuncMarkVar(pszTemp1, "%s");
+                    VBoxLogFlowFuncMarkVar(pszTemp0, "%s");
+                    VBoxLogFlowFuncMarkVar(pszTemp1, "%s");
                     pszFolder = StrnCat(pszFolder, pszTemp1, StrLen(pszTemp1) - StrLen(pszTemp0));
                     pszTemp1 = pszTemp0;
                     pszFolder = StrCat(pszFolder, L"\\");
-                    LogFlowFuncMarkVar(pszFolder, "%s");
-                    LogFlowFuncMarkVar(pszTemp0, "%s");
-                    LogFlowFuncMarkVar(pszTemp1, "%s");
+                    VBoxLogFlowFuncMarkVar(pszFolder, "%s");
+                    VBoxLogFlowFuncMarkVar(pszTemp0, "%s");
+                    VBoxLogFlowFuncMarkVar(pszTemp1, "%s");
                     pszTemp0 = StrStr(&pszTemp0[1], L"\\");
-                    LogFlowFuncMarkVar(pszTemp0, "%s");
+                    VBoxLogFlowFuncMarkVar(pszTemp0, "%s");
                 }
                 pszFolder = StrCat(pszFolder, L"boot.efi");
-                LogFlowFuncMarkVar(pszFolder,"%s");
+                VBoxLogFlowFuncMarkVar(pszFolder,"%s");
 
                 Status = gBS->HandleProtocol (
@@ -816 +817 @@
                                 &gEfiSimpleFileSystemProtocolGuid,
                                 (VOID *) &Volume);
-                LogFlowFuncMarkRC(Status);
+                VBoxLogFlowFuncMarkRC(Status);
                 if (!EFI_ERROR(Status))
                 {
                     FilePath = FileDevicePath ((EFI_HANDLE)Handle, pszFolder);
-                    LogFlowFuncMarkVar(DevicePathToStr(FilePath), "%s");
+                    VBoxLogFlowFuncMarkVar(DevicePathToStr(FilePath), "%s");
                 }
             }
@@ -827 +828 @@
         {
             /* Boot0080 hasn't got hint how detect file path */
-            LogFlowFuncMarkVar(Handle, "%p");
+            VBoxLogFlowFuncMarkVar(Handle, "%p");
             FilePath = FileDevicePath (Handle, L"\\System\\Library\\CoreServices\\boot.efi");
             if (FilePath)
             {
-                LogFlowFuncMarkVar(DevicePathToStr(FilePath), "%s");
+                VBoxLogFlowFuncMarkVar(DevicePathToStr(FilePath), "%s");
             }
         }
@@ -850 +851 @@
                         &ImageHandle
                         );
-       LogFlowFuncMarkRC(Status);
+       VBoxLogFlowFuncMarkRC(Status);
        if (EFI_ERROR (Status)) {
           //
@@ -1388 +1389 @@
   // Check "BootOrder" variable firstly, this variable hold the number of boot options
   //
-  LogFlowFuncEnter();
+  VBoxLogFlowFuncEnter();
   BootOrder = BdsLibGetVariableAndSize (
                 L"BootOrder",
@@ -1395 +1396 @@
                 );
   if (NULL == BootOrder) {
-    LogFlowFuncLeaveRC(EFI_NOT_FOUND);
+    VBoxLogFlowFuncLeaveRC(EFI_NOT_FOUND);
     return EFI_NOT_FOUND;
   }
@@ -1402 +1403 @@
   while (Index < BootOrderSize / sizeof (UINT16)) {
     UnicodeSPrint (BootOption, sizeof (BootOption), L"Boot%04x", BootOrder[Index]);
-    LogFlowFuncMarkVar(BootOption, "%s");
+    VBoxLogFlowFuncMarkVar(BootOption, "%s");
     BootOptionVar = BdsLibGetVariableAndSize (
                       BootOption,
@@ -1410 +1411 @@
     if (NULL == BootOptionVar) {
       FreePool (BootOrder);
-      LogFlowFuncLeaveRC(EFI_OUT_OF_RESOURCES);
+      VBoxLogFlowFuncLeaveRC(EFI_OUT_OF_RESOURCES);
       return EFI_OUT_OF_RESOURCES;
     }
 
-    LogFlowFuncMarkVar(BootOption, "%s");
+    VBoxLogFlowFuncMarkVar(BootOption, "%s");
     if (!ValidateOption(BootOptionVar, BootOptionSize)) {
       Corrupted = TRUE;
@@ -1439 +1440 @@
       // Delete this invalid boot option "Boot####"
       //
-      LogFlowFuncMarkVar(BootOption, "DELETE %s");
+      VBoxLogFlowFuncMarkVar(BootOption, "DELETE %s");
       Status = gRT->SetVariable (
                       BootOption,
@@ -1450 +1451 @@
       // Mark this boot option in boot order as deleted
       //
-      LogFlowFuncMarkVar(BootOption, "%s");
-      LogFlowFuncMarkRC(Status);
+      VBoxLogFlowFuncMarkVar(BootOption, "%s");
+      VBoxLogFlowFuncMarkRC(Status);
       BootOrder[Index] = 0xffff;
       Corrupted        = FALSE;
@@ -1477 +1478 @@
                   BootOrder
                   );
-  LogFlowFuncMarkRC(Status);
+  VBoxLogFlowFuncMarkRC(Status);
   FreePool (BootOrder);
 
-  LogFlowFuncLeaveRC(Status);
+  VBoxLogFlowFuncLeaveRC(Status);
   return Status;
 }
@@ -1568 +1569 @@
   CHAR8                         *LastLang;
   EFI_IMAGE_OPTIONAL_HEADER_UNION       HdrData;
-  EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION   Hdr = {0}; /* VBox: VS2010 this it may be used uninitialized. */
+  EFI_IMAGE_OPTIONAL_HEADER_PTR_UNION   Hdr = {0}; /* VBox: VS2010 thinks it may be used uninitialized. */
 
   FloppyNumber    = 0;
@@ -1579 +1580 @@
   LastLang        = NULL;
   ZeroMem (Buffer, sizeof (Buffer));
-  LogFlowFuncEnter();
+  VBoxLogFlowFuncEnter();
+
   //
   // If the boot device enumerate happened, just get the boot
@@ -1592 +1594 @@
       FreePool (LastLang);
       FreePool (PlatLang);
-      LogFlowFuncLeaveRC(Status);
+      VBoxLogFlowFuncLeaveRC(Status);
       return Status;
     } else {
@@ -1742 +1744 @@
         );
   for (Index = 0; Index < NumberFileSystemHandles; Index++) {
+#ifdef VBOX
     BOOLEAN fLoaded = FALSE;
+#endif
     Status = gBS->HandleProtocol (
                     FileSystemHandles[Index],
@@ -1752 +1756 @@
       //  Skip if the file system handle supports a BlkIo protocol,
       //
-#if 0
+#if 0 /* VBox */
         NeedDelete = TRUE;
         Hdr.Union  = &HdrData;
@@ -1776 +1780 @@
     //  machinename is ia32, ia64, x64, ...
     //
-    LogFlowFuncMark();
+#ifdef VBOX
+    VBoxLogFlowFuncMark();
     if (!fLoaded)
+#endif
     {
         Hdr.Union  = &HdrData;
@@ -1788 +1794 @@
                        );
     }
-    if (   !EFI_ERROR (Status)
+    if (   !EFI_ERROR (Status) 
         && (   (   EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Hdr.Pe32->FileHeader.Machine)
                && Hdr.Pe32->OptionalHeader.Subsystem == EFI_IMAGE_SUBSYSTEM_EFI_APPLICATION)
-            || !fLoaded)) {
+            || !fLoaded)) { /* VBox */
       NeedDelete = FALSE;
     }
@@ -1891 +1897 @@
   mEnumBootDevice = TRUE;
 
-  LogFlowFuncLeaveRC(Status);
+  VBoxLogFlowFuncLeaveRC(Status);
   return Status;
 }
@@ -1914 +1920 @@
 {
   EFI_DEVICE_PATH_PROTOCOL  *DevicePath;
-  LogFlowFuncEnter();
-  LogFlowFuncMarkVar(String, "%s");
+  VBoxLogFlowFuncEnter();
+  VBoxLogFlowFuncMarkVar(String, "%s");
 
   DevicePath = DevicePathFromHandle (Handle);
@@ -1923 +1929 @@
   //
   BdsLibRegisterNewOption (BdsBootOptionList, DevicePath, String, L"BootOrder");
-  LogFlowFuncLeave();
+  VBoxLogFlowFuncLeave();
 }
 
@@ -2053 +2059 @@
 
   UpdatedDevicePath = DevicePath;
-  LogFlowFuncEnter();
-  DEBUG((DEBUG_INFO, "%a:%d DevicePath:%s\n", __FUNCTION__, __LINE__, DevicePathToStr(DevicePath)));
+  VBoxLogFlowFuncEnter();
+  DEBUG((DEBUG_INFO, "%a:%d DevicePath:%s\n", __FUNCTION__, __LINE__, DevicePathToStr(DevicePath))); /* VBox */
 
   //
@@ -2066 +2072 @@
   //
   Status = gBS->LocateDevicePath (&gEfiBlockIoProtocolGuid, &UpdatedDevicePath, &Handle);
-  LogFlowFuncMarkRC(Status);
+  VBoxLogFlowFuncMarkRC(Status);
   if (EFI_ERROR (Status)) {
     //
@@ -2072 +2078 @@
     //
     Status = gBS->LocateDevicePath (&gEfiSimpleFileSystemProtocolGuid, &UpdatedDevicePath, &Handle);
-    LogFlowFuncMarkRC(Status);
+    VBoxLogFlowFuncMarkRC(Status);
     if (EFI_ERROR (Status)) {
       //
@@ -2079 +2085 @@
       UpdatedDevicePath = DevicePath;
       Status            = gBS->LocateDevicePath (&gEfiDevicePathProtocolGuid, &UpdatedDevicePath, &Handle);
-      LogFlowFuncMarkRC(Status);
+      VBoxLogFlowFuncMarkRC(Status);
       gBS->ConnectController (Handle, NULL, NULL, TRUE);
     }
@@ -2127 +2133 @@
   UpdatedDevicePath = DupDevicePath;
   Status = gBS->LocateDevicePath (&gEfiDevicePathProtocolGuid, &UpdatedDevicePath, &Handle);
-  LogFlowFuncMarkRC(Status);
+  VBoxLogFlowFuncMarkRC(Status);
   //
   // if the resulting device path point to a usb node, and the usb node is a dummy node, should only let device path only point to the previous Pci node
@@ -2155 +2161 @@
       &SimpleFileSystemHandles
       );
-  LogFlowFuncMarkVar(NumberSimpleFileSystemHandles, "%d");
+  VBoxLogFlowFuncMarkVar(NumberSimpleFileSystemHandles, "%d");
   for (Index = 0; Index < NumberSimpleFileSystemHandles; Index++) {
     //
@@ -2161 +2167 @@
     //
     TempDevicePath = DevicePathFromHandle (SimpleFileSystemHandles[Index]);
-    TempSize = GetDevicePathSize (TempDevicePath) - sizeof (EFI_DEVICE_PATH_PROTOCOL); // minus the end node
-    DEBUG((DEBUG_INFO, "%a:%d TempDevicePath:%s\n", __FUNCTION__, __LINE__, DevicePathToStr(TempDevicePath)));
+    TempSize = GetDevicePathSize (TempDevicePath)- sizeof (EFI_DEVICE_PATH_PROTOCOL); // minus the end node
+    DEBUG((DEBUG_INFO, "%a:%d TempDevicePath:%s\n", __FUNCTION__, __LINE__, DevicePathToStr(TempDevicePath))); /* VBox */
     //
     // Check whether the device path of boot option is part of the  SimpleFileSystem handle's device path
@@ -2172 +2178 @@
       //
       Hdr.Union = &HdrData;
-      LogFlowFuncMark();
+      VBoxLogFlowFuncMark();
       Status = BdsLibGetImageHeader (
                  SimpleFileSystemHandles[Index],
@@ -2179 +2185 @@
                  Hdr
                  );
-      LogFlowFuncMarkRC(Status);
+      VBoxLogFlowFuncMarkRC(Status);
       if (!EFI_ERROR (Status) &&
         EFI_IMAGE_MACHINE_TYPE_SUPPORTED (Hdr.Pe32->FileHeader.Machine) &&
@@ -2201 +2207 @@
             pFs = pNode0;
             pNode0 = NextDevicePathNode (pNode0);
-            LogFlowFuncMarkVar(DevicePathToStr(pNode0), "%s");
-            LogFlowFuncMarkVar(DevicePathType(pNode0), "%x");
-            LogFlowFuncMarkVar(DevicePathSubType(pNode0), "%x");
+            VBoxLogFlowFuncMarkVar(DevicePathToStr(pNode0), "%s");
+            VBoxLogFlowFuncMarkVar(DevicePathType(pNode0), "%x");
+            VBoxLogFlowFuncMarkVar(DevicePathSubType(pNode0), "%x");
         }
 
@@ -2210 +2216 @@
             pTarget = pNode1;
             pNode1 = NextDevicePathNode (pNode1);
-            LogFlowFuncMarkVar(DevicePathToStr(pNode1), "%s");
-            LogFlowFuncMarkVar(DevicePathType(pNode1), "%x");
-            LogFlowFuncMarkVar(DevicePathSubType(pNode1), "%x");
+            VBoxLogFlowFuncMarkVar(DevicePathToStr(pNode1), "%s");
+            VBoxLogFlowFuncMarkVar(DevicePathType(pNode1), "%x");
+            VBoxLogFlowFuncMarkVar(DevicePathSubType(pNode1), "%x");
         }
         if (   pTarget
@@ -2225 +2231 @@
                 HARDDRIVE_DEVICE_PATH *pFsHd = (HARDDRIVE_DEVICE_PATH *)pFs;
                 /* @todo: is it enough? */
-                LogFlowFuncMarkVar(pTargetHd->PartitionNumber, "%x");
-                LogFlowFuncMarkVar(pTargetHd->PartitionStart, "%lx");
-                LogFlowFuncMarkVar(pTargetHd->PartitionSize, "%lx");
-                LogFlowFuncMarkVar(pFsHd->PartitionNumber, "%x");
-                LogFlowFuncMarkVar(pFsHd->PartitionStart, "%lx");
-                LogFlowFuncMarkVar(pFsHd->PartitionSize, "%lx");
+                VBoxLogFlowFuncMarkVar(pTargetHd->PartitionNumber, "%x");
+                VBoxLogFlowFuncMarkVar(pTargetHd->PartitionStart, "%lx");
+                VBoxLogFlowFuncMarkVar(pTargetHd->PartitionSize, "%lx");
+                VBoxLogFlowFuncMarkVar(pFsHd->PartitionNumber, "%x");
+                VBoxLogFlowFuncMarkVar(pFsHd->PartitionStart, "%lx");
+                VBoxLogFlowFuncMarkVar(pFsHd->PartitionSize, "%lx");
                 if (pTargetHd->PartitionNumber == pFsHd->PartitionNumber)
                 {
@@ -2255 +2261 @@
   gBS->RestoreTPL (OldTpl);
 
-  LogFlowFuncMarkVar(ReturnHandle, "%p");
-  LogFlowFuncLeave();
+  VBoxLogFlowFuncMarkVar(ReturnHandle, "%p");
+  VBoxLogFlowFuncLeave();
   return ReturnHandle;
 }
@@ -2529 +2535 @@
   // If yes, that means there is a boot option for network.
   //
-  LogFlowFuncEnter();
+  VBoxLogFlowFuncEnter();
   Status = gBS->LocateDevicePath (
                   &gEfiLoadFileProtocolGuid,
@@ -2535 +2541 @@
                   &Handle
                   );
-  LogFlowFuncMarkRC(Status);
+  VBoxLogFlowFuncMarkRC(Status);
   if (EFI_ERROR (Status)) {
     //
@@ -2549 +2555 @@
   }
 
-  LogFlowFuncMarkRC(Status);
+  VBoxLogFlowFuncMarkRC(Status);
   if (!EFI_ERROR (Status)) {
     if (!IsDevicePathEnd (TempDevicePath)) {
@@ -2555 +2561 @@
       // LoadFile protocol is not installed on handle with exactly the same DevPath
       //
-      LogFlowFuncLeave();
+      VBoxLogFlowFuncLeave();
       return FALSE;
     }
@@ -2564 +2570 @@
       //
       if (BdsLibNetworkBootWithMediaPresent(DevPath)) {
-        LogFlowFuncLeave();
+        VBoxLogFlowFuncLeave();
         return TRUE;
       }
     } else {
-      LogFlowFuncLeave();
+      VBoxLogFlowFuncLeave();
       return TRUE;
     }
@@ -2586 +2592 @@
         ((DevicePathSubType (TempDevicePath) == MSG_USB_CLASS_DP) ||
          (DevicePathSubType (TempDevicePath) == MSG_USB_WWID_DP))) {
-      LogFlowFuncLeave();
+      VBoxLogFlowFuncLeave();
       return TRUE;
     }
@@ -2595 +2601 @@
   if ((DevicePathType (LastDeviceNode) == MEDIA_DEVICE_PATH) &&
     (DevicePathSubType (LastDeviceNode) == MEDIA_FILEPATH_DP)) {
-    LogFlowFuncLeave();
+    VBoxLogFlowFuncLeave();
     return TRUE;
   }
@@ -2612 +2618 @@
                );
     if (Status == EFI_ALREADY_STARTED) {
-      LogFlowFuncLeave();
+      VBoxLogFlowFuncLeave();
       return TRUE;
     } else {
@@ -2618 +2624 @@
         FreePool (TempDevicePath);
       }
-      LogFlowFuncLeave();
+      VBoxLogFlowFuncLeave();
       return FALSE;
     }
@@ -2630 +2636 @@
   TempDevicePath = DevPath;
   Status = gBS->LocateDevicePath (&gEfiBlockIoProtocolGuid, &TempDevicePath, &Handle);
-  LogFlowFuncMarkRC(Status);
+  VBoxLogFlowFuncMarkRC(Status);
   if (EFI_ERROR (Status)) {
     //
@@ -2636 +2642 @@
     //
     Status = BdsLibConnectDevicePath (DevPath);
-    LogFlowFuncMarkRC(Status);
+    VBoxLogFlowFuncMarkRC(Status);
     if (!EFI_ERROR (Status)) {
       //
@@ -2643 +2649 @@
       TempDevicePath = DevPath;
       Status = gBS->LocateDevicePath (&gEfiBlockIoProtocolGuid, &TempDevicePath, &Handle);
-      LogFlowFuncMarkRC(Status);
-    }
-  }
-
-
-  LogFlowFuncMarkRC(Status);
+      VBoxLogFlowFuncMarkRC(Status);
+    }
+  }
+
+  VBoxLogFlowFuncMarkRC(Status);
   if (!EFI_ERROR (Status)) {
     Status = gBS->HandleProtocol (Handle, &gEfiBlockIoProtocolGuid, (VOID **)&BlockIo);
-    LogFlowFuncMarkRC(Status);
+    VBoxLogFlowFuncMarkRC(Status);
     if (!EFI_ERROR (Status)) {
       if (CheckMedia) {
@@ -2658 +2663 @@
         //
         if (BdsLibGetBootableHandle (DevPath) != NULL) {
-          LogFlowFuncLeave();
+          VBoxLogFlowFuncLeave();
           return TRUE;
         }
       } else {
-        LogFlowFuncLeave();
+        VBoxLogFlowFuncLeave();
         return TRUE;
       }
@@ -2671 +2676 @@
     //
     Status = gBS->LocateDevicePath (&gEfiSimpleFileSystemProtocolGuid, &TempDevicePath, &Handle);
-    LogFlowFuncMarkRC(Status);
+    VBoxLogFlowFuncMarkRC(Status);
     if (!EFI_ERROR (Status)) {
       if (CheckMedia) {
@@ -2678 +2683 @@
         //
         if (BdsLibGetBootableHandle (DevPath) != NULL) {
-          LogFlowFuncLeave();
+          VBoxLogFlowFuncLeave();
           return TRUE;
         }
       } else {
-        LogFlowFuncLeave();
+        VBoxLogFlowFuncLeave();
         return TRUE;
       }
@@ -2688 +2693 @@
   }
 
-  LogFlowFuncLeave();
 #ifndef VBOX
   return FALSE;
 #else
+  VBoxLogFlowFuncLeave();
   return TRUE;
 #endif

trunk/src/VBox/Devices/EFI/Firmware/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsConsole.c

@@ -205 +205 @@
   UINT32                    Attributes;
 
-  LogFlowFuncEnter();
-  LogFlowFuncMarkVar(ConVarName, "%s");
-  LogFlowFuncMarkDP(CustomizedConDevicePath);
-  LogFlowFuncMarkDP(ExclusiveDevicePath);
+  VBoxLogFlowFuncEnter();
+  VBoxLogFlowFuncMarkVar(ConVarName, "%s");
+  VBoxLogFlowFuncMarkDP(CustomizedConDevicePath);
+  VBoxLogFlowFuncMarkDP(ExclusiveDevicePath);
   VarConsole      = NULL;
   DevicePathSize  = 0;
@@ -217 +217 @@
   //
   if (CustomizedConDevicePath == ExclusiveDevicePath) {
-    LogFlowFuncLeaveRC(EFI_UNSUPPORTED);
+    VBoxLogFlowFuncLeaveRC(EFI_UNSUPPORTED);
     return EFI_UNSUPPORTED;
   }
@@ -223 +223 @@
   // Delete the ExclusiveDevicePath from current default console
   //
-  LogFlowFuncMark();
+  VBoxLogFlowFuncMark();
   VarConsole = BdsLibGetVariableAndSize (
                 ConVarName,
@@ -229 +229 @@
                 &DevicePathSize
                 );
-  LogFlowFuncMark();
+  VBoxLogFlowFuncMark();
 
   //
@@ -240 +240 @@
   // In the end, NewDevicePath is the final device path.
   //
-  LogFlowFuncMark();
+  VBoxLogFlowFuncMark();
   if (ExclusiveDevicePath != NULL && VarConsole != NULL) {
       NewDevicePath = BdsLibDelPartMatchInstance (VarConsole, ExclusiveDevicePath);
@@ -247 +247 @@
   // Try to append customized device path to NewDevicePath.
   //
-  LogFlowFuncMark();
+  VBoxLogFlowFuncMark();
   if (CustomizedConDevicePath != NULL) {
-    LogFlowFuncMark();
+    VBoxLogFlowFuncMark();
     if (!BdsLibMatchDevicePaths (NewDevicePath, CustomizedConDevicePath)) {
       //
       // Check if there is part of CustomizedConDevicePath in NewDevicePath, delete it.
       //
-      LogFlowFuncMark();
+      VBoxLogFlowFuncMark();
       NewDevicePath = BdsLibDelPartMatchInstance (NewDevicePath, CustomizedConDevicePath);
       //
@@ -261 +261 @@
       //
       TempNewDevicePath = NewDevicePath;
-      LogFlowFuncMark();
+      VBoxLogFlowFuncMark();
       NewDevicePath = AppendDevicePathInstance (NewDevicePath, CustomizedConDevicePath);
-      LogFlowFuncMark();
+      VBoxLogFlowFuncMark();
       if (TempNewDevicePath != NULL) {
         FreePool(TempNewDevicePath);
@@ -273 +273 @@
   // The attribute for ConInDev, ConOutDev and ErrOutDev does not include NV.
   //
-  LogFlowFuncMark();
+  VBoxLogFlowFuncMark();
   if (IsNvNeed(ConVarName)) {
     //
     // ConVarName has NV attribute.
     //
-    LogFlowFuncMark();
+    VBoxLogFlowFuncMark();
     Attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS | EFI_VARIABLE_NON_VOLATILE;
   } else {
@@ -284 +284 @@
     // ConVarName does not have NV attribute.
     //
-    LogFlowFuncMark();
+    VBoxLogFlowFuncMark();
     Attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS;
   }
@@ -291 +291 @@
   // Finally, Update the variable of the default console by NewDevicePath
   //
-  LogFlowFuncMark();
+  VBoxLogFlowFuncMark();
   DevicePathSize = GetDevicePathSize (NewDevicePath);
-  LogFlowFuncMark();
+  VBoxLogFlowFuncMark();
   Status = gRT->SetVariable (
                   ConVarName,
@@ -301 +301 @@
                   NewDevicePath
                   );
-  LogFlowFuncMarkRC(Status);
+  VBoxLogFlowFuncMarkRC(Status);
   if ((DevicePathSize == 0) && (Status == EFI_NOT_FOUND)) {
     Status = EFI_SUCCESS;
@@ -320 +320 @@
   }
 
-  LogFlowFuncLeaveRC(Status);
+  VBoxLogFlowFuncLeaveRC(Status);
   return Status;
 

trunk/src/VBox/Devices/EFI/Firmware/IntelFrameworkModulePkg/Library/GenericBdsLib/BdsMisc.c

@@ -228 +228 @@
   Status                = EFI_SUCCESS;
   ZeroMem (OptionName, sizeof (OptionName));
-  LogFlowFuncEnter();
-  LogFlowFuncMarkVar(VariableName, "%s");
-  LogFlowFuncMarkVar(String, "%s");
+  VBoxLogFlowFuncEnter();
+  VBoxLogFlowFuncMarkVar(VariableName, "%s");
+  VBoxLogFlowFuncMarkVar(String, "%s");
 
   TempOptionSize = 0;
@@ -252 +252 @@
       UnicodeSPrint (OptionName, sizeof (OptionName), L"Driver%04x", TempOptionPtr[Index]);
     }
-    LogFlowFuncMarkVar(OptionName, "%s");
+    VBoxLogFlowFuncMarkVar(OptionName, "%s");
 
     OptionPtr = BdsLibGetVariableAndSize (
@@ -259 +259 @@
                   &OptionSize
                   );
-    LogFlowFuncMarkVar(OptionPtr, "%p");
+    VBoxLogFlowFuncMarkVar(OptionPtr, "%p");
     if (OptionPtr == NULL) {
       continue;
@@ -287 +287 @@
         FreePool (OptionPtr);
         FreePool (TempOptionPtr);
-        LogFlowFuncLeaveRC(EFI_SUCCESS);
+        VBoxLogFlowFuncLeaveRC(EFI_SUCCESS);
         return EFI_SUCCESS;
       } else {
@@ -351 +351 @@
       FreePool (TempOptionPtr);
     }
-    LogFlowFuncLeaveRC(Status);
+    VBoxLogFlowFuncLeaveRC(Status);
     return Status;
   }
@@ -376 +376 @@
       FreePool (TempOptionPtr);
     }
-    LogFlowFuncLeaveRC(Status);
+    VBoxLogFlowFuncLeaveRC(Status);
     return Status;
   }
@@ -404 +404 @@
   FreePool (OptionOrderPtr);
 
-  LogFlowFuncLeaveRC(Status);
+  VBoxLogFlowFuncLeaveRC(Status);
   return Status;
 }
@@ -520 +520 @@
   UINTN                     TempSize;
 
-  LogFlowFuncEnter();
-  LogFlowFuncMarkVar(Variable, "%s");
-  LogFlowFuncMarkVar(VariableSize, "%d");
+  VBoxLogFlowFuncEnter();
+  VBoxLogFlowFuncMarkVar(Variable, "%s");
+  VBoxLogFlowFuncMarkVar(VariableSize, "%d");
   //
   // Skip the option attribute
@@ -551 +551 @@
   //
   if ((FilePathSize == 0) || (TempSize == 0)) {
-    LogFlowFuncLeave();
+    VBoxLogFlowFuncLeave();
     return FALSE;
   }
 
   if (TempSize + FilePathSize + sizeof (UINT16) + sizeof (UINT16) > VariableSize) {
-    LogFlowFuncLeave();
+    VBoxLogFlowFuncLeave();
     return FALSE;
   }
@@ -564 +564 @@
     TempSize = GetDevicePathSizeEx (TempPath, FilePathSize);
     if (TempSize == 0) {
-      LogFlowFuncLeave();
+      VBoxLogFlowFuncLeave();
       return FALSE;
     }
@@ -571 +571 @@
   }
 
-  LogFlowFuncLeave();
+  VBoxLogFlowFuncLeave();
   return TRUE;
 }
@@ -635 +635 @@
   // Read the variable. We will never free this data.
   //
-  LogFlowFuncEnter();
-  LogFlowFuncMarkVar(VariableName, "%s");
+  VBoxLogFlowFuncEnter();
+  VBoxLogFlowFuncMarkVar(VariableName, "%s");
   Variable = BdsLibGetVariableAndSize (
               VariableName,
@@ -643 +643 @@
               );
   if (Variable == NULL) {
-    LogFlowFuncMarkVar(Variable, "%p");
-    LogFlowFuncLeave();
+    VBoxLogFlowFuncMarkVar(Variable, "%p");
+    VBoxLogFlowFuncLeave();
     return NULL;
   }
@@ -652 +652 @@
   //
   if (!ValidateOption(Variable, VariableSize)) {
-    LogFlowFuncMarkVar(Variable, "%p");
-    LogFlowFuncLeave();
+    VBoxLogFlowFuncMarkVar(Variable, "%p");
+    VBoxLogFlowFuncLeave();
     return NULL;
   }
@@ -712 +712 @@
   LoadOptions     = TempPtr;
   if (VariableSize < (UINTN)(TempPtr - Variable)) {
-    LogFlowFuncMarkVar(Variable, "%p");
-    LogFlowFuncLeave();
+    VBoxLogFlowFuncMarkVar(Variable, "%p");
+    VBoxLogFlowFuncLeave();
     return NULL;
   }
@@ -724 +724 @@
   Option = AllocateZeroPool (sizeof (BDS_COMMON_OPTION));
   if (Option == NULL) {
-    LogFlowFuncMarkVar(Variable, "%p");
-    LogFlowFuncLeave();
+    VBoxLogFlowFuncMarkVar(Variable, "%p");
+    VBoxLogFlowFuncLeave();
     return NULL;
   }
@@ -762 +762 @@
     InsertTailList (BdsCommonOptionList, &Option->Link);
     FreePool (Variable);
-    LogFlowFuncMarkVar(Option, "%p");
-    LogFlowFuncLeave();
+    VBoxLogFlowFuncMarkVar(Option, "%p");
+    VBoxLogFlowFuncLeave();
     return Option;
   }
@@ -772 +772 @@
   FreePool (Option->LoadOptions);
   FreePool (Option);
-  LogFlowFuncLeave();
+  VBoxLogFlowFuncLeave();
   return NULL;
 }
@@ -888 +888 @@
   //
   BufferSize  = 0;
-  LogFlowFuncEnter();
-  LogFlowFuncMarkVar(Name, "%s");
+  VBoxLogFlowFuncEnter();
+  VBoxLogFlowFuncMarkVar(Name, "%s");
   Status      = gRT->GetVariable (Name, VendorGuid, NULL, &BufferSize, Buffer);
-  LogFlowFuncMarkRC(Status);
+  VBoxLogFlowFuncMarkRC(Status);
   if (Status == EFI_BUFFER_TOO_SMALL) {
     //
@@ -904 +904 @@
     //
     Status = gRT->GetVariable (Name, VendorGuid, NULL, &BufferSize, Buffer);
-    LogFlowFuncMarkRC(Status);
+    VBoxLogFlowFuncMarkRC(Status);
     if (EFI_ERROR (Status)) {
       BufferSize = 0;
@@ -911 +911 @@
 
   *VariableSize = BufferSize;
-  LogFlowFuncLeave();
+  VBoxLogFlowFuncLeave();
   return Buffer;
 }
@@ -1250 +1250 @@
   Root     = NULL;
   ThisFile = NULL;
-  LogFlowFuncEnter();
-  LogFlowFuncMarkVar(FileName, "%s");
+  VBoxLogFlowFuncEnter();
+  VBoxLogFlowFuncMarkVar(FileName, "%s");
   //
   // Handle the file system interface to the device
@@ -1260 +1260 @@
                   (VOID *) &Volume
                   );
-  LogFlowFuncMarkRC(Status);
+  VBoxLogFlowFuncMarkRC(Status);
   if (EFI_ERROR (Status)) {
     goto Done;
@@ -1269 +1269 @@
                      &Root
                      );
-  LogFlowFuncMarkRC(Status);
+  VBoxLogFlowFuncMarkRC(Status);
   if (EFI_ERROR (Status)) {
     Root = NULL;
@@ -1276 +1276 @@
   ASSERT (Root != NULL);
   Status = Root->Open (Root, &ThisFile, FileName, EFI_FILE_MODE_READ, 0);
-  LogFlowFuncMarkRC(Status);
+  VBoxLogFlowFuncMarkRC(Status);
   if (EFI_ERROR (Status)) {
     goto Done;
@@ -1289 +1289 @@
     Info   = NULL;
     Status = gBS->AllocatePool (EfiBootServicesData, BufferSize, (VOID **) &Info);
-    LogFlowFuncMarkRC(Status);
+    VBoxLogFlowFuncMarkRC(Status);
     if (EFI_ERROR (Status)) {
       goto Done;
@@ -1299 +1299 @@
                          Info
                          );
-    LogFlowFuncMarkRC(Status);
+    VBoxLogFlowFuncMarkRC(Status);
     if (!EFI_ERROR (Status)) {
       break;
@@ -1318 +1318 @@
   BufferSize = sizeof (EFI_IMAGE_DOS_HEADER);
   Status = ThisFile->Read (ThisFile, &BufferSize, DosHeader);
-  LogFlowFuncMarkRC(Status);
+  VBoxLogFlowFuncMarkRC(Status);
   if (
 #ifdef VBOX
@@ -1328 +1328 @@
           || DosHeader->e_magic != EFI_IMAGE_DOS_SIGNATURE)) {
     Status = EFI_LOAD_ERROR;
-    LogFlowFuncMarkRC(Status);
+    VBoxLogFlowFuncMarkRC(Status);
     goto Done;
   }
@@ -1340 +1340 @@
   //
   Status = ThisFile->SetPosition (ThisFile, DosHeader->e_lfanew);
-  LogFlowFuncMarkRC(Status);
+  VBoxLogFlowFuncMarkRC(Status);
   if (EFI_ERROR (Status)) {
     Status = EFI_LOAD_ERROR;
-    LogFlowFuncMarkRC(Status);
+    VBoxLogFlowFuncMarkRC(Status);
     goto Done;
   }
@@ -1352 +1352 @@
   BufferSize = sizeof (EFI_IMAGE_OPTIONAL_HEADER_UNION);
   Status = ThisFile->Read (ThisFile, &BufferSize, Hdr.Pe32);
-  LogFlowFuncMarkRC(Status);
+  VBoxLogFlowFuncMarkRC(Status);
   if (EFI_ERROR (Status) ||
       BufferSize < sizeof (EFI_IMAGE_OPTIONAL_HEADER_UNION) ||
       Hdr.Pe32->Signature != EFI_IMAGE_NT_SIGNATURE) {
     Status = EFI_LOAD_ERROR;
-    LogFlowFuncMarkRC(Status);
+    VBoxLogFlowFuncMarkRC(Status);
     goto Done;
   }
@@ -1367 +1367 @@
       Hdr.Pe32->OptionalHeader.Magic != EFI_IMAGE_NT_OPTIONAL_HDR64_MAGIC) {
     Status = EFI_LOAD_ERROR;
-    LogFlowFuncMarkRC(Status);
+    VBoxLogFlowFuncMarkRC(Status);
     goto Done;
   }
@@ -1381 +1381 @@
     Root->Close (Root);
   }
-  LogFlowFuncLeaveRC(Status);
+  VBoxLogFlowFuncLeaveRC(Status);
   return Status;
 }

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

@@ -478 +478 @@
 # endif
 # if defined(EFI_LOG_ENABLED)
-#  define LogFlowFuncEnter() DEBUG((DEBUG_INFO, "ENTER:%a:%d\n", __FUNCTION__, __LINE__))
-#  define LogFlowFuncLeave() DEBUG((DEBUG_INFO, "LEAVE:%a:%d\n", __FUNCTION__, __LINE__))
-#  define LogFlowFuncLeaveRC(rc) DEBUG((DEBUG_INFO, "LEAVE:%a:%d rc(%r)\n", __FUNCTION__, __LINE__, (rc)))
-#  define LogFlowFuncMark() DEBUG((DEBUG_INFO, "%a:%d\n", __FUNCTION__, __LINE__))
-#  define LogFlowFuncMarkRC(rc) DEBUG((DEBUG_INFO, "%a:%d " #rc ":%r \n", __FUNCTION__, __LINE__, (rc)))
-#  define LogFlowFuncMarkVar(var, var_printf_glag) DEBUG((DEBUG_INFO, "%a:%d " #var ": " var_printf_glag " \n", __FUNCTION__, __LINE__, (var)))
-#  define LogFlowFuncMarkDP(dp) DEBUG((DEBUG_INFO, "%a:%d " #dp ": \n", __FUNCTION__, __LINE__, VBoxDebugDevicePath2Str(dp)))
-#  define LogFlowFuncMarkHandleDP(dp) DEBUG((DEBUG_INFO, "%a:%d " #dp ": \n", __FUNCTION__, __LINE__, VBoxDebugHandleDevicePath2Str(dp)))
+#  define VBoxLogFlowFuncEnter() DEBUG((DEBUG_INFO, "ENTER:%a:%d\n", __FUNCTION__, __LINE__))
+#  define VBoxLogFlowFuncLeave() DEBUG((DEBUG_INFO, "LEAVE:%a:%d\n", __FUNCTION__, __LINE__))
+#  define VBoxLogFlowFuncLeaveRC(rc) DEBUG((DEBUG_INFO, "LEAVE:%a:%d rc(%r)\n", __FUNCTION__, __LINE__, (rc)))
+#  define VBoxLogFlowFuncMark() DEBUG((DEBUG_INFO, "%a:%d\n", __FUNCTION__, __LINE__))
+#  define VBoxLogFlowFuncMarkRC(rc) DEBUG((DEBUG_INFO, "%a:%d " #rc ":%r \n", __FUNCTION__, __LINE__, (rc)))
+#  define VBoxLogFlowFuncMarkVar(var, var_printf_glag) DEBUG((DEBUG_INFO, "%a:%d " #var ": " var_printf_glag " \n", __FUNCTION__, __LINE__, (var)))
+#  define VBoxLogFlowFuncMarkDP(dp) DEBUG((DEBUG_INFO, "%a:%d " #dp ": \n", __FUNCTION__, __LINE__, VBoxDebugDevicePath2Str(dp)))
+#  define VBoxLogFlowFuncMarkHandleDP(dp) DEBUG((DEBUG_INFO, "%a:%d " #dp ": \n", __FUNCTION__, __LINE__, VBoxDebugHandleDevicePath2Str(dp)))
 # else
-#  define LogFlowFuncEnter() do {} while (0)
-#  define LogFlowFuncLeave() do {} while (0)
-#  define LogFlowFuncLeaveRC(rc) do {} while (0)
-#  define LogFlowFuncMark() do {} while (0)
-#  define LogFlowFuncMarkRC(rc) do {} while (0)
-#  define LogFlowFuncMarkVar(var, var_printf_flag) do {} while (0)
-#  define LogFlowFuncMarkDP(dp) do {} while (0)
-#  define LogFlowFuncMarkHandleDP(dp) do {} while (0)
+#  define VBoxLogFlowFuncEnter() do {} while (0)
+#  define VBoxLogFlowFuncLeave() do {} while (0)
+#  define VBoxLogFlowFuncLeaveRC(rc) do {} while (0)
+#  define VBoxLogFlowFuncMark() do {} while (0)
+#  define VBoxLogFlowFuncMarkRC(rc) do {} while (0)
+#  define VBoxLogFlowFuncMarkVar(var, var_printf_flag) do {} while (0)
+#  define VBoxLogFlowFuncMarkDP(dp) do {} while (0)
+#  define VBoxLogLogFlowFuncMarkHandleDP(dp) do {} while (0)
 # endif
 #endif

trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c

@@ -971 +971 @@
   HandleCount = 0;
   HandleBuffer = NULL;
-  LogFlowFuncEnter();
+  VBoxLogFlowFuncEnter();
 
   VisitAllPciInstances (ConnectRecursivelyIfPciMassStorage);
@@ -989 +989 @@
                   &HandleBuffer
                   );
-  LogFlowFuncMarkRC(Status);
-
-  LogFlowFuncLeave();
+  VBoxLogFlowFuncMarkRC(Status);
+
+  VBoxLogFlowFuncLeave();
 }
 
@@ -1171 +1171 @@
   EFI_BOOT_MODE                      BootMode;
 
-  LogFlowFuncEnter();
+  VBoxLogFlowFuncEnter();
 
   ConnectRootBridge ();
@@ -1260 +1260 @@
                                           &cFileSystem,
                                           &phFileSystem);
-            LogFlowFuncMarkRC(rc);
-            LogFlowFuncMarkVar(cFileSystem, "%d");
+            VBoxLogFlowFuncMarkRC(rc);
+            VBoxLogFlowFuncMarkVar(cFileSystem, "%d");
             if (   rc == EFI_SUCCESS
                 && cFileSystem > 0)
@@ -1280 +1280 @@
                                               &gEfiSimpleFileSystemProtocolGuid,
                                               (VOID *) &pFSVolume);
-                    LogFlowFuncMarkVar(iFileSystem, "%d");
-                    LogFlowFuncMarkRC(rc);
+                    VBoxLogFlowFuncMarkVar(iFileSystem, "%d");
+                    VBoxLogFlowFuncMarkRC(rc);
                     if (EFI_ERROR(rc))
                         continue;
 
                     rc = pFSVolume->OpenVolume(pFSVolume, &hFSRoot);
-                    LogFlowFuncMarkRC(rc);
+                    VBoxLogFlowFuncMarkRC(rc);
                     if (EFI_ERROR(rc))
                         continue;
 
                     rc = hFSRoot->Open(hFSRoot, &hBootEfiFile, L"\\System\\Library\\CoreServices\\boot.efi", EFI_FILE_MODE_READ, 0);
-                    LogFlowFuncMarkRC(rc);
+                    VBoxLogFlowFuncMarkRC(rc);
                     if (EFI_ERROR(rc))
                         continue;
                     /* nice file is found and we have to register it */
                     pDevicePath = FileDevicePath(phFileSystem[iFileSystem], L"\\System\\Library\\CoreServices\\boot.efi");
-                    LogFlowFuncMarkVar(pDevicePath,"%p");
+                    VBoxLogFlowFuncMarkVar(pDevicePath,"%p");
                     if (!pDevicePath)
                         continue;
                     rc = BdsLibRegisterNewOption (BootOptionList, pDevicePath, L"Mac Boot", L"BootOrder");
-                    LogFlowFuncMarkRC(rc);
+                    VBoxLogFlowFuncMarkRC(rc);
                 }
             }
@@ -1306 +1306 @@
         else
         {
-            LogFlowFuncMarkVar(BootOption0080->LoadOptionsSize, "%d");
+            VBoxLogFlowFuncMarkVar(BootOption0080->LoadOptionsSize, "%d");
             if (BootOption0080->LoadOptionsSize)
-                LogFlowFuncMarkVar(BootOption0080->LoadOptions, "%s");
+                VBoxLogFlowFuncMarkVar(BootOption0080->LoadOptions, "%s");
 #if 0
             /* Boot0080 option is found */
@@ -1352 +1352 @@
   //
   Status = BdsLibBuildOptionFromVar (BootOptionList, L"BootOrder");
-  LogFlowFuncMarkRC(Status);
+  VBoxLogFlowFuncMarkRC(Status);
   if (EFI_ERROR(Status)) {
     //
@@ -1407 +1407 @@
   }
 
-  LogFlowFuncLeave();
+  VBoxLogFlowFuncLeave();
   return ;
 }
@@ -1700 +1700 @@
   UINT32                        InitializationSize;
 
-  LogFlowFuncEnter();
+  VBoxLogFlowFuncEnter();
   FileName = L"PciRomInMemory";
 
@@ -1841 +1841 @@
 
 
-  LogFlowFuncLeaveRC(retStatus);
+  VBoxLogFlowFuncLeaveRC(retStatus);
   return retStatus;
 }

trunk/src/VBox/Devices/EFI/Firmware/PcAtChipsetPkg/Bus/Pci/IdeControllerDxe/IdeController.c

@@ -90 +90 @@
 {
     EFI_STATUS Status = EFI_INVALID_PARAMETER;
-    LogFlowFuncEnter();
+    VBoxLogFlowFuncEnter();
     if (!ppPciIo)
     {
-        LogFlowFuncLeaveRC(Status);
+        VBoxLogFlowFuncLeaveRC(Status);
         return Status;
     }
@@ -104 +104 @@
                     EFI_OPEN_PROTOCOL_BY_DRIVER
                     );
-    LogFlowFuncLeaveRC(Status);
+    VBoxLogFlowFuncLeaveRC(Status);
     return Status;
 }
@@ -414 +414 @@
   // Channel number (0 based, either 0 or 1)
   //
-  LogFlowFuncEnter();
-  LogFlowFuncMarkVar(Channel, "%d");
+  VBoxLogFlowFuncEnter();
+  VBoxLogFlowFuncMarkVar(Channel, "%d");
   *MaxDevices = 0;
   *Enabled = FALSE;
@@ -430 +430 @@
         UINT64  u8DH = 0;
         ASSERT(pPciIo);
-        LogFlowFuncMarkVar(u8Device, "%d");
+        VBoxLogFlowFuncMarkVar(u8Device, "%d");
         if (u8Device == 0)
             u8DH = 0xa0;
@@ -437 +437 @@
         else
         {
-            LogFlowFuncLeaveRC(EFI_INVALID_PARAMETER);
+            VBoxLogFlowFuncLeaveRC(EFI_INVALID_PARAMETER);
             return EFI_INVALID_PARAMETER;
         }
@@ -452 +452 @@
                 return EFI_INVALID_PARAMETER;
         }
-        LogFlowFuncMarkVar(u8DH, "%x");
-        LogFlowFuncMarkVar(u64IoBase, "%llx");
+        VBoxLogFlowFuncMarkVar(u8DH, "%x");
+        VBoxLogFlowFuncMarkVar(u64IoBase, "%llx");
         pPciIo->Io.Write(pPciIo, EfiPciIoWidthUint8, EFI_PCI_IO_PASS_THROUGH_BAR, u64IoBase + 6, 1, (void *)&u8DH);
 
@@ -473 +473 @@
         pPciIo->Io.Read(pPciIo, EfiPciIoWidthUint8, EFI_PCI_IO_PASS_THROUGH_BAR, u64IoBase + 3, 1, (void *)&u8SN);
 
-        LogFlowFuncMarkVar(u8CS, "%x");
-        LogFlowFuncMarkVar(u8SN, "%x");
+        VBoxLogFlowFuncMarkVar(u8CS, "%x");
+        VBoxLogFlowFuncMarkVar(u8SN, "%x");
 
         fEnabled = (u8CS == 0xaa && u8SN == 0x55);
@@ -488 +488 @@
     *MaxDevices = ICH_IDE_MAX_DEVICES;
 #endif /* !VBOX */
-    LogFlowFuncMarkVar(*MaxDevices, "%d");
-    LogFlowFuncMarkVar(*Enabled, "%d");
-    LogFlowFuncLeaveRC(EFI_SUCCESS);
+    VBoxLogFlowFuncMarkVar(*MaxDevices, "%d");
+    VBoxLogFlowFuncMarkVar(*Enabled, "%d");
+    VBoxLogFlowFuncLeaveRC(EFI_SUCCESS);
     return EFI_SUCCESS;
   }

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Apple.c

@@ -106 +106 @@
   UINT32                    BlkPerSec;
 
-  LogFlowFuncMarkDP(DevicePath);
+  VBoxLogFlowFuncMarkDP(DevicePath);
   Found         = EFI_NOT_FOUND;
   Media         = BlockIo->Media;

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/ElTorito.c

@@ -86 +86 @@
   UINT32                  VolSpaceSize;
 
-  LogFlowFuncMarkDP(DevicePath);
+  VBoxLogFlowFuncMarkDP(DevicePath);
   Found         = EFI_NOT_FOUND;
   Media         = BlockIo->Media;

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Gpt.c

@@ -221 +221 @@
   UINT32                      MediaId;
 
-  LogFlowFuncMarkDP(DevicePath);
+  VBoxLogFlowFuncMarkDP(DevicePath);
   ProtectiveMbr = NULL;
   PrimaryHeader = NULL;

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Mbr.c

@@ -170 +170 @@
   LastBlock = BlockIo->Media->LastBlock;
 
-  LogFlowFuncMarkDP(DevicePath);
+  VBoxLogFlowFuncMarkDP(DevicePath);
   Mbr = AllocatePool (BlockSize);
   if (Mbr == NULL) {

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/PartitionDxe/Partition.c

@@ -103 +103 @@
   EFI_DISK_IO_PROTOCOL      *DiskIo;
   EFI_DEV_PATH              *Node;
-  LogFlowFuncEnter();
+  VBoxLogFlowFuncEnter();
 
   //
@@ -113 +113 @@
     // if yes, go on checking other conditions
     //
-    LogFlowFuncMarkDP(RemainingDevicePath);
+    VBoxLogFlowFuncMarkDP(RemainingDevicePath);
     if (!IsDevicePathEnd (RemainingDevicePath)) {
       //
@@ -125 +125 @@
             || Node->DevPath.Type != MESSAGING_DEVICE_PATH
             || Node->DevPath.SubType != MSG_SATA_DP) {
-        LogFlowFuncLeaveRC(EFI_UNSUPPORTED);
+        VBoxLogFlowFuncLeaveRC(EFI_UNSUPPORTED);
         return EFI_UNSUPPORTED;
       }
@@ -143 +143 @@
                   );
   if (Status == EFI_ALREADY_STARTED) {
-    LogFlowFuncLeaveRC(EFI_SUCCESS);
+    VBoxLogFlowFuncLeaveRC(EFI_SUCCESS);
     return EFI_SUCCESS;
   }
   if (EFI_ERROR (Status)) {
-    LogFlowFuncLeaveRC(Status);
+    VBoxLogFlowFuncLeaveRC(Status);
     return Status;
   }
@@ -171 +171 @@
                   EFI_OPEN_PROTOCOL_BY_DRIVER
                   );
-  LogFlowFuncMarkDP(ParentDevicePath);
+  VBoxLogFlowFuncMarkDP(ParentDevicePath);
   if (Status == EFI_ALREADY_STARTED) {
-    LogFlowFuncLeaveRC(EFI_SUCCESS);
+    VBoxLogFlowFuncLeaveRC(EFI_SUCCESS);
     return EFI_SUCCESS;
   }
 
   if (EFI_ERROR (Status)) {
-    LogFlowFuncLeaveRC(Status);
+    VBoxLogFlowFuncLeaveRC(Status);
     return Status;
   }
@@ -204 +204 @@
                   );
   if (EFI_ERROR (Status)) {
-    LogFlowFuncLeaveRC(Status);
+    VBoxLogFlowFuncLeaveRC(Status);
     return Status;
   }
 
-  LogFlowFuncLeaveRC(EFI_SUCCESS);
+  VBoxLogFlowFuncLeaveRC(EFI_SUCCESS);
   return EFI_SUCCESS;
 }
@@ -246 +246 @@
   int                       idxRoutine = 0;
 
-  LogFlowFuncEnter();
+  VBoxLogFlowFuncEnter();
   BlockIo2 = NULL;
   OldTpl = gBS->RaiseTPL (TPL_CALLBACK);
@@ -276 +276 @@
                   );
   if (EFI_ERROR (Status)) {
-    LogFlowFuncMarkRC(Status);
+    VBoxLogFlowFuncMarkRC(Status);
     goto Exit;
   }
@@ -301 +301 @@
                   );
   if (EFI_ERROR (Status) && Status != EFI_ALREADY_STARTED) {
-    LogFlowFuncMarkRC(Status);
+    VBoxLogFlowFuncMarkRC(Status);
     goto Exit;
   }
@@ -320 +320 @@
           ControllerHandle
           );
-    LogFlowFuncMarkRC(Status);
+    VBoxLogFlowFuncMarkRC(Status);
     goto Exit;
   }
@@ -348 +348 @@
                    ParentDevicePath
                    );
-      LogFlowFuncMarkRC(Status);
+      VBoxLogFlowFuncMarkRC(Status);
       if (!EFI_ERROR (Status) || Status == EFI_MEDIA_CHANGED || Status == EFI_NO_MEDIA) {
-        LogFlowFuncMarkVar(idxRoutine, "%d");
+        VBoxLogFlowFuncMarkVar(idxRoutine, "%d");
         break;
       }
@@ -399 +399 @@
 Exit:
   gBS->RestoreTPL (OldTpl);
-  LogFlowFuncLeaveRC(Status);
+  VBoxLogFlowFuncLeaveRC(Status);
   return Status;
 }

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

@@ -232 +232 @@
 
     // first, open DiskIO
-    LogFlowFuncEnter();
-    LogFlowFuncMarkDP(RemainingDevicePath);
+    VBoxLogFlowFuncEnter();
+    VBoxLogFlowFuncMarkDP(RemainingDevicePath);
 
     Status = BS->OpenProtocol(ControllerHandle,
@@ -243 +243 @@
     if (EFI_ERROR(Status))
     {
-        LogFlowFuncLeaveRC(Status);
+        VBoxLogFlowFuncLeaveRC(Status);
         return Status;
     }
@@ -260 +260 @@
                               ControllerHandle,
                               EFI_OPEN_PROTOCOL_TEST_PROTOCOL);
-    LogFlowFuncLeaveRC(Status);
+    VBoxLogFlowFuncLeaveRC(Status);
     return Status;
 }
@@ -270 +270 @@
 {
     EFI_STATUS Status;
-    LogFlowFuncEnter();
+    VBoxLogFlowFuncEnter();
     pVolume->Signature       = FSW_VOLUME_DATA_SIGNATURE;
     pVolume->Handle          = ControllerHandle;
@@ -282 +282 @@
                                 pVolume);
 
-    LogFlowFuncMarkVar(Status, "%r");
+    VBoxLogFlowFuncMarkVar(Status, "%r");
     if (!EFI_ERROR(Status)) {
         // register the SimpleFileSystem protocol
@@ -293 +293 @@
             Print(L"Fsw ERROR: InstallMultipleProtocolInterfaces returned %x\n", Status);
     }
-    LogFlowFuncLeaveRC(Status);
+    VBoxLogFlowFuncLeaveRC(Status);
     return Status;
 }
@@ -319 +319 @@
     FSW_VOLUME_DATA     *Volume;
 
-    LogFlowFuncEnter();
+    VBoxLogFlowFuncEnter();
     // open consumed protocols
     Status = BS->OpenProtocol(ControllerHandle,
@@ -328 +328 @@
                               EFI_OPEN_PROTOCOL_GET_PROTOCOL);   // NOTE: we only want to look at the MediaId
     if (EFI_ERROR(Status)) {
-        LogFlowFuncLeaveRC(Status);
+        VBoxLogFlowFuncLeaveRC(Status);
         return Status;
     }
@@ -339 +339 @@
                               EFI_OPEN_PROTOCOL_BY_DRIVER);
     if (EFI_ERROR(Status)) {
-        LogFlowFuncLeaveRC(Status);
+        VBoxLogFlowFuncLeaveRC(Status);
         return Status;
     }
@@ -364 +364 @@
     }
 
-    LogFlowFuncLeaveRC(Status);
+    VBoxLogFlowFuncLeaveRC(Status);
     return Status;
 }

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxVariable/InitVariable.c

@@ -95 +95 @@
 {
     UINT32 u32Rc;
-    LogFlowFuncEnter();
-    LogFlowFuncMarkVar(u32Operation, "%x");
+    VBoxLogFlowFuncEnter();
+    VBoxLogFlowFuncMarkVar(u32Operation, "%x");
     VBoxWriteNVRAMU32Param(EFI_VM_VARIABLE_OP_START, u32Operation);
 
@@ -106 +106 @@
         /* @todo: sleep here. bird: won't ever happen, so don't bother. */
     }
-    LogFlowFuncMarkVar(u32Rc, "%x");
-    LogFlowFuncLeave();
+    VBoxLogFlowFuncMarkVar(u32Rc, "%x");
+    VBoxLogFlowFuncLeave();
     return u32Rc;
 }
@@ -152 +152 @@
     UINT32 u32Rc;
 
-    LogFlowFuncEnter();
+    VBoxLogFlowFuncEnter();
 
     /*
@@ -168 +168 @@
         ASMOutU32(EFI_PORT_VARIABLE_OP, EFI_VM_VARIABLE_OP_VALUE_LENGTH);
         VarLen = ASMInU32(EFI_PORT_VARIABLE_OP);
-        LogFlowFuncMarkVar(*DataSize, "%d");
-        LogFlowFuncMarkVar(VarLen, "%d");
+        VBoxLogFlowFuncMarkVar(*DataSize, "%d");
+        VBoxLogFlowFuncMarkVar(VarLen, "%d");
         if (   VarLen <= *DataSize
             && Data)
@@ -184 +184 @@
                 ASMOutU32(EFI_PORT_VARIABLE_OP, EFI_VM_VARIABLE_OP_ATTRIBUTE);
                 *Attributes = ASMInU32(EFI_PORT_VARIABLE_OP);
-                LogFlowFuncMarkVar(Attributes, "%x");
+                VBoxLogFlowFuncMarkVar(Attributes, "%x");
             }
 
@@ -200 +200 @@
     }
 
-    LogFlowFuncLeaveRC(rc);
+    VBoxLogFlowFuncLeaveRC(rc);
     return rc;
 #endif
@@ -237 +237 @@
     uint32_t    u32Rc;
     EFI_STATUS  rc;
-    LogFlowFuncEnter();
+    VBoxLogFlowFuncEnter();
 
     /*
@@ -244 +244 @@
     if (!VariableNameSize || !VariableName || !VendorGuid)
     {
-        LogFlowFuncLeaveRC(EFI_INVALID_PARAMETER);
+        VBoxLogFlowFuncLeaveRC(EFI_INVALID_PARAMETER);
         return EFI_INVALID_PARAMETER;
     }
@@ -297 +297 @@
         rc = EFI_NOT_FOUND; /* whatever */
 
-    LogFlowFuncLeaveRC(rc);
+    VBoxLogFlowFuncLeaveRC(rc);
     return rc;
 #endif
@@ -343 +343 @@
 #else
     UINT32 u32Rc;
-    LogFlowFuncEnter();
-    LogFlowFuncMarkVar(VendorGuid, "%g");
-    LogFlowFuncMarkVar(VariableName, "%s");
-    LogFlowFuncMarkVar(DataSize, "%d");
+    VBoxLogFlowFuncEnter();
+    VBoxLogFlowFuncMarkVar(VendorGuid, "%g");
+    VBoxLogFlowFuncMarkVar(VariableName, "%s");
+    VBoxLogFlowFuncMarkVar(DataSize, "%d");
     /* set guid */
     VBoxWriteNVRAMGuidParam(VendorGuid);
@@ -361 +361 @@
     u32Rc = VBoxWriteNVRAMDoOp(EFI_VARIABLE_OP_ADD);
     /* process errors */
-    LogFlowFuncLeave();
+    VBoxLogFlowFuncLeave();
     switch (u32Rc)
     {
@@ -532 +532 @@
             &size,
             (void *)szTestVariable);
-        LogFlowFuncMarkVar(szTestVariable, "%a");
+        VBoxLogFlowFuncMarkVar(szTestVariable, "%a");
 
         ASSERT(CompareMem(szTestVariable, pszVariable0, size) == 0);
@@ -551 +551 @@
             &size,
             (void *)szTestVariable);
-        LogFlowFuncMarkVar((CHAR16 *)szTestVariable, "%s");
+        VBoxLogFlowFuncMarkVar((CHAR16 *)szTestVariable, "%s");
         ASSERT(CompareMem(szTestVariable, pszVariable1, size) == 0);
     }