OvmfPkg: replace old EFI_D_ debug levels with new DEBUG_ ones

Generated mechanically with:
find OvmfPkg -type f -exec sed -i -e 's/EFI_D_/DEBUG_/g' {} \;

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
Cc: Philippe Mathieu-Daude <philmd@redhat.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Message-Id: <20200429215327.606467-1-rebecca@bsdio.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>

17 files changed, 60 insertions, 60 deletions

diff --git a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c
index aa2b5fa..7c593e8 100644
--- a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c
+++ b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c
@@ -56,7 +56,7 @@ AcpiTimerLibConstructor (
       AcpiEnBit  = ICH9_ACPI_CNTL_ACPI_EN;

       break;

     default:

-      DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",

+      DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",

         __FUNCTION__, HostBridgeDevId));

       ASSERT (FALSE);

       return RETURN_UNSUPPORTED;

diff --git a/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c
index dd022ac..52f3ea2 100644
--- a/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c
+++ b/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c
@@ -54,7 +54,7 @@ AcpiTimerLibConstructor (
       AcpiEnBit  = ICH9_ACPI_CNTL_ACPI_EN;

       break;

     default:

-      DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",

+      DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",

         __FUNCTION__, HostBridgeDevId));

       ASSERT (FALSE);

       return RETURN_UNSUPPORTED;

@@ -108,7 +108,7 @@ InternalAcpiGetTimerTick (
       Pmba = POWER_MGMT_REGISTER_Q35 (ICH9_PMBASE);

       break;

     default:

-      DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",

+      DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",

         __FUNCTION__, HostBridgeDevId));

       ASSERT (FALSE);

       return 0;

diff --git a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c
index ae976cb..09076c0 100644
--- a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c
+++ b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c
@@ -51,7 +51,7 @@ AcpiTimerLibConstructor (
       Pmba = POWER_MGMT_REGISTER_Q35 (ICH9_PMBASE);

       break;

     default:

-      DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",

+      DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",

         __FUNCTION__, HostBridgeDevId));

       ASSERT (FALSE);

       return RETURN_UNSUPPORTED;

diff --git a/OvmfPkg/Library/LoadLinuxLib/Linux.c b/OvmfPkg/Library/LoadLinuxLib/Linux.c
index 318e36f..c5022f6 100644
--- a/OvmfPkg/Library/LoadLinuxLib/Linux.c
+++ b/OvmfPkg/Library/LoadLinuxLib/Linux.c
@@ -137,7 +137,7 @@ LoadLinuxInitializeKernelSetup (
   //

   ZeroMem (KernelSetup, 0x1f1);

   ZeroMem (((UINT8 *)KernelSetup) + SetupEnd, 4096 - SetupEnd);

-  DEBUG ((EFI_D_INFO, "Cleared kernel setup 0-0x1f1, 0x%Lx-0x1000\n",

+  DEBUG ((DEBUG_INFO, "Cleared kernel setup 0-0x1f1, 0x%Lx-0x1000\n",

     (UINT64)SetupEnd));

 

   return EFI_SUCCESS;

@@ -338,7 +338,7 @@ SetupLinuxMemmap (
 

     default:

       DEBUG ((

-        EFI_D_ERROR,

+        DEBUG_ERROR,

         "Invalid EFI memory descriptor type (0x%x)!\n",

         MemoryMap->Type

         ));

@@ -643,7 +643,7 @@ LoadLinux (
   Bp->hdr.code32_start = (UINT32)(UINTN) Kernel;

   if (Bp->hdr.version >= 0x20c && Bp->hdr.handover_offset &&

       (Bp->hdr.xloadflags & (sizeof (UINTN) == 4 ? BIT2 : BIT3))) {

-    DEBUG ((EFI_D_INFO, "Jumping to kernel EFI handover point at ofs %x\n", Bp->hdr.handover_offset));

+    DEBUG ((DEBUG_INFO, "Jumping to kernel EFI handover point at ofs %x\n", Bp->hdr.handover_offset));

 

     DisableInterrupts ();

     JumpToUefiKernel ((VOID*) gImageHandle, (VOID*) gST, KernelSetup, Kernel);

@@ -654,7 +654,7 @@ LoadLinux (
   //

   SetupLinuxBootParams (KernelSetup);

 

-  DEBUG ((EFI_D_INFO, "Jumping to kernel\n"));

+  DEBUG ((DEBUG_INFO, "Jumping to kernel\n"));

   DisableInterrupts ();

   SetLinuxDescriptorTables ();

   JumpToKernel (Kernel, (VOID*) KernelSetup);

diff --git a/OvmfPkg/Library/NvVarsFileLib/FsAccess.c b/OvmfPkg/Library/NvVarsFileLib/FsAccess.c
index 627a15a..2ba0352 100644
--- a/OvmfPkg/Library/NvVarsFileLib/FsAccess.c
+++ b/OvmfPkg/Library/NvVarsFileLib/FsAccess.c
@@ -228,7 +228,7 @@ ReadNvVarsFile (
 

   Status = GetNvVarsFile (FsHandle, TRUE, &File);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_INFO, "FsAccess.c: Could not open NV Variables file on this file system\n"));

+    DEBUG ((DEBUG_INFO, "FsAccess.c: Could not open NV Variables file on this file system\n"));

     return Status;

   }

 

@@ -245,7 +245,7 @@ ReadNvVarsFile (
   }

 

   DEBUG ((

-    EFI_D_INFO,

+    DEBUG_INFO,

     "FsAccess.c: Read %Lu bytes from NV Variables file\n",

     (UINT64)FileSize

     ));

@@ -317,7 +317,7 @@ LoadNvVarsFromFs (
   BOOLEAN                        VarData;

   UINTN                          Size;

 

-  DEBUG ((EFI_D_INFO, "FsAccess.c: LoadNvVarsFromFs\n"));

+  DEBUG ((DEBUG_INFO, "FsAccess.c: LoadNvVarsFromFs\n"));

 

   //

   // We write a variable to indicate we've already loaded the

@@ -338,7 +338,7 @@ LoadNvVarsFromFs (
                   (VOID*) &VarData

                   );

   if (Status == EFI_SUCCESS) {

-    DEBUG ((EFI_D_INFO, "NV Variables were already loaded\n"));

+    DEBUG ((DEBUG_INFO, "NV Variables were already loaded\n"));

     return EFI_ALREADY_STARTED;

   }

 

@@ -347,7 +347,7 @@ LoadNvVarsFromFs (
   //

   Status = ReadNvVarsFile (FsHandle);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_INFO, "Error while restoring NV variable data\n"));

+    DEBUG ((DEBUG_INFO, "Error while restoring NV variable data\n"));

     return Status;

   }

 

@@ -359,7 +359,7 @@ LoadNvVarsFromFs (
   SetNvVarsVariable();

 

   DEBUG ((

-    EFI_D_INFO,

+    DEBUG_INFO,

     "FsAccess.c: Read NV Variables file (size=%Lu)\n",

     (UINT64)Size

     ));

@@ -469,7 +469,7 @@ SaveNvVarsToFs (
   //

   Status = GetNvVarsFile (FsHandle, FALSE, &File);

   if (EFI_ERROR (Status)) {

-    DEBUG ((EFI_D_INFO, "FsAccess.c: Unable to open file to saved NV Variables\n"));

+    DEBUG ((DEBUG_INFO, "FsAccess.c: Unable to open file to saved NV Variables\n"));

     return Status;

   }

 

@@ -498,7 +498,7 @@ SaveNvVarsToFs (
     //

     SetNvVarsVariable();

 

-    DEBUG ((EFI_D_INFO, "Saved NV Variables to NvVars file\n"));

+    DEBUG ((DEBUG_INFO, "Saved NV Variables to NvVars file\n"));

   }

 

   return Status;

diff --git a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
index ec2385b..e850f7d 100644
--- a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
+++ b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c
@@ -152,13 +152,13 @@ InitRootBridge (
   DevicePath = AllocateCopyPool (sizeof mRootBridgeDevicePathTemplate,

                  &mRootBridgeDevicePathTemplate);

   if (DevicePath == NULL) {

-    DEBUG ((EFI_D_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));

+    DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));

     return EFI_OUT_OF_RESOURCES;

   }

   DevicePath->AcpiDevicePath.UID = RootBusNumber;

   RootBus->DevicePath = (EFI_DEVICE_PATH_PROTOCOL *)DevicePath;

 

-  DEBUG ((EFI_D_INFO,

+  DEBUG ((DEBUG_INFO,

     "%a: populated root bus %d, with room for %d subordinate bus(es)\n",

     __FUNCTION__, RootBusNumber, MaxSubBusNumber - RootBusNumber));

   return EFI_SUCCESS;

@@ -256,11 +256,11 @@ PciHostBridgeGetRootBridges (
     QemuFwCfgReadBytes (FwCfgSize, &ExtraRootBridges);

 

     if (ExtraRootBridges > PCI_MAX_BUS) {

-      DEBUG ((EFI_D_ERROR, "%a: invalid count of extra root buses (%Lu) "

+      DEBUG ((DEBUG_ERROR, "%a: invalid count of extra root buses (%Lu) "

         "reported by QEMU\n", __FUNCTION__, ExtraRootBridges));

       return NULL;

     }

-    DEBUG ((EFI_D_INFO, "%a: %Lu extra root buses reported by QEMU\n",

+    DEBUG ((DEBUG_INFO, "%a: %Lu extra root buses reported by QEMU\n",

       __FUNCTION__, ExtraRootBridges));

   }

 

@@ -269,7 +269,7 @@ PciHostBridgeGetRootBridges (
   //

   Bridges = AllocatePool ((1 + (UINTN)ExtraRootBridges) * sizeof *Bridges);

   if (Bridges == NULL) {

-    DEBUG ((EFI_D_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));

+    DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));

     return NULL;

   }

   Initialized = 0;

@@ -409,22 +409,22 @@ PciHostBridgeResourceConflict (
 {

   EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor;

   UINTN                             RootBridgeIndex;

-  DEBUG ((EFI_D_ERROR, "PciHostBridge: Resource conflict happens!\n"));

+  DEBUG ((DEBUG_ERROR, "PciHostBridge: Resource conflict happens!\n"));

 

   RootBridgeIndex = 0;

   Descriptor = (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *) Configuration;

   while (Descriptor->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR) {

-    DEBUG ((EFI_D_ERROR, "RootBridge[%d]:\n", RootBridgeIndex++));

+    DEBUG ((DEBUG_ERROR, "RootBridge[%d]:\n", RootBridgeIndex++));

     for (; Descriptor->Desc == ACPI_ADDRESS_SPACE_DESCRIPTOR; Descriptor++) {

       ASSERT (Descriptor->ResType <

               ARRAY_SIZE (mPciHostBridgeLibAcpiAddressSpaceTypeStr)

               );

-      DEBUG ((EFI_D_ERROR, " %s: Length/Alignment = 0x%lx / 0x%lx\n",

+      DEBUG ((DEBUG_ERROR, " %s: Length/Alignment = 0x%lx / 0x%lx\n",

               mPciHostBridgeLibAcpiAddressSpaceTypeStr[Descriptor->ResType],

               Descriptor->AddrLen, Descriptor->AddrRangeMax

               ));

       if (Descriptor->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM) {

-        DEBUG ((EFI_D_ERROR, "     Granularity/SpecificFlag = %ld / %02x%s\n",

+        DEBUG ((DEBUG_ERROR, "     Granularity/SpecificFlag = %ld / %02x%s\n",

                 Descriptor->AddrSpaceGranularity, Descriptor->SpecificFlag,

                 ((Descriptor->SpecificFlag &

                   EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_PREFETCHABLE

diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
index 45d0ee9..3c55ec9 100644
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
@@ -252,7 +252,7 @@ RemoveStaleFvFileOptions (
       DevicePathString = ConvertDevicePathToText(BootOptions[Index].FilePath,

                            FALSE, FALSE);

       DEBUG ((

-        EFI_ERROR (Status) ? EFI_D_WARN : EFI_D_VERBOSE,

+        EFI_ERROR (Status) ? DEBUG_WARN : DEBUG_VERBOSE,

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

         __FUNCTION__,

         (UINT32)BootOptions[Index].OptionNumber,

@@ -356,7 +356,7 @@ PlatformBootManagerBeforeConsole (
   UINT16        FrontPageTimeout;

   RETURN_STATUS PcdStatus;

 

-  DEBUG ((EFI_D_INFO, "PlatformBootManagerBeforeConsole\n"));

+  DEBUG ((DEBUG_INFO, "PlatformBootManagerBeforeConsole\n"));

   InstallDevicePathCallback ();

 

   VisitAllInstancesOfProtocol (&gEfiPciRootBridgeIoProtocolGuid,

@@ -610,7 +610,7 @@ PrepareLpcBridgeDevicePath (
   DevPathStr = ConvertDevicePathToText (DevicePath, FALSE, FALSE);

   if (DevPathStr != NULL) {

     DEBUG((

-      EFI_D_INFO,

+      DEBUG_INFO,

       "BdsPlatform.c+%d: COM%d DevPath: %s\n",

       __LINE__,

       gPnp16550ComPortDeviceNode.UID + 1,

@@ -642,7 +642,7 @@ PrepareLpcBridgeDevicePath (
   DevPathStr = ConvertDevicePathToText (DevicePath, FALSE, FALSE);

   if (DevPathStr != NULL) {

     DEBUG((

-      EFI_D_INFO,

+      DEBUG_INFO,

       "BdsPlatform.c+%d: COM%d DevPath: %s\n",

       __LINE__,

       gPnp16550ComPortDeviceNode.UID + 1,

@@ -966,7 +966,7 @@ DetectAndPreparePlatformPciDevicePath (
     // Add IsaKeyboard to ConIn,

     // add IsaSerial to ConOut, ConIn, ErrOut

     //

-    DEBUG ((EFI_D_INFO, "Found LPC Bridge device\n"));

+    DEBUG ((DEBUG_INFO, "Found LPC Bridge device\n"));

     PrepareLpcBridgeDevicePath (Handle);

     return EFI_SUCCESS;

   }

@@ -977,7 +977,7 @@ DetectAndPreparePlatformPciDevicePath (
     //

     // Add them to ConOut, ConIn, ErrOut.

     //

-    DEBUG ((EFI_D_INFO, "Found PCI 16550 SERIAL device\n"));

+    DEBUG ((DEBUG_INFO, "Found PCI 16550 SERIAL device\n"));

     PreparePciSerialDevicePath (Handle);

     return EFI_SUCCESS;

   }

@@ -989,7 +989,7 @@ DetectAndPreparePlatformPciDevicePath (
     //

     // Add them to ConOut.

     //

-    DEBUG ((EFI_D_INFO, "Found PCI display device\n"));

+    DEBUG ((DEBUG_INFO, "Found PCI display device\n"));

     PreparePciDisplayDevicePath (Handle);

     return EFI_SUCCESS;

   }

@@ -1118,7 +1118,7 @@ SetPciIntLine (
     }

     if (RootBusNumber == 0 && RootSlot == 0) {

       DEBUG((

-        EFI_D_ERROR,

+        DEBUG_ERROR,

         "%a: PCI host bridge (00:00.0) should have no interrupts!\n",

         __FUNCTION__

         ));

@@ -1169,7 +1169,7 @@ SetPciIntLine (
       Status = PciIo->GetLocation (PciIo, &Segment, &Bus, &Device, &Function);

       ASSERT_EFI_ERROR (Status);

 

-      DEBUG ((EFI_D_VERBOSE, "%a: [%02x:%02x.%x] %s -> 0x%02x\n", __FUNCTION__,

+      DEBUG ((DEBUG_VERBOSE, "%a: [%02x:%02x.%x] %s -> 0x%02x\n", __FUNCTION__,

         (UINT32)Bus, (UINT32)Device, (UINT32)Function, DevPathString,

         IrqLine));

 

@@ -1237,7 +1237,7 @@ PciAcpiInitialization (
         //

         return;

       }

-      DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",

+      DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",

         __FUNCTION__, mHostBridgeDevId));

       ASSERT (FALSE);

       return;

@@ -1287,7 +1287,7 @@ ConnectRecursivelyIfPciMassStorage (
     DevPathStr = ConvertDevicePathToText (DevicePath, FALSE, FALSE);

     if (DevPathStr != NULL) {

       DEBUG((

-        EFI_D_INFO,

+        DEBUG_INFO,

         "Found %s device: %s\n",

         (IS_CLASS1 (PciHeader, PCI_CLASS_MASS_STORAGE) ?

          L"Mass Storage" :

@@ -1324,7 +1324,7 @@ EmuVariablesUpdatedCallback (
   IN  VOID      *Context

   )

 {

-  DEBUG ((EFI_D_INFO, "EmuVariablesUpdatedCallback\n"));

+  DEBUG ((DEBUG_INFO, "EmuVariablesUpdatedCallback\n"));

   UpdateNvVarsOnFileSystem ();

 }

 

@@ -1393,7 +1393,7 @@ PlatformBdsConnectSequence (
   UINTN         Index;

   RETURN_STATUS Status;

 

-  DEBUG ((EFI_D_INFO, "PlatformBdsConnectSequence\n"));

+  DEBUG ((DEBUG_INFO, "PlatformBdsConnectSequence\n"));

 

   Index = 0;

 

@@ -1473,10 +1473,10 @@ PlatformBootManagerAfterConsole (
 {

   EFI_BOOT_MODE                      BootMode;

 

-  DEBUG ((EFI_D_INFO, "PlatformBootManagerAfterConsole\n"));

+  DEBUG ((DEBUG_INFO, "PlatformBootManagerAfterConsole\n"));

 

   if (PcdGetBool (PcdOvmfFlashVariablesEnable)) {

-    DEBUG ((EFI_D_INFO, "PlatformBdsPolicyBehavior: not restoring NvVars "

+    DEBUG ((DEBUG_INFO, "PlatformBdsPolicyBehavior: not restoring NvVars "

       "from disk since flash variables appear to be supported.\n"));

   } else {

     //

@@ -1629,7 +1629,7 @@ InstallDevicePathCallback (
   VOID

   )

 {

-  DEBUG ((EFI_D_INFO, "Registered NotifyDevPath Event\n"));

+  DEBUG ((DEBUG_INFO, "Registered NotifyDevPath Event\n"));

   mEfiDevPathEvent = EfiCreateProtocolNotifyEvent (

                           &gEfiDevicePathProtocolGuid,

                           TPL_CALLBACK,

diff --git a/OvmfPkg/Library/QemuBootOrderLib/ExtraRootBusMap.c b/OvmfPkg/Library/QemuBootOrderLib/ExtraRootBusMap.c
index 4431b13..25d5494 100644
--- a/OvmfPkg/Library/QemuBootOrderLib/ExtraRootBusMap.c
+++ b/OvmfPkg/Library/QemuBootOrderLib/ExtraRootBusMap.c
@@ -216,7 +216,7 @@ CreateExtraRootBusMap (
     ASSERT (Entry != NULL);

     Acpi = OrderedCollectionUserStruct (Entry);

     Map->BusNumbers[Idx] = Acpi->UID;

-    DEBUG ((EFI_D_VERBOSE,

+    DEBUG ((DEBUG_VERBOSE,

       "%a: extra bus position 0x%Lx maps to bus number (UID) 0x%x\n",

       __FUNCTION__, (UINT64)(Idx + 1), Acpi->UID));

     ++Idx;

diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c
index 983680f..0182c92 100644
--- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c
@@ -66,14 +66,14 @@ QemuFwCfgInitialize (
 

   QemuFwCfgSelectItem (QemuFwCfgItemSignature);

   Signature = QemuFwCfgRead32 ();

-  DEBUG ((EFI_D_INFO, "FW CFG Signature: 0x%x\n", Signature));

+  DEBUG ((DEBUG_INFO, "FW CFG Signature: 0x%x\n", Signature));

   QemuFwCfgSelectItem (QemuFwCfgItemInterfaceVersion);

   Revision = QemuFwCfgRead32 ();

-  DEBUG ((EFI_D_INFO, "FW CFG Revision: 0x%x\n", Revision));

+  DEBUG ((DEBUG_INFO, "FW CFG Revision: 0x%x\n", Revision));

   if ((Signature != SIGNATURE_32 ('Q', 'E', 'M', 'U')) ||

       (Revision < 1)

      ) {

-    DEBUG ((EFI_D_INFO, "QemuFwCfg interface not supported.\n"));

+    DEBUG ((DEBUG_INFO, "QemuFwCfg interface not supported.\n"));

     mQemuFwCfgSupported = FALSE;

     return RETURN_SUCCESS;

   }

diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
index 4d2c43c..4ef78b7 100644
--- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c
@@ -35,7 +35,7 @@ QemuFwCfgSelectItem (
   IN FIRMWARE_CONFIG_ITEM   QemuFwCfgItem

   )

 {

-  DEBUG ((EFI_D_INFO, "Select Item: 0x%x\n", (UINT16)(UINTN) QemuFwCfgItem));

+  DEBUG ((DEBUG_INFO, "Select Item: 0x%x\n", (UINT16)(UINTN) QemuFwCfgItem));

   IoWrite16 (FW_CFG_IO_SELECTOR, (UINT16)(UINTN) QemuFwCfgItem);

 }

 

diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c
index d07b171..ecabd88 100644
--- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c
@@ -59,14 +59,14 @@ QemuFwCfgInitialize (
 

   QemuFwCfgSelectItem (QemuFwCfgItemSignature);

   Signature = QemuFwCfgRead32 ();

-  DEBUG ((EFI_D_INFO, "FW CFG Signature: 0x%x\n", Signature));

+  DEBUG ((DEBUG_INFO, "FW CFG Signature: 0x%x\n", Signature));

   QemuFwCfgSelectItem (QemuFwCfgItemInterfaceVersion);

   Revision = QemuFwCfgRead32 ();

-  DEBUG ((EFI_D_INFO, "FW CFG Revision: 0x%x\n", Revision));

+  DEBUG ((DEBUG_INFO, "FW CFG Revision: 0x%x\n", Revision));

   if ((Signature != SIGNATURE_32 ('Q', 'E', 'M', 'U')) ||

       (Revision < 1)

      ) {

-    DEBUG ((EFI_D_INFO, "QemuFwCfg interface not supported.\n"));

+    DEBUG ((DEBUG_INFO, "QemuFwCfg interface not supported.\n"));

     mQemuFwCfgSupported = FALSE;

     return RETURN_SUCCESS;

   }

diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSec.c b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSec.c
index d7a44e5..94e8e92 100644
--- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSec.c
+++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSec.c
@@ -38,18 +38,18 @@ QemuFwCfgIsAvailable (
 

   QemuFwCfgSelectItem (QemuFwCfgItemSignature);

   Signature = QemuFwCfgRead32 ();

-  DEBUG ((EFI_D_INFO, "FW CFG Signature: 0x%x\n", Signature));

+  DEBUG ((DEBUG_INFO, "FW CFG Signature: 0x%x\n", Signature));

   QemuFwCfgSelectItem (QemuFwCfgItemInterfaceVersion);

   Revision = QemuFwCfgRead32 ();

-  DEBUG ((EFI_D_INFO, "FW CFG Revision: 0x%x\n", Revision));

+  DEBUG ((DEBUG_INFO, "FW CFG Revision: 0x%x\n", Revision));

   if ((Signature != SIGNATURE_32 ('Q', 'E', 'M', 'U')) ||

       (Revision < 1)

      ) {

-    DEBUG ((EFI_D_INFO, "QemuFwCfg interface not supported.\n"));

+    DEBUG ((DEBUG_INFO, "QemuFwCfg interface not supported.\n"));

     return FALSE;

   }

 

-  DEBUG ((EFI_D_INFO, "QemuFwCfg interface is supported.\n"));

+  DEBUG ((DEBUG_INFO, "QemuFwCfg interface is supported.\n"));

   return TRUE;

 }

 

diff --git a/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c b/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c
index a6cebcb..777b93f 100644
--- a/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c
+++ b/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c
@@ -211,7 +211,7 @@ IterateVariablesInBuffer (
   //

   if (TotalSizeUsed != MaxSize) {

     DEBUG ((

-      EFI_D_ERROR,

+      DEBUG_ERROR,

       "Deserialize variables error: TotalSizeUsed(%Lu) != MaxSize(%Lu)\n",

       (UINT64)TotalSizeUsed,

       (UINT64)MaxSize

diff --git a/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c b/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c
index 24ec7cd..4d2c23c 100644
--- a/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c
+++ b/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c
@@ -80,7 +80,7 @@ DetectSmbiosVersion (
     SmbiosVersion = (UINT16)(QemuAnchor.V3.MajorVersion << 8 |

                              QemuAnchor.V3.MinorVersion);

 

-    DEBUG ((EFI_D_INFO, "%a: SMBIOS 3.x DocRev from QEMU: 0x%02x\n",

+    DEBUG ((DEBUG_INFO, "%a: SMBIOS 3.x DocRev from QEMU: 0x%02x\n",

       __FUNCTION__, QemuAnchor.V3.DocRev));

     PcdStatus = PcdSet8S (PcdSmbiosDocRev, QemuAnchor.V3.DocRev);

     ASSERT_RETURN_ERROR (PcdStatus);

@@ -90,7 +90,7 @@ DetectSmbiosVersion (
     return RETURN_SUCCESS;

   }

 

-  DEBUG ((EFI_D_INFO, "%a: SMBIOS version from QEMU: 0x%04x\n", __FUNCTION__,

+  DEBUG ((DEBUG_INFO, "%a: SMBIOS version from QEMU: 0x%04x\n", __FUNCTION__,

     SmbiosVersion));

   PcdStatus = PcdSet16S (PcdSmbiosVersion, SmbiosVersion);

   ASSERT_RETURN_ERROR (PcdStatus);

diff --git a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.c b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.c
index d5bed35..2f20272 100644
--- a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.c
+++ b/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.c
@@ -93,7 +93,7 @@ VirtioMmioInit (
     // The ARM Base and Foundation Models do not report a valid VirtIo VendorId.

     // They return a value of 0x0 for the VendorId.

     //

-    DEBUG((EFI_D_WARN, "VirtioMmioInit: Warning: The VendorId (0x%X) does not "

+    DEBUG((DEBUG_WARN, "VirtioMmioInit: Warning: The VendorId (0x%X) does not "

                        "match the VirtIo VendorId (0x%X).\n",

                        VendorId, VIRTIO_VENDOR_ID));

   }

diff --git a/OvmfPkg/Library/XenHypercallLib/XenHypercall.c b/OvmfPkg/Library/XenHypercallLib/XenHypercall.c
index d4fa802..265aa76 100644
--- a/OvmfPkg/Library/XenHypercallLib/XenHypercall.c
+++ b/OvmfPkg/Library/XenHypercallLib/XenHypercall.c
@@ -45,7 +45,7 @@ XenHypercallHvmGetParam (
   Error = XenHypercall2 (__HYPERVISOR_hvm_op,

                          HVMOP_get_param, (INTN) &Parameter);

   if (Error != 0) {

-    DEBUG ((EFI_D_ERROR,

+    DEBUG ((DEBUG_ERROR,

             "XenHypercall: Error %Ld trying to get HVM parameter %d\n",

             (INT64)Error, Index));

     return 0;

diff --git a/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c b/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c
index 154e4fd..ae4ea03 100644
--- a/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c
+++ b/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c
@@ -88,7 +88,7 @@ XenIoMmioInstall (
   XenBusDevicePath = AllocateCopyPool (sizeof *XenBusDevicePath,

                        &mXenBusRootDevicePathTemplate);

   if (!XenBusDevicePath) {

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

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

     Status = EFI_OUT_OF_RESOURCES;

     goto FreeXenIo;

   }

@@ -103,7 +103,7 @@ XenIoMmioInstall (
     return EFI_SUCCESS;

   }

 

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

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

     "XENIO_PROTOCOL protocols on handle %p (Status == %r)\n",

     __FUNCTION__, OutHandle, Status));