Changeset 48730 in vbox for trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg

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!

File:

• trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/Library/PlatformBdsLib/BdsPlatform.c (modified) (10 diffs)

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;
 }