From 70d5086c3274b1a5b099d642d546581070374e6e Mon Sep 17 00:00:00 2001 From: Rebecca Cran Date: Wed, 29 Apr 2020 15:53:27 -0600 Subject: 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 Cc: Philippe Mathieu-Daude Cc: Jordan Justen Cc: Ard Biesheuvel Cc: Laszlo Ersek Message-Id: <20200429215327.606467-1-rebecca@bsdio.com> Reviewed-by: Laszlo Ersek --- OvmfPkg/PlatformPei/FeatureControl.c | 6 +++--- OvmfPkg/PlatformPei/Fv.c | 2 +- OvmfPkg/PlatformPei/MemDetect.c | 8 ++++---- OvmfPkg/PlatformPei/Platform.c | 22 +++++++++++----------- OvmfPkg/PlatformPei/Xen.c | 4 ++-- 5 files changed, 21 insertions(+), 21 deletions(-) (limited to 'OvmfPkg/PlatformPei') diff --git a/OvmfPkg/PlatformPei/FeatureControl.c b/OvmfPkg/PlatformPei/FeatureControl.c index 1a9d75022f..dccf9505dd 100644 --- a/OvmfPkg/PlatformPei/FeatureControl.c +++ b/OvmfPkg/PlatformPei/FeatureControl.c @@ -63,7 +63,7 @@ OnMpServicesAvailable ( EFI_PEI_MP_SERVICES_PPI *MpServices; EFI_STATUS Status; - DEBUG ((EFI_D_VERBOSE, "%a: %a\n", gEfiCallerBaseName, __FUNCTION__)); + DEBUG ((DEBUG_VERBOSE, "%a: %a\n", gEfiCallerBaseName, __FUNCTION__)); // // Write the MSR on all the APs in parallel. @@ -78,7 +78,7 @@ OnMpServicesAvailable ( NULL // ProcedureArgument ); if (EFI_ERROR (Status) && Status != EFI_NOT_STARTED) { - DEBUG ((EFI_D_ERROR, "%a: StartupAllAps(): %r\n", __FUNCTION__, Status)); + DEBUG ((DEBUG_ERROR, "%a: StartupAllAps(): %r\n", __FUNCTION__, Status)); return Status; } @@ -122,7 +122,7 @@ InstallFeatureControlCallback ( Status = PeiServicesNotifyPpi (&mMpServicesNotify); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "%a: failed to set up MP Services callback: %r\n", + DEBUG ((DEBUG_ERROR, "%a: failed to set up MP Services callback: %r\n", __FUNCTION__, Status)); } } diff --git a/OvmfPkg/PlatformPei/Fv.c b/OvmfPkg/PlatformPei/Fv.c index 13b1dd38e6..ee4ecab615 100644 --- a/OvmfPkg/PlatformPei/Fv.c +++ b/OvmfPkg/PlatformPei/Fv.c @@ -28,7 +28,7 @@ PeiFvInitialization ( { BOOLEAN SecureS3Needed; - DEBUG ((EFI_D_INFO, "Platform PEI Firmware Volume Initialization\n")); + DEBUG ((DEBUG_INFO, "Platform PEI Firmware Volume Initialization\n")); // // Create a memory allocation HOB for the PEI FV. diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetect.c index f32df937f9..3b46ea431a 100644 --- a/OvmfPkg/PlatformPei/MemDetect.c +++ b/OvmfPkg/PlatformPei/MemDetect.c @@ -408,7 +408,7 @@ GetFirstNonAddress ( if (Pci64Size == 0) { if (mBootMode != BOOT_ON_S3_RESUME) { - DEBUG ((EFI_D_INFO, "%a: disabling 64-bit PCI host aperture\n", + DEBUG ((DEBUG_INFO, "%a: disabling 64-bit PCI host aperture\n", __FUNCTION__)); PcdStatus = PcdSet64S (PcdPciMmio64Size, 0); ASSERT_RETURN_ERROR (PcdStatus); @@ -466,7 +466,7 @@ GetFirstNonAddress ( PcdStatus = PcdSet64S (PcdPciMmio64Size, Pci64Size); ASSERT_RETURN_ERROR (PcdStatus); - DEBUG ((EFI_D_INFO, "%a: Pci64Base=0x%Lx Pci64Size=0x%Lx\n", + DEBUG ((DEBUG_INFO, "%a: Pci64Base=0x%Lx Pci64Size=0x%Lx\n", __FUNCTION__, Pci64Base, Pci64Size)); } @@ -626,7 +626,7 @@ PublishPeiMemory ( MemorySize = mS3AcpiReservedMemorySize; } else { PeiMemoryCap = GetPeiMemoryCap (); - DEBUG ((EFI_D_INFO, "%a: mPhysMemAddressWidth=%d PeiMemoryCap=%u KB\n", + DEBUG ((DEBUG_INFO, "%a: mPhysMemAddressWidth=%d PeiMemoryCap=%u KB\n", __FUNCTION__, mPhysMemAddressWidth, PeiMemoryCap >> 10)); // @@ -705,7 +705,7 @@ QemuInitializeRam ( MTRR_SETTINGS MtrrSettings; EFI_STATUS Status; - DEBUG ((EFI_D_INFO, "%a called\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a called\n", __FUNCTION__)); // // Determine total memory size available diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c index 3b850c2c26..96468701e3 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -362,7 +362,7 @@ MiscInitialization ( 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__, mHostBridgeDevId)); ASSERT (FALSE); return; @@ -448,7 +448,7 @@ ReserveEmuVariableNvStore ( AllocateRuntimePages ( EFI_SIZE_TO_PAGES (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) ); - DEBUG ((EFI_D_INFO, + DEBUG ((DEBUG_INFO, "Reserved variable store memory: 0x%lX; size: %dkb\n", VariableStore, (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024 @@ -465,15 +465,15 @@ DebugDumpCmos ( { UINT32 Loop; - DEBUG ((EFI_D_INFO, "CMOS:\n")); + DEBUG ((DEBUG_INFO, "CMOS:\n")); for (Loop = 0; Loop < 0x80; Loop++) { if ((Loop % 0x10) == 0) { - DEBUG ((EFI_D_INFO, "%02x:", Loop)); + DEBUG ((DEBUG_INFO, "%02x:", Loop)); } - DEBUG ((EFI_D_INFO, " %02x", CmosRead8 (Loop))); + DEBUG ((DEBUG_INFO, " %02x", CmosRead8 (Loop))); if ((Loop % 0x10) == 0xf) { - DEBUG ((EFI_D_INFO, "\n")); + DEBUG ((DEBUG_INFO, "\n")); } } } @@ -486,12 +486,12 @@ S3Verification ( { #if defined (MDE_CPU_X64) if (FeaturePcdGet (PcdSmmSmramRequire) && mS3Supported) { - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "%a: S3Resume2Pei doesn't support X64 PEI + SMM yet.\n", __FUNCTION__)); - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "%a: Please disable S3 on the QEMU command line (see the README),\n", __FUNCTION__)); - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "%a: or build OVMF with \"OvmfPkgIa32X64.dsc\".\n", __FUNCTION__)); ASSERT (FALSE); CpuDeadLoop (); @@ -706,7 +706,7 @@ InitializePlatform ( XenDetect (); if (QemuFwCfgS3Enabled ()) { - DEBUG ((EFI_D_INFO, "S3 support was detected on QEMU\n")); + DEBUG ((DEBUG_INFO, "S3 support was detected on QEMU\n")); mS3Supported = TRUE; Status = PcdSetBoolS (PcdAcpiS3Enable, TRUE); ASSERT_EFI_ERROR (Status); @@ -736,7 +736,7 @@ InitializePlatform ( InitializeRamRegions (); if (mXen) { - DEBUG ((EFI_D_INFO, "Xen was detected\n")); + DEBUG ((DEBUG_INFO, "Xen was detected\n")); InitializeXen (); } diff --git a/OvmfPkg/PlatformPei/Xen.c b/OvmfPkg/PlatformPei/Xen.c index 0904c654f1..104922c67e 100644 --- a/OvmfPkg/PlatformPei/Xen.c +++ b/OvmfPkg/PlatformPei/Xen.c @@ -93,7 +93,7 @@ XenConnect ( } AsmCpuid (XenLeaf + 1, &XenVersion, NULL, NULL, NULL); - DEBUG ((EFI_D_ERROR, "Detected Xen version %d.%d\n", + DEBUG ((DEBUG_ERROR, "Detected Xen version %d.%d\n", XenVersion >> 16, XenVersion & 0xFFFF)); mXenInfo.VersionMajor = (UINT16)(XenVersion >> 16); mXenInfo.VersionMinor = (UINT16)(XenVersion & 0xFFFF); @@ -157,7 +157,7 @@ XenPublishRamRegions ( return; } - DEBUG ((EFI_D_INFO, "Using memory map provided by Xen\n")); + DEBUG ((DEBUG_INFO, "Using memory map provided by Xen\n")); // // Parse RAM in E820 map -- cgit v1.2.3