OvmfPkg: Change use of EFI_D_* to DEBUG_*

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3739

Update all use of EFI_D_* defines in DEBUG() macros to DEBUG_* defines.

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

6 files changed, 26 insertions, 26 deletions

diff --git a/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
index 0099b8e3c3..56d00edb7c 100644
--- a/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
+++ b/OvmfPkg/Fdt/FdtPciHostBridgeLib/FdtPciHostBridgeLib.c
@@ -121,7 +121,7 @@ ProcessPciHost (
   Status = FdtClient->FindCompatibleNode (FdtClient, "pci-host-ecam-generic",

                         &Node);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_INFO,

+    DEBUG ((DEBUG_INFO,

       "%a: No 'pci-host-ecam-generic' compatible DT node found\n",

       __FUNCTION__));

     return EFI_NOT_FOUND;

@@ -141,7 +141,7 @@ ProcessPciHost (
 

   Status = FdtClient->GetNodeProperty (FdtClient, Node, "reg", &Prop, &Len);

   if (EFI_ERROR (Status) || Len != 2 * sizeof (UINT64)) {

-    DEBUG ((EFI_D_ERROR, "%a: 'reg' property not found or invalid\n",

+    DEBUG ((DEBUG_ERROR, "%a: 'reg' property not found or invalid\n",

       __FUNCTION__));

     return EFI_PROTOCOL_ERROR;

   }

@@ -158,7 +158,7 @@ ProcessPciHost (
   Status = FdtClient->GetNodeProperty (FdtClient, Node, "bus-range", &Prop,

                         &Len);

   if (EFI_ERROR (Status) || Len != 2 * sizeof (UINT32)) {

-    DEBUG ((EFI_D_ERROR, "%a: 'bus-range' not found or invalid\n",

+    DEBUG ((DEBUG_ERROR, "%a: 'bus-range' not found or invalid\n",

       __FUNCTION__));

     return EFI_PROTOCOL_ERROR;

   }

@@ -171,7 +171,7 @@ ProcessPciHost (
   //

   if (*BusMax < *BusMin || *BusMax - *BusMin == MAX_UINT32 ||

       DivU64x32 (ConfigSize, SIZE_4KB * 8 * 32) < *BusMax - *BusMin + 1) {

-    DEBUG ((EFI_D_ERROR, "%a: invalid 'bus-range' and/or 'reg'\n",

+    DEBUG ((DEBUG_ERROR, "%a: invalid 'bus-range' and/or 'reg'\n",

       __FUNCTION__));

     return EFI_PROTOCOL_ERROR;

   }

@@ -182,7 +182,7 @@ ProcessPciHost (
   Status = FdtClient->GetNodeProperty (FdtClient, Node, "ranges", &Prop, &Len);

   if (EFI_ERROR (Status) || Len == 0 ||

       Len % sizeof (DTB_PCI_HOST_RANGE_RECORD) != 0) {

-    DEBUG ((EFI_D_ERROR, "%a: 'ranges' not found or invalid\n", __FUNCTION__));

+    DEBUG ((DEBUG_ERROR, "%a: 'ranges' not found or invalid\n", __FUNCTION__));

     return EFI_PROTOCOL_ERROR;

   }

 

@@ -207,14 +207,14 @@ ProcessPciHost (
 

       if (*Mmio32Base > MAX_UINT32 || *Mmio32Size > MAX_UINT32 ||

           *Mmio32Base + *Mmio32Size > SIZE_4GB) {

-        DEBUG ((EFI_D_ERROR, "%a: MMIO32 space invalid\n", __FUNCTION__));

+        DEBUG ((DEBUG_ERROR, "%a: MMIO32 space invalid\n", __FUNCTION__));

         return EFI_PROTOCOL_ERROR;

       }

 

       ASSERT (PcdGet64 (PcdPciMmio32Translation) == Mmio32Translation);

 

       if (Mmio32Translation != 0) {

-        DEBUG ((EFI_D_ERROR, "%a: unsupported nonzero MMIO32 translation "

+        DEBUG ((DEBUG_ERROR, "%a: unsupported nonzero MMIO32 translation "

           "0x%Lx\n", __FUNCTION__, Mmio32Translation));

         return EFI_UNSUPPORTED;

       }

@@ -229,7 +229,7 @@ ProcessPciHost (
       ASSERT (PcdGet64 (PcdPciMmio64Translation) == Mmio64Translation);

 

       if (Mmio64Translation != 0) {

-        DEBUG ((EFI_D_ERROR, "%a: unsupported nonzero MMIO64 translation "

+        DEBUG ((DEBUG_ERROR, "%a: unsupported nonzero MMIO64 translation "

           "0x%Lx\n", __FUNCTION__, Mmio64Translation));

         return EFI_UNSUPPORTED;

       }

@@ -238,7 +238,7 @@ ProcessPciHost (
     }

   }

   if (*IoSize == 0 || *Mmio32Size == 0) {

-    DEBUG ((EFI_D_ERROR, "%a: %a space empty\n", __FUNCTION__,

+    DEBUG ((DEBUG_ERROR, "%a: %a space empty\n", __FUNCTION__,

       (*IoSize == 0) ? "IO" : "MMIO32"));

     return EFI_PROTOCOL_ERROR;

   }

@@ -249,7 +249,7 @@ ProcessPciHost (
   //

   ASSERT (PcdGet64 (PcdPciExpressBaseAddress) == ConfigBase);

 

-  DEBUG ((EFI_D_INFO, "%a: Config[0x%Lx+0x%Lx) Bus[0x%x..0x%x] "

+  DEBUG ((DEBUG_INFO, "%a: Config[0x%Lx+0x%Lx) Bus[0x%x..0x%x] "

     "Io[0x%Lx+0x%Lx)@0x%Lx Mem32[0x%Lx+0x%Lx)@0x0 Mem64[0x%Lx+0x%Lx)@0x0\n",

     __FUNCTION__, ConfigBase, ConfigSize, *BusMin, *BusMax, *IoBase, *IoSize,

     IoTranslation, *Mmio32Base, *Mmio32Size, *Mmio64Base, *Mmio64Size));

@@ -301,7 +301,7 @@ PciHostBridgeGetRootBridges (
   PCI_ROOT_BRIDGE_APERTURE PMemAbove4G;

 

   if (PcdGet64 (PcdPciExpressBaseAddress) == 0) {

-    DEBUG ((EFI_D_INFO, "%a: PCI host bridge not present\n", __FUNCTION__));

+    DEBUG ((DEBUG_INFO, "%a: PCI host bridge not present\n", __FUNCTION__));

 

     *Count = 0;

     return NULL;

@@ -310,7 +310,7 @@ PciHostBridgeGetRootBridges (
   Status = ProcessPciHost (&IoBase, &IoSize, &Mmio32Base, &Mmio32Size,

              &Mmio64Base, &Mmio64Size, &BusMin, &BusMax);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_ERROR, "%a: failed to discover PCI host bridge: %r\n",

+    DEBUG ((DEBUG_ERROR, "%a: failed to discover PCI host bridge: %r\n",

       __FUNCTION__, Status));

     *Count = 0;

     return NULL;

diff --git a/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c b/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
index 2520101017..8dd8fc9b3d 100644
--- a/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
+++ b/OvmfPkg/Fdt/FdtPciPcdProducerLib/FdtPciPcdProducerLib.c
@@ -57,7 +57,7 @@ GetPciIoTranslation (
   Status = FdtClient->GetNodeProperty (FdtClient, Node, "ranges", &Prop, &Len);

   if (EFI_ERROR (Status) || Len == 0 ||

       Len % sizeof (DTB_PCI_HOST_RANGE_RECORD) != 0) {

-    DEBUG ((EFI_D_ERROR, "%a: 'ranges' not found or invalid\n", __FUNCTION__));

+    DEBUG ((DEBUG_ERROR, "%a: 'ranges' not found or invalid\n", __FUNCTION__));

     return RETURN_PROTOCOL_ERROR;

   }

 

@@ -135,7 +135,7 @@ FdtPciPcdProducerLibConstructor (
         // to abort in the general case. So leave it up to the actual driver to

         // complain about this if it wants to, and just issue a warning here.

         //

-        DEBUG ((EFI_D_WARN,

+        DEBUG ((DEBUG_WARN,

           "%a: 'pci-host-ecam-generic' device encountered with no I/O range\n",

           __FUNCTION__));

       }

diff --git a/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c
index 3bcd3eb213..e2ae706127 100644
--- a/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c
+++ b/OvmfPkg/Fdt/HighMemDxe/HighMemDxe.c
@@ -80,7 +80,7 @@ InitializeHighMemDxe (
                         CurSize, EFI_MEMORY_WB);

 

         if (EFI_ERROR (Status)) {

-          DEBUG ((EFI_D_ERROR,

+          DEBUG ((DEBUG_ERROR,

             "%a: Failed to add System RAM @ 0x%lx - 0x%lx (%r)\n",

             __FUNCTION__, CurBase, CurBase + CurSize - 1, Status));

           continue;

@@ -114,11 +114,11 @@ InitializeHighMemDxe (
         Status = Cpu->SetMemoryAttributes (Cpu, CurBase, CurSize, Attributes);

 

         if (EFI_ERROR (Status)) {

-          DEBUG ((EFI_D_ERROR,

+          DEBUG ((DEBUG_ERROR,

             "%a: Failed to set System RAM @ 0x%lx - 0x%lx attribute (%r)\n",

             __FUNCTION__, CurBase, CurBase + CurSize - 1, Status));

         } else {

-          DEBUG ((EFI_D_INFO, "%a: Add System RAM @ 0x%lx - 0x%lx\n",

+          DEBUG ((DEBUG_INFO, "%a: Add System RAM @ 0x%lx - 0x%lx\n",

             __FUNCTION__, CurBase, CurBase + CurSize - 1));

         }

       }

diff --git a/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c b/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c
index 9625693b15..fdef5f166a 100644
--- a/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c
+++ b/OvmfPkg/Fdt/VirtioFdtDxe/VirtioFdtDxe.c
@@ -57,7 +57,7 @@ InitializeVirtioFdtDxe (
     Status = FdtClient->GetNodeProperty (FdtClient, Node, "reg",

                           (CONST VOID **)&Reg, &RegSize);

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_ERROR, "%a: GetNodeProperty () failed (Status == %r)\n",

+      DEBUG ((DEBUG_ERROR, "%a: GetNodeProperty () failed (Status == %r)\n",

         __FUNCTION__, Status));

       continue;

     }

@@ -73,7 +73,7 @@ InitializeVirtioFdtDxe (
                                   HW_VENDOR_DP,

                                   sizeof (VIRTIO_TRANSPORT_DEVICE_PATH));

     if (DevicePath == NULL) {

-      DEBUG ((EFI_D_ERROR, "%a: Out of memory\n", __FUNCTION__));

+      DEBUG ((DEBUG_ERROR, "%a: Out of memory\n", __FUNCTION__));

       continue;

     }

 

@@ -88,7 +88,7 @@ InitializeVirtioFdtDxe (
                      &gEfiDevicePathProtocolGuid, EFI_NATIVE_INTERFACE,

                      DevicePath);

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_ERROR, "%a: Failed to install the EFI_DEVICE_PATH "

+      DEBUG ((DEBUG_ERROR, "%a: Failed to install the EFI_DEVICE_PATH "

         "protocol on a new handle (Status == %r)\n",

         __FUNCTION__, Status));

       FreePool (DevicePath);

@@ -97,7 +97,7 @@ InitializeVirtioFdtDxe (
 

     Status = VirtioMmioInstallDevice (RegBase, Handle);

     if (EFI_ERROR (Status)) {

-      DEBUG ((EFI_D_ERROR, "%a: Failed to install VirtIO transport @ 0x%Lx "

+      DEBUG ((DEBUG_ERROR, "%a: Failed to install VirtIO transport @ 0x%Lx "

         "on handle %p (Status == %r)\n", __FUNCTION__, RegBase,

         Handle, Status));

 

@@ -110,7 +110,7 @@ InitializeVirtioFdtDxe (
   }

 

   if (EFI_ERROR (FindNodeStatus) && FindNodeStatus != EFI_NOT_FOUND) {

-     DEBUG ((EFI_D_ERROR, "%a: Error occurred while iterating DT nodes "

+     DEBUG ((DEBUG_ERROR, "%a: Error occurred while iterating DT nodes "

        "(FindNodeStatus == %r)\n", __FUNCTION__, FindNodeStatus));

   }

 

diff --git a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c
index e767c3b172..639dbd6e45 100644
--- a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c
@@ -253,7 +253,7 @@ RemoveStaleFvFileOptions (
       DevicePathString = ConvertDevicePathToText(BootOptions[Index].FilePath,

                            FALSE, FALSE);

       DEBUG ((

-        EFI_ERROR (Status) ? EFI_D_WARN : DEBUG_VERBOSE,

+        EFI_ERROR (Status) ? DEBUG_WARN : DEBUG_VERBOSE,

         "%a: removing stale Boot#%04x %s: %r\n",

         __FUNCTION__,

         (UINT32)BootOptions[Index].OptionNumber,

diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.c
index b953f2eb6c..457eba82fa 100644
--- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.c
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLibMmio.c
@@ -125,7 +125,7 @@ QemuFwCfgInitialize (
                          (CONST VOID **)&Reg, &AddressCells, &SizeCells,

                          &RegSize);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_WARN,

+    DEBUG ((DEBUG_WARN,

       "%a: No 'qemu,fw-cfg-mmio' compatible DT node found (Status == %r)\n",

       __FUNCTION__, Status));

     return EFI_SUCCESS;

@@ -156,7 +156,7 @@ QemuFwCfgInitialize (
   mFwCfgSelectorAddress = FwCfgSelectorAddress;

   mFwCfgDataAddress     = FwCfgDataAddress;

 

-  DEBUG ((EFI_D_INFO, "Found FwCfg @ 0x%Lx/0x%Lx\n", FwCfgSelectorAddress,

+  DEBUG ((DEBUG_INFO, "Found FwCfg @ 0x%Lx/0x%Lx\n", FwCfgSelectorAddress,

     FwCfgDataAddress));

 

   if (SwapBytes64 (Reg[1]) >= 0x18) {

@@ -168,7 +168,7 @@ QemuFwCfgInitialize (
     //

     ASSERT (FwCfgDmaAddress <= MAX_UINTN - FwCfgDmaSize + 1);

 

-    DEBUG ((EFI_D_INFO, "Found FwCfg DMA @ 0x%Lx\n", FwCfgDmaAddress));

+    DEBUG ((DEBUG_INFO, "Found FwCfg DMA @ 0x%Lx\n", FwCfgDmaAddress));

   } else {

     FwCfgDmaAddress = 0;

   }