From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out01.mta.xmission.com (out01.mta.xmission.com [166.70.13.231]) by mx.groups.io with SMTP id smtpd.web12.1266.1588197231037767217 for ; Wed, 29 Apr 2020 14:53:51 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: bsdio.com, ip: 166.70.13.231, mailfrom: rebecca@bsdio.com) Received: from in02.mta.xmission.com ([166.70.13.52]) by out01.mta.xmission.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jTueL-0005pP-2j; Wed, 29 Apr 2020 15:53:49 -0600 Received: from mta4.zcs.xmission.com ([166.70.13.68]) by in02.mta.xmission.com with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.87) (envelope-from ) id 1jTueC-00063m-SA; Wed, 29 Apr 2020 15:53:48 -0600 Received: from localhost (localhost [127.0.0.1]) by mta4.zcs.xmission.com (Postfix) with ESMTP id 8A02A5006F3; Wed, 29 Apr 2020 15:53:40 -0600 (MDT) X-Amavis-Modified: Mail body modified (using disclaimer) - mta4.zcs.xmission.com Received: from mta4.zcs.xmission.com ([127.0.0.1]) by localhost (mta4.zcs.xmission.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id TVPF-k8sUvzN; Wed, 29 Apr 2020 15:53:40 -0600 (MDT) Received: from photon.int.bluestop.org (muon.bluestop.org [65.103.231.193]) by mta4.zcs.xmission.com (Postfix) with ESMTPSA id AE96E50040D; Wed, 29 Apr 2020 15:53:39 -0600 (MDT) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Philippe Mathieu-Daude , Jordan Justen , Ard Biesheuvel , Laszlo Ersek Date: Wed, 29 Apr 2020 15:53:27 -0600 Message-Id: <20200429215327.606467-1-rebecca@bsdio.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-XM-SPF: eid=1jTueC-00063m-SA;;;mid=<20200429215327.606467-1-rebecca@bsdio.com>;;;hst=in02.mta.xmission.com;;;ip=166.70.13.68;;;frm=rebecca@bsdio.com;;;spf=pass X-SA-Exim-Connect-IP: 166.70.13.68 X-SA-Exim-Mail-From: rebecca@bsdio.com X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on sa04.xmission.com X-Spam-Level: *********** X-Spam-Status: Yes, score=11.0 required=8.0 tests=ALL_TRUSTED,BAYES_80, DCC_CHECK_NEGATIVE,FVGT_m_MULTI_ODD,LotsOfNums_01,TM2_M_VERY_LONG_WORD, TR_XM_PhishingBody,T_TooManySym_01,XMBrknScrpt_02,XMSubLong, XMSubMetaSx_00,XM_B_Phish66,XM_B_Phish_Phrases,XM_Sft_Co_L33T autolearn=disabled version=3.4.2 X-Spam-Report: * -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP * 3.3 BAYES_80 BODY: Bayes spam probability is 80 to 95% * [score: 0.9285] * 0.7 XMSubLong Long Subject * 1.2 LotsOfNums_01 BODY: Lots of long strings of numbers * 2.0 XM_B_Phish66 BODY: Obfuscated XMission * 1.0 TM2_M_VERY_LONG_WORD BODY: Very long word (longer than 40 * chars) * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa04 1397; IP=ok Body=1 Fuz1=1] [Fuz2=1] * 1.0 XMSubMetaSx_00 1+ Sexy Words * 0.4 FVGT_m_MULTI_ODD Contains multiple odd letter combinations * 1.0 XM_Sft_Co_L33T No description available. * 0.0 T_TooManySym_01 4+ unique symbols in subject * 0.4 XMBrknScrpt_02 Possible Broken Spam Script * 1.0 XM_B_Phish_Phrases Commonly used Phishing Phrases * 0.0 TR_XM_PhishingBody Phishing flag in body of message X-Spam-DCC: XMission; sa04 1397; IP=ok Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: ***********;devel@edk2.groups.io X-Spam-Relay-Country: X-Spam-Timing: total 7838 ms - load_scoreonly_sql: 0.03 (0.0%), signal_user_changed: 13 (0.2%), b_tie_ro: 11 (0.1%), parse: 9 (0.1%), extract_message_metadata: 90 (1.1%), get_uri_detail_list: 65 (0.8%), tests_pri_-1000: 32 (0.4%), tests_pri_-950: 1.38 (0.0%), tests_pri_-900: 1.13 (0.0%), tests_pri_-90: 618 (7.9%), check_bayes: 611 (7.8%), b_tokenize: 206 (2.6%), b_tok_get_all: 294 (3.8%), b_comp_prob: 20 (0.3%), b_tok_touch_all: 82 (1.0%), b_finish: 1.21 (0.0%), tests_pri_0: 7031 (89.7%), check_dkim_signature: 3.5 (0.0%), check_dkim_adsp: 38 (0.5%), poll_dns_idle: 35 (0.5%), tests_pri_10: 5 (0.1%), tests_pri_500: 22 (0.3%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH v5 1/1] OvmfPkg: replace old EFI_D_ debug levels with new DEBUG_ ones X-Spam-Flag: YES X-SA-Exim-Version: 4.2.1 (built Thu, 05 May 2016 13:38:54 -0600) X-SA-Exim-Scanned: Yes (on in02.mta.xmission.com) Content-Transfer-Encoding: 8bit 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 --- OvmfPkg/AcpiPlatformDxe/EntryPoint.c | 8 +- OvmfPkg/AcpiPlatformDxe/PciDecoding.c | 10 +-- OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c | 50 ++++++------ OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c | 16 ++-- OvmfPkg/Csm/CsmSupportLib/LegacyInterrupt.c | 2 +- OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c | 2 +- OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c | 2 +- OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c | 18 ++--- OvmfPkg/Csm/LegacyBiosDxe/LegacyBootSupport.c | 80 +++++++++---------- OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c | 58 +++++++------- OvmfPkg/Csm/LegacyBiosDxe/LegacySio.c | 2 +- OvmfPkg/Csm/LegacyBiosDxe/Thunk.c | 2 +- .../LegacyBootMaintUiLib/LegacyBootMaintUi.c | 2 +- OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c | 6 +- OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c | 16 ++-- .../IncompatiblePciDeviceSupport.c | 2 +- .../Library/AcpiTimerLib/BaseAcpiTimerLib.c | 2 +- .../AcpiTimerLib/BaseRomAcpiTimerLib.c | 4 +- .../Library/AcpiTimerLib/DxeAcpiTimerLib.c | 2 +- OvmfPkg/Library/LoadLinuxLib/Linux.c | 8 +- OvmfPkg/Library/NvVarsFileLib/FsAccess.c | 16 ++-- .../PciHostBridgeLib/PciHostBridgeLib.c | 18 ++--- .../PlatformBootManagerLib/BdsPlatform.c | 32 ++++---- .../QemuBootOrderLib/ExtraRootBusMap.c | 2 +- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c | 6 +- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c | 2 +- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c | 6 +- OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSec.c | 8 +- .../SerializeVariablesLib.c | 2 +- .../SmbiosVersionLib/DetectSmbiosVersionLib.c | 4 +- .../VirtioMmioDeviceLib/VirtioMmioDevice.c | 2 +- .../Library/XenHypercallLib/XenHypercall.c | 2 +- OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c | 4 +- OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c | 2 +- OvmfPkg/PlatformDxe/Platform.c | 14 ++-- 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 +- .../FwBlockService.c | 10 +-- .../FwBlockServiceDxe.c | 4 +- .../FwBlockServiceSmm.c | 2 +- .../QemuFlash.c | 14 ++-- OvmfPkg/QemuVideoDxe/Driver.c | 10 +-- OvmfPkg/QemuVideoDxe/Gop.c | 4 +- OvmfPkg/QemuVideoDxe/Initialize.c | 8 +- OvmfPkg/QemuVideoDxe/VbeShim.c | 4 +- OvmfPkg/SataControllerDxe/SataController.c | 12 +-- OvmfPkg/Sec/SecMain.c | 28 +++---- OvmfPkg/SmmAccess/SmmAccessPei.c | 10 +-- OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c | 16 ++-- OvmfPkg/VirtioGpuDxe/Commands.c | 8 +- OvmfPkg/VirtioGpuDxe/DriverBinding.c | 8 +- OvmfPkg/VirtioGpuDxe/VirtioGpu.h | 2 +- OvmfPkg/XenBusDxe/EventChannel.c | 2 +- OvmfPkg/XenBusDxe/GrantTable.c | 8 +- OvmfPkg/XenBusDxe/XenBus.c | 14 ++-- OvmfPkg/XenBusDxe/XenBusDxe.c | 4 +- OvmfPkg/XenBusDxe/XenStore.c | 28 +++---- OvmfPkg/XenIoPciDxe/XenIoPciDxe.c | 2 +- OvmfPkg/XenPvBlkDxe/BlockFront.c | 50 ++++++------ OvmfPkg/XenPvBlkDxe/BlockIo.c | 6 +- OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.c | 2 +- 64 files changed, 355 insertions(+), 355 deletions(-) diff --git a/OvmfPkg/AcpiPlatformDxe/EntryPoint.c b/OvmfPkg/AcpiPlatformDxe/EntryPoint.c index 4fd7abc0b421..f66f89291157 100644 --- a/OvmfPkg/AcpiPlatformDxe/EntryPoint.c +++ b/OvmfPkg/AcpiPlatformDxe/EntryPoint.c @@ -39,12 +39,12 @@ OnRootBridgesConnected ( { EFI_STATUS Status; - DEBUG ((EFI_D_INFO, + DEBUG ((DEBUG_INFO, "%a: root bridges have been connected, installing ACPI tables\n", __FUNCTION__)); Status = InstallAcpiTables (FindAcpiTableProtocol ()); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "%a: InstallAcpiTables: %r\n", __FUNCTION__, Status)); + DEBUG ((DEBUG_ERROR, "%a: InstallAcpiTables: %r\n", __FUNCTION__, Status)); } gBS->CloseEvent (Event); } @@ -66,7 +66,7 @@ AcpiPlatformEntryPoint ( // the full functionality. // if (PcdGetBool (PcdPciDisableBusEnumeration)) { - DEBUG ((EFI_D_INFO, "%a: PCI or its enumeration disabled, installing " + DEBUG ((DEBUG_INFO, "%a: PCI or its enumeration disabled, installing " "ACPI tables\n", __FUNCTION__)); return InstallAcpiTables (FindAcpiTableProtocol ()); } @@ -81,7 +81,7 @@ AcpiPlatformEntryPoint ( OnRootBridgesConnected, NULL /* Context */, &gRootBridgesConnectedEventGroupGuid, &RootBridgesConnected); if (!EFI_ERROR (Status)) { - DEBUG ((EFI_D_INFO, + DEBUG ((DEBUG_INFO, "%a: waiting for root bridges to be connected, registered callback\n", __FUNCTION__)); } diff --git a/OvmfPkg/AcpiPlatformDxe/PciDecoding.c b/OvmfPkg/AcpiPlatformDxe/PciDecoding.c index eb0417bba40c..73894106c9ec 100644 --- a/OvmfPkg/AcpiPlatformDxe/PciDecoding.c +++ b/OvmfPkg/AcpiPlatformDxe/PciDecoding.c @@ -69,14 +69,14 @@ EnablePciDecoding ( } if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_WARN, "%a: LocateHandleBuffer(): %r\n", __FUNCTION__, + DEBUG ((DEBUG_WARN, "%a: LocateHandleBuffer(): %r\n", __FUNCTION__, Status)); return; } OrigAttrs = AllocatePool (NoHandles * sizeof *OrigAttrs); if (OrigAttrs == NULL) { - DEBUG ((EFI_D_WARN, "%a: AllocatePool(): out of resources\n", + DEBUG ((DEBUG_WARN, "%a: AllocatePool(): out of resources\n", __FUNCTION__)); goto FreeHandles; } @@ -99,7 +99,7 @@ EnablePciDecoding ( Status = PciIo->Attributes (PciIo, EfiPciIoAttributeOperationGet, 0, &OrigAttrs[Idx].PciAttributes); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_WARN, "%a: EfiPciIoAttributeOperationGet: %r\n", + DEBUG ((DEBUG_WARN, "%a: EfiPciIoAttributeOperationGet: %r\n", __FUNCTION__, Status)); goto RestoreAttributes; } @@ -110,7 +110,7 @@ EnablePciDecoding ( Status = PciIo->Attributes (PciIo, EfiPciIoAttributeOperationSupported, 0, &Attributes); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_WARN, "%a: EfiPciIoAttributeOperationSupported: %r\n", + DEBUG ((DEBUG_WARN, "%a: EfiPciIoAttributeOperationSupported: %r\n", __FUNCTION__, Status)); goto RestoreAttributes; } @@ -122,7 +122,7 @@ EnablePciDecoding ( Status = PciIo->Attributes (PciIo, EfiPciIoAttributeOperationEnable, Attributes, NULL); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_WARN, "%a: EfiPciIoAttributeOperationEnable: %r\n", + DEBUG ((DEBUG_WARN, "%a: EfiPciIoAttributeOperationEnable: %r\n", __FUNCTION__, Status)); goto RestoreAttributes; } diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c index 75a3a88a3612..b62027db6e66 100644 --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c @@ -329,19 +329,19 @@ ProcessCmdAllocate ( BLOB *Blob; if (Allocate->File[QEMU_LOADER_FNAME_SIZE - 1] != '\0') { - DEBUG ((EFI_D_ERROR, "%a: malformed file name\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: malformed file name\n", __FUNCTION__)); return EFI_PROTOCOL_ERROR; } if (Allocate->Alignment > EFI_PAGE_SIZE) { - DEBUG ((EFI_D_ERROR, "%a: unsupported alignment 0x%x\n", __FUNCTION__, + DEBUG ((DEBUG_ERROR, "%a: unsupported alignment 0x%x\n", __FUNCTION__, Allocate->Alignment)); return EFI_UNSUPPORTED; } Status = QemuFwCfgFindFile ((CHAR8 *)Allocate->File, &FwCfgItem, &FwCfgSize); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "%a: QemuFwCfgFindFile(\"%a\"): %r\n", __FUNCTION__, + DEBUG ((DEBUG_ERROR, "%a: QemuFwCfgFindFile(\"%a\"): %r\n", __FUNCTION__, Allocate->File, Status)); return Status; } @@ -372,7 +372,7 @@ ProcessCmdAllocate ( Status = OrderedCollectionInsert (Tracker, NULL, Blob); if (Status == RETURN_ALREADY_STARTED) { - DEBUG ((EFI_D_ERROR, "%a: duplicated file \"%a\"\n", __FUNCTION__, + DEBUG ((DEBUG_ERROR, "%a: duplicated file \"%a\"\n", __FUNCTION__, Allocate->File)); Status = EFI_PROTOCOL_ERROR; } @@ -384,7 +384,7 @@ ProcessCmdAllocate ( QemuFwCfgReadBytes (FwCfgSize, Blob->Base); ZeroMem (Blob->Base + Blob->Size, EFI_PAGES_TO_SIZE (NumPages) - Blob->Size); - DEBUG ((EFI_D_VERBOSE, "%a: File=\"%a\" Alignment=0x%x Zone=%d Size=0x%Lx " + DEBUG ((DEBUG_VERBOSE, "%a: File=\"%a\" Alignment=0x%x Zone=%d Size=0x%Lx " "Address=0x%Lx\n", __FUNCTION__, Allocate->File, Allocate->Alignment, Allocate->Zone, (UINT64)Blob->Size, (UINT64)(UINTN)Blob->Base)); return EFI_SUCCESS; @@ -432,14 +432,14 @@ ProcessCmdAddPointer ( if (AddPointer->PointerFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0' || AddPointer->PointeeFile[QEMU_LOADER_FNAME_SIZE - 1] != '\0') { - DEBUG ((EFI_D_ERROR, "%a: malformed file name\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: malformed file name\n", __FUNCTION__)); return EFI_PROTOCOL_ERROR; } TrackerEntry = OrderedCollectionFind (Tracker, AddPointer->PointerFile); TrackerEntry2 = OrderedCollectionFind (Tracker, AddPointer->PointeeFile); if (TrackerEntry == NULL || TrackerEntry2 == NULL) { - DEBUG ((EFI_D_ERROR, "%a: invalid blob reference(s) \"%a\" / \"%a\"\n", + DEBUG ((DEBUG_ERROR, "%a: invalid blob reference(s) \"%a\" / \"%a\"\n", __FUNCTION__, AddPointer->PointerFile, AddPointer->PointeeFile)); return EFI_PROTOCOL_ERROR; } @@ -450,7 +450,7 @@ ProcessCmdAddPointer ( AddPointer->PointerSize != 4 && AddPointer->PointerSize != 8) || Blob->Size < AddPointer->PointerSize || Blob->Size - AddPointer->PointerSize < AddPointer->PointerOffset) { - DEBUG ((EFI_D_ERROR, "%a: invalid pointer location or size in \"%a\"\n", + DEBUG ((DEBUG_ERROR, "%a: invalid pointer location or size in \"%a\"\n", __FUNCTION__, AddPointer->PointerFile)); return EFI_PROTOCOL_ERROR; } @@ -459,7 +459,7 @@ ProcessCmdAddPointer ( PointerValue = 0; CopyMem (&PointerValue, PointerField, AddPointer->PointerSize); if (PointerValue >= Blob2->Size) { - DEBUG ((EFI_D_ERROR, "%a: invalid pointer value in \"%a\"\n", __FUNCTION__, + DEBUG ((DEBUG_ERROR, "%a: invalid pointer value in \"%a\"\n", __FUNCTION__, AddPointer->PointerFile)); return EFI_PROTOCOL_ERROR; } @@ -473,14 +473,14 @@ ProcessCmdAddPointer ( PointerValue += (UINT64)(UINTN)Blob2->Base; if (AddPointer->PointerSize < 8 && RShiftU64 (PointerValue, AddPointer->PointerSize * 8) != 0) { - DEBUG ((EFI_D_ERROR, "%a: relocated pointer value unrepresentable in " + DEBUG ((DEBUG_ERROR, "%a: relocated pointer value unrepresentable in " "\"%a\"\n", __FUNCTION__, AddPointer->PointerFile)); return EFI_PROTOCOL_ERROR; } CopyMem (PointerField, &PointerValue, AddPointer->PointerSize); - DEBUG ((EFI_D_VERBOSE, "%a: PointerFile=\"%a\" PointeeFile=\"%a\" " + DEBUG ((DEBUG_VERBOSE, "%a: PointerFile=\"%a\" PointeeFile=\"%a\" " "PointerOffset=0x%x PointerSize=%d\n", __FUNCTION__, AddPointer->PointerFile, AddPointer->PointeeFile, AddPointer->PointerOffset, AddPointer->PointerSize)); @@ -515,13 +515,13 @@ ProcessCmdAddChecksum ( BLOB *Blob; if (AddChecksum->File[QEMU_LOADER_FNAME_SIZE - 1] != '\0') { - DEBUG ((EFI_D_ERROR, "%a: malformed file name\n", __FUNCTION__)); + DEBUG ((DEBUG_ERROR, "%a: malformed file name\n", __FUNCTION__)); return EFI_PROTOCOL_ERROR; } TrackerEntry = OrderedCollectionFind (Tracker, AddChecksum->File); if (TrackerEntry == NULL) { - DEBUG ((EFI_D_ERROR, "%a: invalid blob reference \"%a\"\n", __FUNCTION__, + DEBUG ((DEBUG_ERROR, "%a: invalid blob reference \"%a\"\n", __FUNCTION__, AddChecksum->File)); return EFI_PROTOCOL_ERROR; } @@ -530,7 +530,7 @@ ProcessCmdAddChecksum ( if (Blob->Size <= AddChecksum->ResultOffset || Blob->Size < AddChecksum->Length || Blob->Size - AddChecksum->Length < AddChecksum->Start) { - DEBUG ((EFI_D_ERROR, "%a: invalid checksum range in \"%a\"\n", + DEBUG ((DEBUG_ERROR, "%a: invalid checksum range in \"%a\"\n", __FUNCTION__, AddChecksum->File)); return EFI_PROTOCOL_ERROR; } @@ -539,7 +539,7 @@ ProcessCmdAddChecksum ( Blob->Base + AddChecksum->Start, AddChecksum->Length ); - DEBUG ((EFI_D_VERBOSE, "%a: File=\"%a\" ResultOffset=0x%x Start=0x%x " + DEBUG ((DEBUG_VERBOSE, "%a: File=\"%a\" ResultOffset=0x%x Start=0x%x " "Length=0x%x\n", __FUNCTION__, AddChecksum->File, AddChecksum->ResultOffset, AddChecksum->Start, AddChecksum->Length)); return EFI_SUCCESS; @@ -848,7 +848,7 @@ Process2ndPassCmdAddPointer ( } Blob2Remaining -= (UINTN) PointerValue; - DEBUG ((EFI_D_VERBOSE, "%a: checking for ACPI header in \"%a\" at 0x%Lx " + DEBUG ((DEBUG_VERBOSE, "%a: checking for ACPI header in \"%a\" at 0x%Lx " "(remaining: 0x%Lx): ", __FUNCTION__, AddPointer->PointeeFile, PointerValue, (UINT64)Blob2Remaining)); @@ -864,7 +864,7 @@ Process2ndPassCmdAddPointer ( Facs->Length <= Blob2Remaining && Facs->Signature == EFI_ACPI_1_0_FIRMWARE_ACPI_CONTROL_STRUCTURE_SIGNATURE) { - DEBUG ((EFI_D_VERBOSE, "found \"%-4.4a\" size 0x%x\n", + DEBUG ((DEBUG_VERBOSE, "found \"%-4.4a\" size 0x%x\n", (CONST CHAR8 *)&Facs->Signature, Facs->Length)); TableSize = Facs->Length; } @@ -884,7 +884,7 @@ Process2ndPassCmdAddPointer ( // - Length field consistent with both ACPI and containing blob size // - checksum is correct // - DEBUG ((EFI_D_VERBOSE, "found \"%-4.4a\" size 0x%x\n", + DEBUG ((DEBUG_VERBOSE, "found \"%-4.4a\" size 0x%x\n", (CONST CHAR8 *)&Header->Signature, Header->Length)); TableSize = Header->Length; @@ -901,13 +901,13 @@ Process2ndPassCmdAddPointer ( } if (TableSize == 0) { - DEBUG ((EFI_D_VERBOSE, "not found; marking fw_cfg blob as opaque\n")); + DEBUG ((DEBUG_VERBOSE, "not found; marking fw_cfg blob as opaque\n")); Blob2->HostsOnlyTableData = FALSE; return EFI_SUCCESS; } if (*NumInstalled == INSTALLED_TABLES_MAX) { - DEBUG ((EFI_D_ERROR, "%a: can't install more than %d tables\n", + DEBUG ((DEBUG_ERROR, "%a: can't install more than %d tables\n", __FUNCTION__, INSTALLED_TABLES_MAX)); Status = EFI_OUT_OF_RESOURCES; goto RollbackSeenPointer; @@ -917,7 +917,7 @@ Process2ndPassCmdAddPointer ( (VOID *)(UINTN)PointerValue, TableSize, &InstalledKey[*NumInstalled]); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "%a: InstallAcpiTable(): %r\n", __FUNCTION__, + DEBUG ((DEBUG_ERROR, "%a: InstallAcpiTable(): %r\n", __FUNCTION__, Status)); goto RollbackSeenPointer; } @@ -980,7 +980,7 @@ InstallQemuFwCfgTables ( return Status; } if (FwCfgSize % sizeof *LoaderEntry != 0) { - DEBUG ((EFI_D_ERROR, "%a: \"etc/table-loader\" has invalid size 0x%Lx\n", + DEBUG ((DEBUG_ERROR, "%a: \"etc/table-loader\" has invalid size 0x%Lx\n", __FUNCTION__, (UINT64)FwCfgSize)); return EFI_PROTOCOL_ERROR; } @@ -1060,7 +1060,7 @@ InstallQemuFwCfgTables ( break; default: - DEBUG ((EFI_D_VERBOSE, "%a: unknown loader command: 0x%x\n", + DEBUG ((DEBUG_VERBOSE, "%a: unknown loader command: 0x%x\n", __FUNCTION__, LoaderEntry->Type)); break; } @@ -1128,7 +1128,7 @@ InstallQemuFwCfgTables ( AcpiProtocol->UninstallAcpiTable (AcpiProtocol, InstalledKey[Installed]); } } else { - DEBUG ((EFI_D_INFO, "%a: installed %d tables\n", __FUNCTION__, Installed)); + DEBUG ((DEBUG_INFO, "%a: installed %d tables\n", __FUNCTION__, Installed)); } for (SeenPointerEntry = OrderedCollectionMin (SeenPointers); @@ -1172,7 +1172,7 @@ InstallQemuFwCfgTables ( Blob = UserStruct; if (EFI_ERROR (Status) || Blob->HostsOnlyTableData) { - DEBUG ((EFI_D_VERBOSE, "%a: freeing \"%a\"\n", __FUNCTION__, + DEBUG ((DEBUG_VERBOSE, "%a: freeing \"%a\"\n", __FUNCTION__, Blob->File)); gBS->FreePages ((UINTN)Blob->Base, EFI_SIZE_TO_PAGES (Blob->Size)); } diff --git a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c b/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c index 0a189bc59205..5a52298983e5 100644 --- a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c +++ b/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c @@ -711,7 +711,7 @@ BiosVideoChildHandleInstall ( // if (FeaturePcdGet (PcdBiosVideoCheckVbeEnable)) { Status = BiosVideoCheckForVbe (BiosVideoPrivate); - DEBUG ((EFI_D_INFO, "BiosVideoCheckForVbe - %r\n", Status)); + DEBUG ((DEBUG_INFO, "BiosVideoCheckForVbe - %r\n", Status)); } else { Status = EFI_UNSUPPORTED; } @@ -720,11 +720,11 @@ BiosVideoChildHandleInstall ( // The VESA BIOS Extensions are not compatible with Graphics Output, so check for support // for the standard 640x480 16 color VGA mode // - DEBUG ((EFI_D_INFO, "VgaCompatible - %x\n", BiosVideoPrivate->VgaCompatible)); + DEBUG ((DEBUG_INFO, "VgaCompatible - %x\n", BiosVideoPrivate->VgaCompatible)); if (BiosVideoPrivate->VgaCompatible) { if (FeaturePcdGet (PcdBiosVideoCheckVgaEnable)) { Status = BiosVideoCheckForVga (BiosVideoPrivate); - DEBUG ((EFI_D_INFO, "BiosVideoCheckForVga - %r\n", Status)); + DEBUG ((DEBUG_INFO, "BiosVideoCheckForVga - %r\n", Status)); } else { Status = EFI_UNSUPPORTED; } @@ -1122,7 +1122,7 @@ ParseEdidData ( ((EdidDataBlock->EstablishedTimings[2] & 0x80) << 9) ; for (Index = 0; Index < VESA_BIOS_EXTENSIONS_EDID_ESTABLISHED_TIMING_MAX_NUMBER; Index ++) { if ((TimingBits & 0x1) != 0) { - DEBUG ((EFI_D_INFO, "Established Timing: %d x %d\n", + DEBUG ((DEBUG_INFO, "Established Timing: %d x %d\n", mEstablishedEdidTiming[Index].HorizontalResolution, mEstablishedEdidTiming[Index].VerticalResolution)); ValidEdidTiming->Key[ValidNumber] = CalculateEdidKey (&mEstablishedEdidTiming[Index]); ValidNumber ++; @@ -1164,7 +1164,7 @@ ParseEdidData ( break; } RefreshRate = (UINT8) ((BufferIndex[1] & 0x1f) + 60); - DEBUG ((EFI_D_INFO, "Standard Timing: %d x %d\n", HorizontalResolution, VerticalResolution)); + DEBUG ((DEBUG_INFO, "Standard Timing: %d x %d\n", HorizontalResolution, VerticalResolution)); TempTiming.HorizontalResolution = HorizontalResolution; TempTiming.VerticalResolution = VerticalResolution; TempTiming.RefreshRate = RefreshRate; @@ -1191,7 +1191,7 @@ ParseEdidData ( // TempTiming.HorizontalResolution = ((UINT16)(BufferIndex[4] & 0xF0) << 4) | (BufferIndex[2]); TempTiming.VerticalResolution = ((UINT16)(BufferIndex[7] & 0xF0) << 4) | (BufferIndex[5]); - DEBUG ((EFI_D_INFO, "Detailed Timing %d: %d x %d\n", + DEBUG ((DEBUG_INFO, "Detailed Timing %d: %d x %d\n", Index, TempTiming.HorizontalResolution, TempTiming.VerticalResolution)); ValidEdidTiming->Key[ValidNumber] = CalculateEdidKey (&TempTiming); ValidNumber ++; @@ -1572,7 +1572,7 @@ BiosVideoCheckForVbe ( continue; } - DEBUG ((EFI_D_INFO, "Video Controller Mode 0x%x: %d x %d\n", + DEBUG ((DEBUG_INFO, "Video Controller Mode 0x%x: %d x %d\n", VbeModeNumber, BiosVideoPrivate->VbeModeInformationBlock->XResolution, BiosVideoPrivate->VbeModeInformationBlock->YResolution)); if (EdidFound && (ValidEdidTiming.ValidNumber > 0)) { @@ -1737,7 +1737,7 @@ BiosVideoCheckForVbe ( DEBUG_CODE ( BIOS_VIDEO_MODE_DATA *ModeData; ModeData = &BiosVideoPrivate->ModeData[HighestResolutionMode]; - DEBUG ((EFI_D_INFO, "BiosVideo set highest resolution %d x %d\n", + DEBUG ((DEBUG_INFO, "BiosVideo set highest resolution %d x %d\n", ModeData->HorizontalResolution, ModeData->VerticalResolution)); ); PreferMode = HighestResolutionMode; diff --git a/OvmfPkg/Csm/CsmSupportLib/LegacyInterrupt.c b/OvmfPkg/Csm/CsmSupportLib/LegacyInterrupt.c index 2928e2632930..97ca21945fe7 100644 --- a/OvmfPkg/Csm/CsmSupportLib/LegacyInterrupt.c +++ b/OvmfPkg/Csm/CsmSupportLib/LegacyInterrupt.c @@ -192,7 +192,7 @@ LegacyInterruptInstall ( mLegacyInterruptDevice = LEGACY_INT_DEV_Q35; 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 EFI_UNSUPPORTED; diff --git a/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c b/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c index 9c60c4a4cfc4..96f9934b2086 100644 --- a/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c +++ b/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c @@ -309,7 +309,7 @@ GetSelectedVgaDeviceInfo ( if (!IS_PCI_VGA (&Pci)) { continue; } - DEBUG ((EFI_D_INFO, + DEBUG ((DEBUG_INFO, "PCI VGA: 0x%04x:0x%04x\n", Pci.Hdr.VendorId, Pci.Hdr.DeviceId diff --git a/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c b/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c index 73276dc228b5..fe9ae27c9d91 100644 --- a/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c +++ b/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c @@ -477,7 +477,7 @@ LegacyRegionInit ( mRegisterValues = mRegisterValuesQ35; 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/Csm/LegacyBiosDxe/LegacyBios.c b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c index dd3608a64ece..3ce19496b07d 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c @@ -364,7 +364,7 @@ ShadowAndStartLegacy16 ( } if (Table == NULL) { - DEBUG ((EFI_D_ERROR, "No Legacy16 table found\n")); + DEBUG ((DEBUG_ERROR, "No Legacy16 table found\n")); return EFI_NOT_FOUND; } @@ -372,7 +372,7 @@ ShadowAndStartLegacy16 ( // // Legacy16 table header checksum error. // - DEBUG ((EFI_D_ERROR, "Legacy16 table found with bad talbe header checksum\n")); + DEBUG ((DEBUG_ERROR, "Legacy16 table found with bad talbe header checksum\n")); } // @@ -483,7 +483,7 @@ ShadowAndStartLegacy16 ( Table->E820Pointer = (UINT32) (Regs.X.DS * 16 + Regs.X.BX); Table->E820Length = (UINT32) E820Size; if (Regs.X.AX != 0) { - DEBUG ((EFI_D_ERROR, "Legacy16 E820 length insufficient\n")); + DEBUG ((DEBUG_ERROR, "Legacy16 E820 length insufficient\n")); } else { TempData = Table->E820Pointer; CopyMem ((VOID *) TempData, Private->E820Table, E820Size); @@ -543,7 +543,7 @@ ShadowAndStartLegacy16 ( TpmPointer = (UINT32) (Regs.X.DS * 16 + Regs.X.BX); if (Regs.X.AX != 0) { - DEBUG ((EFI_D_ERROR, "TPM cannot be loaded\n")); + DEBUG ((DEBUG_ERROR, "TPM cannot be loaded\n")); } else { CopyMem ((VOID *) (UINTN)TpmPointer, TpmBinaryImage, TpmBinaryImageSize); Table->TpmSegment = Regs.X.DS; @@ -738,7 +738,7 @@ InstallSmbiosEventCallback ( mReserveSmbiosEntryPoint = 0; return; } - DEBUG ((EFI_D_INFO, "Allocate memory for Smbios Entry Point Structure\n")); + DEBUG ((DEBUG_INFO, "Allocate memory for Smbios Entry Point Structure\n")); } if ((mStructureTableAddress != 0) && @@ -749,7 +749,7 @@ InstallSmbiosEventCallback ( gBS->FreePages (mStructureTableAddress, mStructureTablePages); mStructureTableAddress = 0; mStructureTablePages = 0; - DEBUG ((EFI_D_INFO, "Original size is not enough. Re-allocate the memory.\n")); + DEBUG ((DEBUG_INFO, "Original size is not enough. Re-allocate the memory.\n")); } if (mStructureTableAddress == 0) { @@ -775,7 +775,7 @@ InstallSmbiosEventCallback ( mStructureTablePages = 0; return; } - DEBUG ((EFI_D_INFO, "Allocate memory for Smbios Structure Table\n")); + DEBUG ((DEBUG_INFO, "Allocate memory for Smbios Structure Table\n")); } } @@ -1051,7 +1051,7 @@ LegacyBiosInstall ( MemoryPtr = (VOID *) ((UINTN) StartAddress); ZeroMem (MemoryPtr, 0x1000); } else { - DEBUG ((EFI_D_ERROR, "WARNING: Allocate legacy memory fail for SCSI card - %x\n", MemStart)); + DEBUG ((DEBUG_ERROR, "WARNING: Allocate legacy memory fail for SCSI card - %x\n", MemStart)); } } @@ -1206,7 +1206,7 @@ LegacyBiosInstall ( ); Private->Csm16PciInterfaceVersion = GetPciInterfaceVersion (Private); - DEBUG ((EFI_D_INFO, "CSM16 PCI BIOS Interface Version: %02x.%02x\n", + DEBUG ((DEBUG_INFO, "CSM16 PCI BIOS Interface Version: %02x.%02x\n", (UINT8) (Private->Csm16PciInterfaceVersion >> 8), (UINT8) Private->Csm16PciInterfaceVersion )); diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBootSupport.c b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBootSupport.c index 20784504d501..9a09d7230777 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBootSupport.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBootSupport.c @@ -46,9 +46,9 @@ PrintBbsTable ( UINT16 SubIndex; CHAR8 *String; - DEBUG ((EFI_D_INFO, "\n")); - DEBUG ((EFI_D_INFO, " NO Prio bb/dd/ff cl/sc Type Stat segm:offs mfgs:mfgo dess:deso\n")); - DEBUG ((EFI_D_INFO, "=================================================================\n")); + DEBUG ((DEBUG_INFO, "\n")); + DEBUG ((DEBUG_INFO, " NO Prio bb/dd/ff cl/sc Type Stat segm:offs mfgs:mfgo dess:deso\n")); + DEBUG ((DEBUG_INFO, "=================================================================\n")); for (Index = 0; Index < MAX_BBS_ENTRIES; Index++) { // // Filter @@ -58,7 +58,7 @@ PrintBbsTable ( } DEBUG (( - EFI_D_INFO, + DEBUG_INFO, " %02x: %04x %02x/%02x/%02x %02x/%02x %04x %04x", (UINTN) Index, (UINTN) BbsTable[Index].BootPriority, @@ -71,7 +71,7 @@ PrintBbsTable ( (UINTN) * (UINT16 *) &BbsTable[Index].StatusFlags )); DEBUG (( - EFI_D_INFO, + DEBUG_INFO, " %04x:%04x %04x:%04x %04x:%04x", (UINTN) BbsTable[Index].BootHandlerSegment, (UINTN) BbsTable[Index].BootHandlerOffset, @@ -86,16 +86,16 @@ PrintBbsTable ( // String = (CHAR8 *)(((UINTN)BbsTable[Index].DescStringSegment << 4) + BbsTable[Index].DescStringOffset); if (String != NULL) { - DEBUG ((EFI_D_INFO," (")); + DEBUG ((DEBUG_INFO," (")); for (SubIndex = 0; String[SubIndex] != 0; SubIndex++) { - DEBUG ((EFI_D_INFO, "%c", String[SubIndex])); + DEBUG ((DEBUG_INFO, "%c", String[SubIndex])); } - DEBUG ((EFI_D_INFO,")")); + DEBUG ((DEBUG_INFO,")")); } - DEBUG ((EFI_D_INFO,"\n")); + DEBUG ((DEBUG_INFO,"\n")); } - DEBUG ((EFI_D_INFO, "\n")); + DEBUG ((DEBUG_INFO, "\n")); return ; } @@ -114,20 +114,20 @@ PrintHddInfo ( { UINTN Index; - DEBUG ((EFI_D_INFO, "\n")); + DEBUG ((DEBUG_INFO, "\n")); for (Index = 0; Index < MAX_IDE_CONTROLLER; Index++) { - DEBUG ((EFI_D_INFO, "Index - %04x\n", Index)); - DEBUG ((EFI_D_INFO, " Status - %04x\n", (UINTN)HddInfo[Index].Status)); - DEBUG ((EFI_D_INFO, " B/D/F - %02x/%02x/%02x\n", (UINTN)HddInfo[Index].Bus, (UINTN)HddInfo[Index].Device, (UINTN)HddInfo[Index].Function)); - DEBUG ((EFI_D_INFO, " Command - %04x\n", HddInfo[Index].CommandBaseAddress)); - DEBUG ((EFI_D_INFO, " Control - %04x\n", HddInfo[Index].ControlBaseAddress)); - DEBUG ((EFI_D_INFO, " BusMaster - %04x\n", HddInfo[Index].BusMasterAddress)); - DEBUG ((EFI_D_INFO, " HddIrq - %02x\n", HddInfo[Index].HddIrq)); - DEBUG ((EFI_D_INFO, " IdentifyDrive[0].Raw[0] - %x\n", HddInfo[Index].IdentifyDrive[0].Raw[0])); - DEBUG ((EFI_D_INFO, " IdentifyDrive[1].Raw[0] - %x\n", HddInfo[Index].IdentifyDrive[1].Raw[0])); + DEBUG ((DEBUG_INFO, "Index - %04x\n", Index)); + DEBUG ((DEBUG_INFO, " Status - %04x\n", (UINTN)HddInfo[Index].Status)); + DEBUG ((DEBUG_INFO, " B/D/F - %02x/%02x/%02x\n", (UINTN)HddInfo[Index].Bus, (UINTN)HddInfo[Index].Device, (UINTN)HddInfo[Index].Function)); + DEBUG ((DEBUG_INFO, " Command - %04x\n", HddInfo[Index].CommandBaseAddress)); + DEBUG ((DEBUG_INFO, " Control - %04x\n", HddInfo[Index].ControlBaseAddress)); + DEBUG ((DEBUG_INFO, " BusMaster - %04x\n", HddInfo[Index].BusMasterAddress)); + DEBUG ((DEBUG_INFO, " HddIrq - %02x\n", HddInfo[Index].HddIrq)); + DEBUG ((DEBUG_INFO, " IdentifyDrive[0].Raw[0] - %x\n", HddInfo[Index].IdentifyDrive[0].Raw[0])); + DEBUG ((DEBUG_INFO, " IdentifyDrive[1].Raw[0] - %x\n", HddInfo[Index].IdentifyDrive[1].Raw[0])); } - DEBUG ((EFI_D_INFO, "\n")); + DEBUG ((DEBUG_INFO, "\n")); return ; } @@ -163,9 +163,9 @@ PrintPciInterruptRegister ( Device = 0; Function = 0; - DEBUG ((EFI_D_INFO, "\n")); - DEBUG ((EFI_D_INFO, " bb/dd/ff interrupt line interrupt pin\n")); - DEBUG ((EFI_D_INFO, "======================================\n")); + DEBUG ((DEBUG_INFO, "\n")); + DEBUG ((DEBUG_INFO, " bb/dd/ff interrupt line interrupt pin\n")); + DEBUG ((DEBUG_INFO, "======================================\n")); for (Index = 0; Index < HandleNum; Index++) { Status = gBS->HandleProtocol (Handles[Index], &gEfiPciIoProtocolGuid, (VOID **) &PciIo); if (!EFI_ERROR (Status)) { @@ -187,11 +187,11 @@ PrintPciInterruptRegister ( ); } if (!EFI_ERROR (Status)) { - DEBUG ((EFI_D_INFO, " %02x/%02x/%02x 0x%02x 0x%02x\n", + DEBUG ((DEBUG_INFO, " %02x/%02x/%02x 0x%02x 0x%02x\n", Bus, Device, Function, Interrupt[0], Interrupt[1])); } } - DEBUG ((EFI_D_INFO, "\n")); + DEBUG ((DEBUG_INFO, "\n")); if (Handles != NULL) { FreePool (Handles); @@ -667,8 +667,8 @@ LegacyGetDataOrTable ( 0, 0 ); - DEBUG ((EFI_D_INFO, "LegacyGetDataOrTable - ID: %x, %r\n", (UINTN)Id, Status)); - DEBUG ((EFI_D_INFO, " Table - %x, Size - %x, Location - %x, Alignment - %x\n", (UINTN)Table, (UINTN)TableSize, (UINTN)Location, (UINTN)Alignment)); + DEBUG ((DEBUG_INFO, "LegacyGetDataOrTable - ID: %x, %r\n", (UINTN)Id, Status)); + DEBUG ((DEBUG_INFO, " Table - %x, Size - %x, Location - %x, Alignment - %x\n", (UINTN)Table, (UINTN)TableSize, (UINTN)Location, (UINTN)Alignment)); break; } @@ -697,7 +697,7 @@ LegacyGetDataOrTable ( ); if (Regs.X.AX != 0) { - DEBUG ((EFI_D_ERROR, "Table ID %x length insufficient\n", Id)); + DEBUG ((DEBUG_ERROR, "Table ID %x length insufficient\n", Id)); return EFI_OUT_OF_RESOURCES; } else { break; @@ -721,7 +721,7 @@ LegacyGetDataOrTable ( { Legacy16Table->MpTablePtr = (UINT32) (Regs.X.DS * 16 + Regs.X.BX); Legacy16Table->MpTableLength = (UINT32)TableSize; - DEBUG ((EFI_D_INFO, "MP table in legacy region - %x\n", (UINTN)Legacy16Table->MpTablePtr)); + DEBUG ((DEBUG_INFO, "MP table in legacy region - %x\n", (UINTN)Legacy16Table->MpTablePtr)); break; } @@ -730,7 +730,7 @@ LegacyGetDataOrTable ( Legacy16Table->OemIntSegment = Regs.X.DS; Legacy16Table->OemIntOffset = Regs.X.BX; - DEBUG ((EFI_D_INFO, "OemInt table in legacy region - %04x:%04x\n", (UINTN)Legacy16Table->OemIntSegment, (UINTN)Legacy16Table->OemIntOffset)); + DEBUG ((DEBUG_INFO, "OemInt table in legacy region - %04x:%04x\n", (UINTN)Legacy16Table->OemIntSegment, (UINTN)Legacy16Table->OemIntOffset)); break; } @@ -738,7 +738,7 @@ LegacyGetDataOrTable ( { Legacy16Table->Oem32Segment = Regs.X.DS; Legacy16Table->Oem32Offset = Regs.X.BX; - DEBUG ((EFI_D_INFO, "Oem32 table in legacy region - %04x:%04x\n", (UINTN)Legacy16Table->Oem32Segment, (UINTN)Legacy16Table->Oem32Offset)); + DEBUG ((DEBUG_INFO, "Oem32 table in legacy region - %04x:%04x\n", (UINTN)Legacy16Table->Oem32Segment, (UINTN)Legacy16Table->Oem32Offset)); break; } @@ -747,7 +747,7 @@ LegacyGetDataOrTable ( // // Legacy16Table->Oem16Segment = Regs.X.DS; // Legacy16Table->Oem16Offset = Regs.X.BX; - DEBUG ((EFI_D_INFO, "Oem16 table in legacy region - %04x:%04x\n", (UINTN)Legacy16Table->Oem16Segment, (UINTN)Legacy16Table->Oem16Offset)); + DEBUG ((DEBUG_INFO, "Oem16 table in legacy region - %04x:%04x\n", (UINTN)Legacy16Table->Oem16Segment, (UINTN)Legacy16Table->Oem16Offset)); break; } @@ -880,7 +880,7 @@ GenericLegacyBoot ( Private = LEGACY_BIOS_INSTANCE_FROM_THIS (This); DEBUG_CODE ( - DEBUG ((EFI_D_ERROR, "Start of legacy boot\n")); + DEBUG ((DEBUG_ERROR, "Start of legacy boot\n")); ); Legacy16Table = Private->Legacy16Table; @@ -943,7 +943,7 @@ GenericLegacyBoot ( Private->Legacy16Table->E820Pointer = (UINT32) (Regs.X.DS * 16 + Regs.X.BX); Private->Legacy16Table->E820Length = (UINT32) CopySize; if (Regs.X.AX != 0) { - DEBUG ((EFI_D_ERROR, "Legacy16 E820 length insufficient\n")); + DEBUG ((DEBUG_ERROR, "Legacy16 E820 length insufficient\n")); return EFI_OUT_OF_RESOURCES; } else { CopyMem ( @@ -965,7 +965,7 @@ GenericLegacyBoot ( // We do not ASSERT if SmbiosTable not found. It is possible that a platform does not produce SmbiosTable. // if (mReserveSmbiosEntryPoint == 0) { - DEBUG ((EFI_D_INFO, "Smbios table is not found!\n")); + DEBUG ((DEBUG_INFO, "Smbios table is not found!\n")); } CreateSmbiosTableInReservedMemory (); EfiToLegacy16BootTable->SmbiosTable = (UINT32)(UINTN)mReserveSmbiosEntryPoint; @@ -985,7 +985,7 @@ GenericLegacyBoot ( // We do not ASSERT if AcpiTable not found. It is possible that a platform does not produce AcpiTable. // if (AcpiTable == NULL) { - DEBUG ((EFI_D_INFO, "ACPI table is not found!\n")); + DEBUG ((DEBUG_INFO, "ACPI table is not found!\n")); } EfiToLegacy16BootTable->AcpiTable = (UINT32)(UINTN)AcpiTable; @@ -1245,7 +1245,7 @@ GenericLegacyBoot ( // Here we could reduce UmaAddress down as far as Private->OptionRom, taking into // account the granularity of the access control. // - DEBUG((EFI_D_INFO, "Unlocking UMB RAM region 0x%x-0x%x\n", Private->Legacy16Table->UmaAddress, + DEBUG((DEBUG_INFO, "Unlocking UMB RAM region 0x%x-0x%x\n", Private->Legacy16Table->UmaAddress, Private->Legacy16Table->UmaAddress + Private->Legacy16Table->UmaSize)); Private->LegacyRegion->UnLock ( @@ -1285,7 +1285,7 @@ GenericLegacyBoot ( (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_LEGACY_BOOT_EVENT) ); - DEBUG ((EFI_D_INFO, "Legacy INT19 Boot...\n")); + DEBUG ((DEBUG_INFO, "Legacy INT19 Boot...\n")); // // Disable DXE Timer while executing in real mode @@ -1944,7 +1944,7 @@ LegacyBiosBuildE820 ( // Print DEBUG information // for (TempIndex = 0; TempIndex < Index; TempIndex++) { - DEBUG((EFI_D_INFO, "E820[%2d]: 0x%016lx - 0x%016lx, Type = %d\n", + DEBUG((DEBUG_INFO, "E820[%2d]: 0x%016lx - 0x%016lx, Type = %d\n", TempIndex, E820Table[TempIndex].BaseAddr, (E820Table[TempIndex].BaseAddr + E820Table[TempIndex].Length), diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c b/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c index 2656dafde943..746b366448e6 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c @@ -374,7 +374,7 @@ GetPciLegacyRom ( } } } else { - DEBUG ((EFI_D_ERROR, "GetPciLegacyRom - OpRom not match (%04x-%04x)\n", (UINTN)VendorId, (UINTN)DeviceId)); + DEBUG ((DEBUG_ERROR, "GetPciLegacyRom - OpRom not match (%04x-%04x)\n", (UINTN)VendorId, (UINTN)DeviceId)); } } @@ -752,7 +752,7 @@ Rotate (B,C,D,A) by 1 giving C,D,A,B. Translated PIRQ is C. // In case we fail to find the Bridge just above us, this is some potential error and we want to warn the user // if(BridgeIndex >= NumberOfBridges){ - DEBUG ((EFI_D_ERROR, "Cannot Find IRQ Routing for Bus %d, Device %d, Function %d\n", *PciBus, *PciDevice, *PciFunction)); + DEBUG ((DEBUG_ERROR, "Cannot Find IRQ Routing for Bus %d, Device %d, Function %d\n", *PciBus, *PciDevice, *PciFunction)); } *PirqIndex = LocalPirqIndex; @@ -823,9 +823,9 @@ CopyPirqTable ( Private->Legacy16Table->IrqRoutingTablePointer = (UINT32) (Regs.X.DS * 16 + Regs.X.BX); if (Regs.X.AX != 0) { - DEBUG ((EFI_D_ERROR, "PIRQ table length insufficient - %x\n", PirqTableSize)); + DEBUG ((DEBUG_ERROR, "PIRQ table length insufficient - %x\n", PirqTableSize)); } else { - DEBUG ((EFI_D_INFO, "PIRQ table in legacy region - %x\n", Private->Legacy16Table->IrqRoutingTablePointer)); + DEBUG ((DEBUG_INFO, "PIRQ table in legacy region - %x\n", Private->Legacy16Table->IrqRoutingTablePointer)); Private->Legacy16Table->IrqRoutingTableLength = (UINT32)PirqTableSize; CopyMem ( (VOID *) (UINTN)Private->Legacy16Table->IrqRoutingTablePointer, @@ -858,24 +858,24 @@ DumpPciHandle ( IN EFI_LEGACY_INSTALL_PCI_HANDLER *PciHandle ) { - DEBUG ((EFI_D_INFO, "PciBus - %02x\n", (UINTN)PciHandle->PciBus)); - DEBUG ((EFI_D_INFO, "PciDeviceFun - %02x\n", (UINTN)PciHandle->PciDeviceFun)); - DEBUG ((EFI_D_INFO, "PciSegment - %02x\n", (UINTN)PciHandle->PciSegment)); - DEBUG ((EFI_D_INFO, "PciClass - %02x\n", (UINTN)PciHandle->PciClass)); - DEBUG ((EFI_D_INFO, "PciSubclass - %02x\n", (UINTN)PciHandle->PciSubclass)); - DEBUG ((EFI_D_INFO, "PciInterface - %02x\n", (UINTN)PciHandle->PciInterface)); + DEBUG ((DEBUG_INFO, "PciBus - %02x\n", (UINTN)PciHandle->PciBus)); + DEBUG ((DEBUG_INFO, "PciDeviceFun - %02x\n", (UINTN)PciHandle->PciDeviceFun)); + DEBUG ((DEBUG_INFO, "PciSegment - %02x\n", (UINTN)PciHandle->PciSegment)); + DEBUG ((DEBUG_INFO, "PciClass - %02x\n", (UINTN)PciHandle->PciClass)); + DEBUG ((DEBUG_INFO, "PciSubclass - %02x\n", (UINTN)PciHandle->PciSubclass)); + DEBUG ((DEBUG_INFO, "PciInterface - %02x\n", (UINTN)PciHandle->PciInterface)); - DEBUG ((EFI_D_INFO, "PrimaryIrq - %02x\n", (UINTN)PciHandle->PrimaryIrq)); - DEBUG ((EFI_D_INFO, "PrimaryReserved - %02x\n", (UINTN)PciHandle->PrimaryReserved)); - DEBUG ((EFI_D_INFO, "PrimaryControl - %04x\n", (UINTN)PciHandle->PrimaryControl)); - DEBUG ((EFI_D_INFO, "PrimaryBase - %04x\n", (UINTN)PciHandle->PrimaryBase)); - DEBUG ((EFI_D_INFO, "PrimaryBusMaster - %04x\n", (UINTN)PciHandle->PrimaryBusMaster)); + DEBUG ((DEBUG_INFO, "PrimaryIrq - %02x\n", (UINTN)PciHandle->PrimaryIrq)); + DEBUG ((DEBUG_INFO, "PrimaryReserved - %02x\n", (UINTN)PciHandle->PrimaryReserved)); + DEBUG ((DEBUG_INFO, "PrimaryControl - %04x\n", (UINTN)PciHandle->PrimaryControl)); + DEBUG ((DEBUG_INFO, "PrimaryBase - %04x\n", (UINTN)PciHandle->PrimaryBase)); + DEBUG ((DEBUG_INFO, "PrimaryBusMaster - %04x\n", (UINTN)PciHandle->PrimaryBusMaster)); - DEBUG ((EFI_D_INFO, "SecondaryIrq - %02x\n", (UINTN)PciHandle->SecondaryIrq)); - DEBUG ((EFI_D_INFO, "SecondaryReserved - %02x\n", (UINTN)PciHandle->SecondaryReserved)); - DEBUG ((EFI_D_INFO, "SecondaryControl - %04x\n", (UINTN)PciHandle->SecondaryControl)); - DEBUG ((EFI_D_INFO, "SecondaryBase - %04x\n", (UINTN)PciHandle->SecondaryBase)); - DEBUG ((EFI_D_INFO, "SecondaryBusMaster - %04x\n", (UINTN)PciHandle->SecondaryBusMaster)); + DEBUG ((DEBUG_INFO, "SecondaryIrq - %02x\n", (UINTN)PciHandle->SecondaryIrq)); + DEBUG ((DEBUG_INFO, "SecondaryReserved - %02x\n", (UINTN)PciHandle->SecondaryReserved)); + DEBUG ((DEBUG_INFO, "SecondaryControl - %04x\n", (UINTN)PciHandle->SecondaryControl)); + DEBUG ((DEBUG_INFO, "SecondaryBase - %04x\n", (UINTN)PciHandle->SecondaryBase)); + DEBUG ((DEBUG_INFO, "SecondaryBusMaster - %04x\n", (UINTN)PciHandle->SecondaryBusMaster)); return; } @@ -1254,7 +1254,7 @@ PciProgramAllInterruptLineRegisters ( // If it does return failure status, check your PIRQ routing table to see if some item is missing or incorrect // if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Translate Pirq Failed - Status = %r\n ", Status)); + DEBUG ((DEBUG_ERROR, "Translate Pirq Failed - Status = %r\n ", Status)); continue; } @@ -2110,7 +2110,7 @@ LegacyBiosInstallVgaRom ( // This should be video thunk driver which is managing video device // So it need not start again // - DEBUG ((EFI_D_INFO, "Video thunk driver already start! Return!\n")); + DEBUG ((DEBUG_INFO, "Video thunk driver already start! Return!\n")); Private->VgaInstalled = TRUE; return EFI_SUCCESS; } @@ -2321,7 +2321,7 @@ LegacyBiosInstallRom ( ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__)); + DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__)); // // Report Status Code to indicate that there is no enough space for OpROM // @@ -2337,7 +2337,7 @@ LegacyBiosInstallRom ( // RuntimeAddress = Private->OptionRom; if (RuntimeAddress + *RuntimeImageLength > MaxRomAddr) { - DEBUG ((EFI_D_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__)); + DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__)); gBS->FreePages (PhysicalAddress, EFI_SIZE_TO_PAGES (ImageSize)); // // Report Status Code to indicate that there is no enough space for OpROM @@ -2355,7 +2355,7 @@ LegacyBiosInstallRom ( // InitAddress = PCI_START_ADDRESS (Private->OptionRom); if (InitAddress + ImageSize > MaxRomAddr) { - DEBUG ((EFI_D_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__)); + DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__)); // // Report Status Code to indicate that there is no enough space for OpROM // @@ -2383,7 +2383,7 @@ LegacyBiosInstallRom ( &Granularity ); - DEBUG ((EFI_D_INFO, " Shadowing OpROM init/runtime/isize = %x/%x/%x\n", InitAddress, RuntimeAddress, ImageSize)); + DEBUG ((DEBUG_INFO, " Shadowing OpROM init/runtime/isize = %x/%x/%x\n", InitAddress, RuntimeAddress, ImageSize)); CopyMem ((VOID *) InitAddress, RomImage, ImageSize); @@ -2501,7 +2501,7 @@ LegacyBiosInstallRom ( &Device, &Function ); - DEBUG ((EFI_D_INFO, "Shadowing OpROM on the PCI device %x/%x/%x\n", Bus, Device, Function)); + DEBUG ((DEBUG_INFO, "Shadowing OpROM on the PCI device %x/%x/%x\n", Bus, Device, Function)); } mIgnoreBbsUpdateFlag = FALSE; @@ -2526,7 +2526,7 @@ LegacyBiosInstallRom ( // Otherwise, it may cause the system to hang in some cases // if (!EFI_ERROR (PciEnableStatus)) { - DEBUG ((EFI_D_INFO, " Legacy16DispatchOprom - %02x/%02x/%02x\n", Bus, Device, Function)); + DEBUG ((DEBUG_INFO, " Legacy16DispatchOprom - %02x/%02x/%02x\n", Bus, Device, Function)); Private->LegacyBios.FarCall86 ( &Private->LegacyBios, Private->Legacy16CallSegment, @@ -2594,7 +2594,7 @@ LegacyBiosInstallRom ( *RuntimeImageLength = ((EFI_LEGACY_EXPANSION_ROM_HEADER *) RuntimeAddress)->Size512 * 512; } - DEBUG ((EFI_D_INFO, " fsize = %x\n", *RuntimeImageLength)); + DEBUG ((DEBUG_INFO, " fsize = %x\n", *RuntimeImageLength)); // // If OpROM runs in 2.0 mode diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacySio.c b/OvmfPkg/Csm/LegacyBiosDxe/LegacySio.c index 17720a74f7d5..6b9bb5ed8b2a 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacySio.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacySio.c @@ -117,7 +117,7 @@ LegacyBiosBuildSioDataFromSio ( } } - DEBUG ((EFI_D_INFO, "LegacySio: Address/Dma/Irq = %x/%d/%d\n", Address, Dma, Irq)); + DEBUG ((DEBUG_INFO, "LegacySio: Address/Dma/Irq = %x/%d/%d\n", Address, Dma, Irq)); DevicePath = DevicePathFromHandle (HandleBuffer[Index]); if (DevicePath == NULL) { diff --git a/OvmfPkg/Csm/LegacyBiosDxe/Thunk.c b/OvmfPkg/Csm/LegacyBiosDxe/Thunk.c index 6432030a23ac..d9828bb2f894 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/Thunk.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/Thunk.c @@ -242,7 +242,7 @@ InternalLegacyBiosFarCall ( } } if (Count >= 2) { - DEBUG ((EFI_D_ERROR, "ERROR: More than one HW interrupt active with CSM enabled\n")); + DEBUG ((DEBUG_ERROR, "ERROR: More than one HW interrupt active with CSM enabled\n")); } ASSERT (Count < 2); ); diff --git a/OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUi.c b/OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUi.c index 35470abf914a..31e211a7b904 100644 --- a/OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUi.c +++ b/OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUi.c @@ -808,7 +808,7 @@ UpdateLegacyDeviceOrderPage ( break; default: - DEBUG ((EFI_D_ERROR, "Invalid command ID for updating page!\n")); + DEBUG ((DEBUG_ERROR, "Invalid command ID for updating page!\n")); return; } diff --git a/OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c b/OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c index 6ed45785be72..cd0e02060f20 100644 --- a/OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c +++ b/OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c @@ -440,7 +440,7 @@ LegacyBmDeleteAllInvalidBootOptions ( BbsIndex = LegacyBmFuzzyMatch (&BootOption[Index], BbsTable, BbsCount, BbsIndexUsed); if (BbsIndex == BbsCount) { - DEBUG ((EFI_D_INFO, "[LegacyBds] Delete Boot Option Boot%04x: %s\n", (UINTN) BootOption[Index].OptionNumber, BootOption[Index].Description)); + DEBUG ((DEBUG_INFO, "[LegacyBds] Delete Boot Option Boot%04x: %s\n", (UINTN) BootOption[Index].OptionNumber, BootOption[Index].Description)); // // Delete entry from LegacyDevOrder // @@ -454,7 +454,7 @@ LegacyBmDeleteAllInvalidBootOptions ( EfiBootManagerDeleteLoadOptionVariable (BootOption[Index].OptionNumber, BootOption[Index].OptionType); } else { if (((LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOption[Index].OptionalData)->BbsIndex != BbsIndex) { - DEBUG ((EFI_D_INFO, "[LegacyBds] Update Boot Option Boot%04x: %s Bbs0x%04x->Bbs0x%04x\n", (UINTN) BootOption[Index].OptionNumber, BootOption[Index].Description, + DEBUG ((DEBUG_INFO, "[LegacyBds] Update Boot Option Boot%04x: %s Bbs0x%04x->Bbs0x%04x\n", (UINTN) BootOption[Index].OptionNumber, BootOption[Index].Description, (UINTN) ((LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOption[Index].OptionalData)->BbsIndex, (UINTN) BbsIndex)); // // Update the BBS index in LegacyDevOrder @@ -1506,7 +1506,7 @@ LegacyBmRefreshAllBootOption ( if (LegacyBmFindBootOption (&BootOptions[Index], ExistingBootOptions, ExistingBootOptionCount) == -1) { Status = EfiBootManagerAddLoadOptionVariable (&BootOptions[Index], (UINTN) -1); DEBUG (( - EFI_D_INFO, "[LegacyBds] New Boot Option: Boot%04x Bbs0x%04x %s %r\n", + DEBUG_INFO, "[LegacyBds] New Boot Option: Boot%04x Bbs0x%04x %s %r\n", (UINTN) BootOptions[Index].OptionNumber, (UINTN) ((LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOptions[Index].OptionalData)->BbsIndex, BootOptions[Index].Description, diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c index b6c6abef1ef2..766ad1e59f47 100644 --- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c +++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c @@ -579,7 +579,7 @@ ValidateFvHeader ( (FwVolHeader->FvLength != EMU_FVB_SIZE) || (FwVolHeader->HeaderLength != EMU_FV_HEADER_LENGTH) ) { - DEBUG ((EFI_D_INFO, "EMU Variable FVB: Basic FV headers were invalid\n")); + DEBUG ((DEBUG_INFO, "EMU Variable FVB: Basic FV headers were invalid\n")); return EFI_NOT_FOUND; } // @@ -588,7 +588,7 @@ ValidateFvHeader ( Checksum = CalculateSum16((VOID*) FwVolHeader, FwVolHeader->HeaderLength); if (Checksum != 0) { - DEBUG ((EFI_D_INFO, "EMU Variable FVB: FV checksum was invalid\n")); + DEBUG ((DEBUG_INFO, "EMU Variable FVB: FV checksum was invalid\n")); return EFI_NOT_FOUND; } @@ -719,7 +719,7 @@ FvbInitialize ( EFI_PHYSICAL_ADDRESS Address; RETURN_STATUS PcdStatus; - DEBUG ((EFI_D_INFO, "EMU Variable FVB Started\n")); + DEBUG ((DEBUG_INFO, "EMU Variable FVB Started\n")); // // Verify that the PCD's are set correctly. @@ -732,12 +732,12 @@ FvbInitialize ( ) > EMU_FVB_NUM_SPARE_BLOCKS * EMU_FVB_BLOCK_SIZE ) { - DEBUG ((EFI_D_ERROR, "EMU Variable invalid PCD sizes\n")); + DEBUG ((DEBUG_ERROR, "EMU Variable invalid PCD sizes\n")); return EFI_INVALID_PARAMETER; } if (PcdGet64 (PcdFlashNvStorageVariableBase64) != 0) { - DEBUG ((EFI_D_INFO, "Disabling EMU Variable FVB since " + DEBUG ((DEBUG_INFO, "Disabling EMU Variable FVB since " "flash variables appear to be supported.\n")); return EFI_ABORTED; } @@ -754,13 +754,13 @@ FvbInitialize ( if (PcdGet64 (PcdEmuVariableNvStoreReserved) != 0) { Ptr = (VOID*)(UINTN) PcdGet64 (PcdEmuVariableNvStoreReserved); DEBUG (( - EFI_D_INFO, + DEBUG_INFO, "EMU Variable FVB: Using pre-reserved block at %p\n", Ptr )); Status = ValidateFvHeader (Ptr); if (!EFI_ERROR (Status)) { - DEBUG ((EFI_D_INFO, "EMU Variable FVB: Found valid pre-existing FV\n")); + DEBUG ((DEBUG_INFO, "EMU Variable FVB: Found valid pre-existing FV\n")); Initialize = FALSE; } } else { @@ -806,7 +806,7 @@ FvbInitialize ( // // Install the protocols // - DEBUG ((EFI_D_INFO, "Installing FVB for EMU Variable support\n")); + DEBUG ((DEBUG_INFO, "Installing FVB for EMU Variable support\n")); Handle = 0; Status = gBS->InstallMultipleProtocolInterfaces ( &Handle, diff --git a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c index 21b49a8753e8..53c768167de9 100644 --- a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c +++ b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c @@ -233,7 +233,7 @@ CheckDevice ( // *Configuration = AllocateCopyPool (sizeof mConfiguration, &mConfiguration); if (*Configuration == NULL) { - DEBUG ((EFI_D_WARN, + DEBUG ((DEBUG_WARN, "%a: 64-bit MMIO BARs may be degraded for PCI 0x%04x:0x%04x (rev %d)\n", __FUNCTION__, (UINT32)VendorId, (UINT32)DeviceId, (UINT8)RevisionId)); return EFI_OUT_OF_RESOURCES; diff --git a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c index aa2b5faf1c00..7c593e8be156 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 dd022aceed2a..52f3ea2dbf16 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 ae976cbe9e96..09076c0adebf 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 318e36ff1125..c5022f6636ed 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 627a15abd274..2ba03522fbb6 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 ec2385b75bbd..e850f7d183ee 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 45d0ee9cc3a8..3c55ec9bd9ac 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 4431b13ca25b..25d5494047ab 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 983680f8b6dd..0182c9235cac 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 4d2c43cb8fd7..4ef78b7a8b65 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 d07b1714c20b..ecabd88fab66 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 d7a44e5897d5..94e8e92180cf 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 a6cebcb54f6b..777b93f1a029 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 24ec7cd19b92..4d2c23cfb39f 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 d5bed3546d77..2f20272c1445 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 d4fa802743de..265aa766d0e8 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 154e4fdeb71c..ae4ea0309ac3 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)); diff --git a/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c b/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c index b64dba1cc64f..fd05ee5c2c1b 100644 --- a/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c +++ b/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c @@ -569,7 +569,7 @@ GetResourcePadding ( DevicePathString = ConvertDevicePathToText (HpcDevicePath, FALSE, FALSE); - DEBUG ((EFI_D_VERBOSE, "%a: Address=%02x:%02x.%x DevicePath=%s\n", + DEBUG ((DEBUG_VERBOSE, "%a: Address=%02x:%02x.%x DevicePath=%s\n", __FUNCTION__, Address->Bus, Address->Device, Address->Function, (DevicePathString == NULL) ? L"" : DevicePathString)); diff --git a/OvmfPkg/PlatformDxe/Platform.c b/OvmfPkg/PlatformDxe/Platform.c index 23ad43901f66..f2e51960ce8b 100644 --- a/OvmfPkg/PlatformDxe/Platform.c +++ b/OvmfPkg/PlatformDxe/Platform.c @@ -228,7 +228,7 @@ ExtractConfig ( MAIN_FORM_STATE MainFormState; EFI_STATUS Status; - DEBUG ((EFI_D_VERBOSE, "%a: Request=\"%s\"\n", __FUNCTION__, Request)); + DEBUG ((DEBUG_VERBOSE, "%a: Request=\"%s\"\n", __FUNCTION__, Request)); Status = PlatformConfigToFormState (&MainFormState); if (EFI_ERROR (Status)) { @@ -243,10 +243,10 @@ ExtractConfig ( (VOID *) &MainFormState, sizeof MainFormState, Results, Progress); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "%a: BlockToConfig(): %r, Progress=\"%s\"\n", + DEBUG ((DEBUG_ERROR, "%a: BlockToConfig(): %r, Progress=\"%s\"\n", __FUNCTION__, Status, (Status == EFI_DEVICE_ERROR) ? NULL : *Progress)); } else { - DEBUG ((EFI_D_VERBOSE, "%a: Results=\"%s\"\n", __FUNCTION__, *Results)); + DEBUG ((DEBUG_VERBOSE, "%a: Results=\"%s\"\n", __FUNCTION__, *Results)); } return Status; } @@ -321,7 +321,7 @@ RouteConfig ( UINTN BlockSize; EFI_STATUS Status; - DEBUG ((EFI_D_VERBOSE, "%a: Configuration=\"%s\"\n", __FUNCTION__, + DEBUG ((DEBUG_VERBOSE, "%a: Configuration=\"%s\"\n", __FUNCTION__, Configuration)); // @@ -343,7 +343,7 @@ RouteConfig ( Status = gHiiConfigRouting->ConfigToBlock (gHiiConfigRouting, Configuration, (VOID *) &MainFormState, &BlockSize, Progress); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "%a: ConfigToBlock(): %r, Progress=\"%s\"\n", + DEBUG ((DEBUG_ERROR, "%a: ConfigToBlock(): %r, Progress=\"%s\"\n", __FUNCTION__, Status, (Status == EFI_BUFFER_TOO_SMALL) ? NULL : *Progress)); return Status; @@ -372,7 +372,7 @@ Callback ( OUT EFI_BROWSER_ACTION_REQUEST *ActionRequest ) { - DEBUG ((EFI_D_VERBOSE, "%a: Action=0x%Lx QuestionId=%d Type=%d\n", + DEBUG ((DEBUG_VERBOSE, "%a: Action=0x%Lx QuestionId=%d Type=%d\n", __FUNCTION__, (UINT64) Action, QuestionId, Type)); if (Action != EFI_BROWSER_ACTION_CHANGED) { @@ -661,7 +661,7 @@ ExecutePlatformConfig ( Status = PlatformConfigLoad (&PlatformConfig, &OptionalElements); if (EFI_ERROR (Status)) { - DEBUG (((Status == EFI_NOT_FOUND) ? EFI_D_VERBOSE : EFI_D_ERROR, + DEBUG (((Status == EFI_NOT_FOUND) ? DEBUG_VERBOSE : DEBUG_ERROR, "%a: failed to load platform config: %r\n", __FUNCTION__, Status)); return Status; } diff --git a/OvmfPkg/PlatformPei/FeatureControl.c b/OvmfPkg/PlatformPei/FeatureControl.c index 1a9d75022f48..dccf9505dd7b 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 13b1dd38e6d6..ee4ecab615f9 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 f32df937f9ba..3b46ea431ade 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 3b850c2c2626..96468701e3b8 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 0904c654f149..104922c67e7e 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 diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c index 76a7853de04d..bc3f1bb5fdef 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c @@ -815,7 +815,7 @@ ValidateFvHeader ( Expected = (UINT16) (((UINTN) FwVolHeader->Checksum + 0x10000 - Checksum) & 0xffff); - DEBUG ((EFI_D_INFO, "FV@%p Checksum is 0x%x, expected 0x%x\n", + DEBUG ((DEBUG_INFO, "FV@%p Checksum is 0x%x, expected 0x%x\n", FwVolHeader, FwVolHeader->Checksum, Expected)); return EFI_NOT_FOUND; } @@ -859,7 +859,7 @@ InitializeVariableFvHeader ( UINTN Offset; UINTN Start; - DEBUG ((EFI_D_INFO, + DEBUG ((DEBUG_INFO, "Variable FV header is not valid. It will be reinitialized.\n")); // @@ -929,7 +929,7 @@ FvbInitialize ( // // Return an error so image will be unloaded // - DEBUG ((EFI_D_INFO, + DEBUG ((DEBUG_INFO, "QEMU flash was not detected. Writable FVB is not being installed.\n")); return EFI_WRITE_PROTECTED; } @@ -946,7 +946,7 @@ FvbInitialize ( Status = InitializeVariableFvHeader (); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_INFO, + DEBUG ((DEBUG_INFO, "QEMU Flash: Unable to initialize variable FV header\n")); return EFI_WRITE_PROTECTED; } @@ -959,7 +959,7 @@ FvbInitialize ( // Status = GetFvbInfo (Length, &FwVolHeader); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_INFO, "EFI_ERROR (GetFvbInfo (Length, &FwVolHeader))\n")); + DEBUG ((DEBUG_INFO, "EFI_ERROR (GetFvbInfo (Length, &FwVolHeader))\n")); return EFI_WRITE_PROTECTED; } } diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c index e60978fa127b..1f285e008372 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c @@ -44,7 +44,7 @@ InstallProtocolInterfaces ( // LocateDevicePath fails so install a new interface and device path // FwbHandle = NULL; - DEBUG ((EFI_D_INFO, "Installing QEMU flash FVB\n")); + DEBUG ((DEBUG_INFO, "Installing QEMU flash FVB\n")); Status = gBS->InstallMultipleProtocolInterfaces ( &FwbHandle, &gEfiFirmwareVolumeBlockProtocolGuid, @@ -65,7 +65,7 @@ InstallProtocolInterfaces ( ); ASSERT_EFI_ERROR (Status); - DEBUG ((EFI_D_INFO, "Reinstalling FVB for QEMU flash region\n")); + DEBUG ((DEBUG_INFO, "Reinstalling FVB for QEMU flash region\n")); Status = gBS->ReinstallProtocolInterface ( FwbHandle, &gEfiFirmwareVolumeBlockProtocolGuid, diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c index 2717930f75e3..544f88e661a8 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c @@ -34,7 +34,7 @@ InstallProtocolInterfaces ( // Firmware Volume Block protocol structure. // FvbHandle = NULL; - DEBUG ((EFI_D_INFO, "Installing QEMU flash SMM FVB\n")); + DEBUG ((DEBUG_INFO, "Installing QEMU flash SMM FVB\n")); Status = gSmst->SmmInstallProtocolInterface ( &FvbHandle, &gEfiSmmFirmwareVolumeBlockProtocolGuid, diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c index c81c58972bf2..1b0d6c053f1a 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c @@ -74,35 +74,35 @@ QemuFlashDetected ( } if (Offset >= mFdBlockSize) { - DEBUG ((EFI_D_INFO, "QEMU Flash: Failed to find probe location\n")); + DEBUG ((DEBUG_INFO, "QEMU Flash: Failed to find probe location\n")); return FALSE; } - DEBUG ((EFI_D_INFO, "QEMU Flash: Attempting flash detection at %p\n", Ptr)); + DEBUG ((DEBUG_INFO, "QEMU Flash: Attempting flash detection at %p\n", Ptr)); OriginalUint8 = *Ptr; *Ptr = CLEAR_STATUS_CMD; ProbeUint8 = *Ptr; if (OriginalUint8 != CLEAR_STATUS_CMD && ProbeUint8 == CLEAR_STATUS_CMD) { - DEBUG ((EFI_D_INFO, "QemuFlashDetected => FD behaves as RAM\n")); + DEBUG ((DEBUG_INFO, "QemuFlashDetected => FD behaves as RAM\n")); *Ptr = OriginalUint8; } else { *Ptr = READ_STATUS_CMD; ProbeUint8 = *Ptr; if (ProbeUint8 == OriginalUint8) { - DEBUG ((EFI_D_INFO, "QemuFlashDetected => FD behaves as ROM\n")); + DEBUG ((DEBUG_INFO, "QemuFlashDetected => FD behaves as ROM\n")); } else if (ProbeUint8 == READ_STATUS_CMD) { - DEBUG ((EFI_D_INFO, "QemuFlashDetected => FD behaves as RAM\n")); + DEBUG ((DEBUG_INFO, "QemuFlashDetected => FD behaves as RAM\n")); *Ptr = OriginalUint8; } else if (ProbeUint8 == CLEARED_ARRAY_STATUS) { - DEBUG ((EFI_D_INFO, "QemuFlashDetected => FD behaves as FLASH\n")); + DEBUG ((DEBUG_INFO, "QemuFlashDetected => FD behaves as FLASH\n")); FlashDetected = TRUE; *Ptr = READ_ARRAY_CMD; } } - DEBUG ((EFI_D_INFO, "QemuFlashDetected => %a\n", + DEBUG ((DEBUG_INFO, "QemuFlashDetected => %a\n", FlashDetected ? "Yes" : "No")); return FlashDetected; } diff --git a/OvmfPkg/QemuVideoDxe/Driver.c b/OvmfPkg/QemuVideoDxe/Driver.c index 37bbbbe843c9..85edfcb1d6df 100644 --- a/OvmfPkg/QemuVideoDxe/Driver.c +++ b/OvmfPkg/QemuVideoDxe/Driver.c @@ -153,7 +153,7 @@ QemuVideoControllerDriverSupported ( } Card = QemuVideoDetect(Pci.Hdr.ClassCode[1], Pci.Hdr.VendorId, Pci.Hdr.DeviceId); if (Card != NULL) { - DEBUG ((EFI_D_INFO, "QemuVideo: %s detected\n", Card->Name)); + DEBUG ((DEBUG_INFO, "QemuVideo: %s detected\n", Card->Name)); Status = EFI_SUCCESS; } @@ -324,10 +324,10 @@ QemuVideoControllerDriverStart ( ); if (EFI_ERROR (Status) || MmioDesc->ResType != ACPI_ADDRESS_SPACE_TYPE_MEM) { - DEBUG ((EFI_D_INFO, "QemuVideo: No mmio bar, fallback to port io\n")); + DEBUG ((DEBUG_INFO, "QemuVideo: No mmio bar, fallback to port io\n")); Private->Variant = QEMU_VIDEO_BOCHS; } else { - DEBUG ((EFI_D_INFO, "QemuVideo: Using mmio bar @ 0x%lx\n", + DEBUG ((DEBUG_INFO, "QemuVideo: Using mmio bar @ 0x%lx\n", MmioDesc->AddrRangeMin)); } @@ -352,7 +352,7 @@ QemuVideoControllerDriverStart ( UINT16 BochsId; BochsId = BochsRead(Private, VBE_DISPI_INDEX_ID); if ((BochsId & 0xFFF0) != VBE_DISPI_ID0) { - DEBUG ((EFI_D_INFO, "QemuVideo: BochsID mismatch (got 0x%x)\n", BochsId)); + DEBUG ((DEBUG_INFO, "QemuVideo: BochsID mismatch (got 0x%x)\n", BochsId)); Status = EFI_DEVICE_ERROR; goto RestoreAttributes; } @@ -959,7 +959,7 @@ InitializeBochsGraphicsMode ( QEMU_VIDEO_BOCHS_MODES *ModeData ) { - DEBUG ((EFI_D_INFO, "InitializeBochsGraphicsMode: %dx%d @ %d\n", + DEBUG ((DEBUG_INFO, "InitializeBochsGraphicsMode: %dx%d @ %d\n", ModeData->Width, ModeData->Height, ModeData->ColorDepth)); /* unblank */ diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c index e49ec32cf16d..a44917eb6b62 100644 --- a/OvmfPkg/QemuVideoDxe/Gop.c +++ b/OvmfPkg/QemuVideoDxe/Gop.c @@ -30,7 +30,7 @@ QemuVideoCompleteModeInfo ( Info->PixelInformation.BlueMask = PIXEL24_BLUE_MASK; Info->PixelInformation.ReservedMask = 0; } else if (ModeData->ColorDepth == 32) { - DEBUG ((EFI_D_INFO, "PixelBlueGreenRedReserved8BitPerColor\n")); + DEBUG ((DEBUG_INFO, "PixelBlueGreenRedReserved8BitPerColor\n")); Info->PixelFormat = PixelBlueGreenRedReserved8BitPerColor; } Info->PixelsPerScanLine = Info->HorizontalResolution; @@ -65,7 +65,7 @@ QemuVideoCompleteModeData ( Mode->FrameBufferSize = EFI_PAGES_TO_SIZE ( EFI_SIZE_TO_PAGES (Mode->FrameBufferSize) ); - DEBUG ((EFI_D_INFO, "FrameBufferBase: 0x%Lx, FrameBufferSize: 0x%Lx\n", + DEBUG ((DEBUG_INFO, "FrameBufferBase: 0x%Lx, FrameBufferSize: 0x%Lx\n", Mode->FrameBufferBase, (UINT64)Mode->FrameBufferSize)); FreePool (FrameBufDesc); diff --git a/OvmfPkg/QemuVideoDxe/Initialize.c b/OvmfPkg/QemuVideoDxe/Initialize.c index 6ee42fb8d9d7..b5a5660ed2ee 100644 --- a/OvmfPkg/QemuVideoDxe/Initialize.c +++ b/OvmfPkg/QemuVideoDxe/Initialize.c @@ -180,7 +180,7 @@ QemuVideoCirrusModeSetup ( ModeData->HorizontalResolution = VideoMode->Width; ModeData->VerticalResolution = VideoMode->Height; ModeData->ColorDepth = VideoMode->ColorDepth; - DEBUG ((EFI_D_INFO, + DEBUG ((DEBUG_INFO, "Adding Mode %d as Cirrus Internal Mode %d: %dx%d, %d-bit\n", (INT32) (ModeData - Private->ModeData), ModeData->InternalModeIndex, @@ -289,7 +289,7 @@ QemuVideoBochsModeSetup ( EFI_ERROR ( Private->PciIo->Mem.Read (Private->PciIo, EfiPciIoWidthUint32, PCI_BAR_IDX2, 40, 1, &AvailableFbSize))) { - DEBUG ((EFI_D_ERROR, "%a: can't read size of drawable buffer from QXL " + DEBUG ((DEBUG_ERROR, "%a: can't read size of drawable buffer from QXL " "ROM\n", __FUNCTION__)); return EFI_NOT_FOUND; } @@ -297,7 +297,7 @@ QemuVideoBochsModeSetup ( AvailableFbSize = BochsRead (Private, VBE_DISPI_INDEX_VIDEO_MEMORY_64K); AvailableFbSize *= SIZE_64KB; } - DEBUG ((EFI_D_INFO, "%a: AvailableFbSize=0x%x\n", __FUNCTION__, + DEBUG ((DEBUG_INFO, "%a: AvailableFbSize=0x%x\n", __FUNCTION__, AvailableFbSize)); // @@ -322,7 +322,7 @@ QemuVideoBochsModeSetup ( ModeData->HorizontalResolution = VideoMode->Width; ModeData->VerticalResolution = VideoMode->Height; ModeData->ColorDepth = VideoMode->ColorDepth; - DEBUG ((EFI_D_INFO, + DEBUG ((DEBUG_INFO, "Adding Mode %d as Bochs Internal Mode %d: %dx%d, %d-bit\n", (INT32) (ModeData - Private->ModeData), ModeData->InternalModeIndex, diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.c b/OvmfPkg/QemuVideoDxe/VbeShim.c index c23dc984d453..048ffa7058ca 100644 --- a/OvmfPkg/QemuVideoDxe/VbeShim.c +++ b/OvmfPkg/QemuVideoDxe/VbeShim.c @@ -114,7 +114,7 @@ InstallVbeShim ( // Handler = (Int0x10->Segment << 4) + Int0x10->Offset; if (Handler >= SegmentC && Handler < SegmentF) { - DEBUG ((EFI_D_INFO, "%a: Video BIOS handler found at %04x:%04x\n", + DEBUG ((DEBUG_INFO, "%a: Video BIOS handler found at %04x:%04x\n", __FUNCTION__, Int0x10->Segment, Int0x10->Offset)); return; } @@ -312,5 +312,5 @@ InstallVbeShim ( Int0x10->Segment = (UINT16) ((UINT32)SegmentC >> 4); Int0x10->Offset = (UINT16) ((UINTN) (VbeModeInfo + 1) - SegmentC); - DEBUG ((EFI_D_INFO, "%a: VBE shim installed\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a: VBE shim installed\n", __FUNCTION__)); } diff --git a/OvmfPkg/SataControllerDxe/SataController.c b/OvmfPkg/SataControllerDxe/SataController.c index 313bfab1bea5..a5b5f04d2708 100644 --- a/OvmfPkg/SataControllerDxe/SataController.c +++ b/OvmfPkg/SataControllerDxe/SataController.c @@ -118,7 +118,7 @@ CalculateBestPioMode ( if ((IdentifyData->AtaData.field_validity & 0x02) == 0x02) { AdvancedPioMode = IdentifyData->AtaData.advanced_pio_modes; - DEBUG ((EFI_D_INFO, "CalculateBestPioMode: AdvancedPioMode = %x\n", AdvancedPioMode)); + DEBUG ((DEBUG_INFO, "CalculateBestPioMode: AdvancedPioMode = %x\n", AdvancedPioMode)); for (Index = 0; Index < 8; Index++) { if ((AdvancedPioMode & 0x01) != 0) { @@ -232,7 +232,7 @@ CalculateBestUdmaMode ( } DeviceUDmaMode = IdentifyData->AtaData.ultra_dma_mode; - DEBUG ((EFI_D_INFO, "CalculateBestUdmaMode: DeviceUDmaMode = %x\n", DeviceUDmaMode)); + DEBUG ((DEBUG_INFO, "CalculateBestUdmaMode: DeviceUDmaMode = %x\n", DeviceUDmaMode)); DeviceUDmaMode &= 0x3f; TempMode = 0; // initialize it to UDMA-0 @@ -391,7 +391,7 @@ SataControllerStart ( UINT32 Data32; UINTN ChannelDeviceCount; - DEBUG ((EFI_D_INFO, "SataControllerStart START\n")); + DEBUG ((DEBUG_INFO, "SataControllerStart START\n")); BailLogMask = DEBUG_ERROR; SataPrivateData = NULL; @@ -518,7 +518,7 @@ SataControllerStart ( goto FreeIdentifyValid; } - DEBUG ((EFI_D_INFO, "SataControllerStart END status = %r\n", Status)); + DEBUG ((DEBUG_INFO, "SataControllerStart END status = %r\n", Status)); return Status; FreeIdentifyValid: @@ -1034,7 +1034,7 @@ IdeInitCalculateMode ( } else { (*SupportedModes)->PioMode.Valid = FALSE; } - DEBUG ((EFI_D_INFO, "IdeInitCalculateMode: PioMode = %x\n", (*SupportedModes)->PioMode.Mode)); + DEBUG ((DEBUG_INFO, "IdeInitCalculateMode: PioMode = %x\n", (*SupportedModes)->PioMode.Mode)); Status = CalculateBestUdmaMode ( IdentifyData, @@ -1049,7 +1049,7 @@ IdeInitCalculateMode ( } else { (*SupportedModes)->UdmaMode.Valid = FALSE; } - DEBUG ((EFI_D_INFO, "IdeInitCalculateMode: UdmaMode = %x\n", (*SupportedModes)->UdmaMode.Mode)); + DEBUG ((DEBUG_INFO, "IdeInitCalculateMode: UdmaMode = %x\n", (*SupportedModes)->UdmaMode.Mode)); // // The modes other than PIO and UDMA are not supported diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c index bae9764577f0..6dea6e771a29 100644 --- a/OvmfPkg/Sec/SecMain.c +++ b/OvmfPkg/Sec/SecMain.c @@ -256,7 +256,7 @@ FindFfsFileAndSection ( EFI_PHYSICAL_ADDRESS EndOfFile; if (Fv->Signature != EFI_FVH_SIGNATURE) { - DEBUG ((EFI_D_ERROR, "FV at %p does not have FV header signature\n", Fv)); + DEBUG ((DEBUG_ERROR, "FV at %p does not have FV header signature\n", Fv)); return EFI_VOLUME_CORRUPTED; } @@ -342,7 +342,7 @@ DecompressMemFvs ( (EFI_COMMON_SECTION_HEADER**) &Section ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Unable to find GUID defined section\n")); + DEBUG ((DEBUG_ERROR, "Unable to find GUID defined section\n")); return Status; } @@ -353,14 +353,14 @@ DecompressMemFvs ( &SectionAttribute ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Unable to GetInfo for GUIDed section\n")); + DEBUG ((DEBUG_ERROR, "Unable to GetInfo for GUIDed section\n")); return Status; } OutputBuffer = (VOID*) ((UINT8*)(UINTN) PcdGet32 (PcdOvmfDxeMemFvBase) + SIZE_1MB); ScratchBuffer = ALIGN_POINTER ((UINT8*) OutputBuffer + OutputBufferSize, SIZE_1MB); - DEBUG ((EFI_D_VERBOSE, "%a: OutputBuffer@%p+0x%x ScratchBuffer@%p+0x%x " + DEBUG ((DEBUG_VERBOSE, "%a: OutputBuffer@%p+0x%x ScratchBuffer@%p+0x%x " "PcdOvmfDecompressionScratchEnd=0x%x\n", __FUNCTION__, OutputBuffer, OutputBufferSize, ScratchBuffer, ScratchBufferSize, PcdGet32 (PcdOvmfDecompressionScratchEnd))); @@ -374,7 +374,7 @@ DecompressMemFvs ( &AuthenticationStatus ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Error during GUID section decode\n")); + DEBUG ((DEBUG_ERROR, "Error during GUID section decode\n")); return Status; } @@ -386,7 +386,7 @@ DecompressMemFvs ( &FvSection ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Unable to find PEI FV section\n")); + DEBUG ((DEBUG_ERROR, "Unable to find PEI FV section\n")); return Status; } @@ -398,7 +398,7 @@ DecompressMemFvs ( CopyMem (PeiMemFv, (VOID*) (FvSection + 1), PcdGet32 (PcdOvmfPeiMemFvSize)); if (PeiMemFv->Signature != EFI_FVH_SIGNATURE) { - DEBUG ((EFI_D_ERROR, "Extracted FV at %p does not have FV header signature\n", PeiMemFv)); + DEBUG ((DEBUG_ERROR, "Extracted FV at %p does not have FV header signature\n", PeiMemFv)); CpuDeadLoop (); return EFI_VOLUME_CORRUPTED; } @@ -411,7 +411,7 @@ DecompressMemFvs ( &FvSection ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Unable to find DXE FV section\n")); + DEBUG ((DEBUG_ERROR, "Unable to find DXE FV section\n")); return Status; } @@ -431,7 +431,7 @@ DecompressMemFvs ( CopyMem (DxeMemFv, (VOID*) ((UINTN)FvSection + FvHeaderSize), PcdGet32 (PcdOvmfDxeMemFvSize)); if (DxeMemFv->Signature != EFI_FVH_SIGNATURE) { - DEBUG ((EFI_D_ERROR, "Extracted FV at %p does not have FV header signature\n", DxeMemFv)); + DEBUG ((DEBUG_ERROR, "Extracted FV at %p does not have FV header signature\n", DxeMemFv)); CpuDeadLoop (); return EFI_VOLUME_CORRUPTED; } @@ -474,7 +474,7 @@ FindPeiCoreImageBaseInFv ( &Section ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "Unable to find PEI Core image\n")); + DEBUG ((DEBUG_ERROR, "Unable to find PEI Core image\n")); return Status; } } @@ -554,14 +554,14 @@ FindPeiCoreImageBase ( // A malicious runtime OS may have injected something into our previously // decoded PEI FV, but we don't care about that unless SMM/SMRAM is required. // - DEBUG ((EFI_D_VERBOSE, "SEC: S3 resume\n")); + DEBUG ((DEBUG_VERBOSE, "SEC: S3 resume\n")); GetS3ResumePeiFv (BootFv); } else { // // We're either not resuming, or resuming "securely" -- we'll decompress // both PEI FV and DXE FV from pristine flash. // - DEBUG ((EFI_D_VERBOSE, "SEC: %a\n", + DEBUG ((DEBUG_VERBOSE, "SEC: %a\n", S3Resume ? "S3 resume (with PEI decompression)" : "Normal boot")); FindMainFv (BootFv); @@ -739,7 +739,7 @@ SecCoreStartupWithStack ( ProcessLibraryConstructorList (NULL, NULL); - DEBUG ((EFI_D_INFO, + DEBUG ((DEBUG_INFO, "SecCoreStartupWithStack(0x%x, 0x%x)\n", (UINT32)(UINTN)BootFv, (UINT32)(UINTN)TopOfCurrentStack @@ -882,7 +882,7 @@ TemporaryRamMigration ( BOOLEAN OldStatus; BASE_LIBRARY_JUMP_BUFFER JumpBuffer; - DEBUG ((EFI_D_INFO, + DEBUG ((DEBUG_INFO, "TemporaryRamMigration(0x%Lx, 0x%Lx, 0x%Lx)\n", TemporaryMemoryBase, PermanentMemoryBase, diff --git a/OvmfPkg/SmmAccess/SmmAccessPei.c b/OvmfPkg/SmmAccess/SmmAccessPei.c index c8bbc17e907a..ec4e9a276195 100644 --- a/OvmfPkg/SmmAccess/SmmAccessPei.c +++ b/OvmfPkg/SmmAccess/SmmAccessPei.c @@ -258,7 +258,7 @@ SmmAccessPeiEntryPoint ( // HostBridgeDevId = PciRead16 (OVMF_HOSTBRIDGE_DID); if (HostBridgeDevId != INTEL_Q35_MCH_DEVICE_ID) { - DEBUG ((EFI_D_ERROR, "%a: no SMRAM with host bridge DID=0x%04x; only " + DEBUG ((DEBUG_ERROR, "%a: no SMRAM with host bridge DID=0x%04x; only " "DID=0x%04x (Q35) is supported\n", __FUNCTION__, HostBridgeDevId, INTEL_Q35_MCH_DEVICE_ID)); goto WrongConfig; @@ -274,7 +274,7 @@ SmmAccessPeiEntryPoint ( EsmramcVal = PciRead8 (DRAMC_REGISTER_Q35 (MCH_ESMRAMC)); RegMask8 = MCH_ESMRAMC_SM_CACHE | MCH_ESMRAMC_SM_L1 | MCH_ESMRAMC_SM_L2; if ((EsmramcVal & RegMask8) != RegMask8) { - DEBUG ((EFI_D_ERROR, "%a: this Q35 implementation lacks SMRAM\n", + DEBUG ((DEBUG_ERROR, "%a: this Q35 implementation lacks SMRAM\n", __FUNCTION__)); goto WrongConfig; } @@ -351,12 +351,12 @@ SmmAccessPeiEntryPoint ( UINTN Idx; Count = SmramMapSize / sizeof SmramMap[0]; - DEBUG ((EFI_D_VERBOSE, "%a: SMRAM map follows, %d entries\n", __FUNCTION__, + DEBUG ((DEBUG_VERBOSE, "%a: SMRAM map follows, %d entries\n", __FUNCTION__, (INT32)Count)); - DEBUG ((EFI_D_VERBOSE, "% 20a % 20a % 20a % 20a\n", "PhysicalStart(0x)", + DEBUG ((DEBUG_VERBOSE, "% 20a % 20a % 20a % 20a\n", "PhysicalStart(0x)", "PhysicalSize(0x)", "CpuStart(0x)", "RegionState(0x)")); for (Idx = 0; Idx < Count; ++Idx) { - DEBUG ((EFI_D_VERBOSE, "% 20Lx % 20Lx % 20Lx % 20Lx\n", + DEBUG ((DEBUG_VERBOSE, "% 20Lx % 20Lx % 20Lx % 20Lx\n", SmramMap[Idx].PhysicalStart, SmramMap[Idx].PhysicalSize, SmramMap[Idx].CpuStart, SmramMap[Idx].RegionState)); } diff --git a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c b/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c index f8940e4d9b54..9547c202880f 100644 --- a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c +++ b/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c @@ -204,7 +204,7 @@ SmmControl2DxeEntryPoint ( // SmiEnableVal = IoRead32 (mSmiEnable); if ((SmiEnableVal & ICH9_SMI_EN_APMC_EN) != 0) { - DEBUG ((EFI_D_ERROR, "%a: this Q35 implementation lacks SMI\n", + DEBUG ((DEBUG_ERROR, "%a: this Q35 implementation lacks SMI\n", __FUNCTION__)); goto FatalError; } @@ -228,7 +228,7 @@ SmmControl2DxeEntryPoint ( // IoWrite32 (mSmiEnable, SmiEnableVal & ~(UINT32)ICH9_SMI_EN_GBL_SMI_EN); if (IoRead32 (mSmiEnable) != SmiEnableVal) { - DEBUG ((EFI_D_ERROR, "%a: failed to lock down GBL_SMI_EN\n", + DEBUG ((DEBUG_ERROR, "%a: failed to lock down GBL_SMI_EN\n", __FUNCTION__)); goto FatalError; } @@ -250,14 +250,14 @@ SmmControl2DxeEntryPoint ( OnS3SaveStateInstalled, NULL /* Context */, &mS3SaveStateInstalled); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "%a: CreateEvent: %r\n", __FUNCTION__, Status)); + DEBUG ((DEBUG_ERROR, "%a: CreateEvent: %r\n", __FUNCTION__, Status)); goto FatalError; } Status = gBS->RegisterProtocolNotify (&gEfiS3SaveStateProtocolGuid, mS3SaveStateInstalled, &Registration); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "%a: RegisterProtocolNotify: %r\n", __FUNCTION__, + DEBUG ((DEBUG_ERROR, "%a: RegisterProtocolNotify: %r\n", __FUNCTION__, Status)); goto ReleaseEvent; } @@ -267,7 +267,7 @@ SmmControl2DxeEntryPoint ( // Status = gBS->SignalEvent (mS3SaveStateInstalled); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "%a: SignalEvent: %r\n", __FUNCTION__, Status)); + DEBUG ((DEBUG_ERROR, "%a: SignalEvent: %r\n", __FUNCTION__, Status)); goto ReleaseEvent; } } @@ -280,7 +280,7 @@ SmmControl2DxeEntryPoint ( &gEfiSmmControl2ProtocolGuid, &mControl2, NULL); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "%a: InstallMultipleProtocolInterfaces: %r\n", + DEBUG ((DEBUG_ERROR, "%a: InstallMultipleProtocolInterfaces: %r\n", __FUNCTION__, Status)); goto ReleaseEvent; } @@ -346,7 +346,7 @@ OnS3SaveStateInstalled ( &SmiEnAndMask ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "%a: EFI_BOOT_SCRIPT_IO_READ_WRITE_OPCODE: %r\n", + DEBUG ((DEBUG_ERROR, "%a: EFI_BOOT_SCRIPT_IO_READ_WRITE_OPCODE: %r\n", __FUNCTION__, Status)); ASSERT (FALSE); CpuDeadLoop (); @@ -365,7 +365,7 @@ OnS3SaveStateInstalled ( &GenPmCon1AndMask ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "%a: EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE_OPCODE: %r\n", __FUNCTION__, Status)); ASSERT (FALSE); diff --git a/OvmfPkg/VirtioGpuDxe/Commands.c b/OvmfPkg/VirtioGpuDxe/Commands.c index 8fb6cad52dc7..1645100a05d5 100644 --- a/OvmfPkg/VirtioGpuDxe/Commands.c +++ b/OvmfPkg/VirtioGpuDxe/Commands.c @@ -389,7 +389,7 @@ VirtioGpuExitBoot ( @retval EFI_SUCCESS Operation successful. @retval EFI_DEVICE_ERROR The host rejected the request. The host error - code has been logged on the EFI_D_ERROR level. + code has been logged on the DEBUG_ERROR level. @return Codes for unexpected errors in VirtIo messaging, or request/response @@ -489,7 +489,7 @@ VirtioGpuSendCommand ( // Verify response size. // if (ResponseSize != sizeof Response) { - DEBUG ((EFI_D_ERROR, "%a: malformed response to Request=0x%x\n", + DEBUG ((DEBUG_ERROR, "%a: malformed response to Request=0x%x\n", __FUNCTION__, (UINT32)RequestType)); Status = EFI_PROTOCOL_ERROR; goto UnmapResponse; @@ -516,7 +516,7 @@ VirtioGpuSendCommand ( return EFI_SUCCESS; } - DEBUG ((EFI_D_ERROR, "%a: Request=0x%x Response=0x%x\n", __FUNCTION__, + DEBUG ((DEBUG_ERROR, "%a: Request=0x%x Response=0x%x\n", __FUNCTION__, (UINT32)RequestType, Response.Type)); return EFI_DEVICE_ERROR; @@ -546,7 +546,7 @@ VirtioGpuSendCommand ( @retval EFI_SUCCESS Operation successful. @retval EFI_DEVICE_ERROR The host rejected the request. The host error - code has been logged on the EFI_D_ERROR level. + code has been logged on the DEBUG_ERROR level. @return Codes for unexpected errors in VirtIo messaging. diff --git a/OvmfPkg/VirtioGpuDxe/DriverBinding.c b/OvmfPkg/VirtioGpuDxe/DriverBinding.c index bf53a9306f52..666d57754732 100644 --- a/OvmfPkg/VirtioGpuDxe/DriverBinding.c +++ b/OvmfPkg/VirtioGpuDxe/DriverBinding.c @@ -651,7 +651,7 @@ VirtioGpuDriverBindingStart ( // // No child handle should be produced; we're done. // - DEBUG ((EFI_D_INFO, "%a: bound VirtIo=%p without producing GOP\n", + DEBUG ((DEBUG_INFO, "%a: bound VirtIo=%p without producing GOP\n", __FUNCTION__, (VOID *)VgpuDev->VirtIo)); return EFI_SUCCESS; } @@ -674,7 +674,7 @@ VirtioGpuDriverBindingStart ( // // We're done. // - DEBUG ((EFI_D_INFO, "%a: produced GOP %a VirtIo=%p\n", __FUNCTION__, + DEBUG ((DEBUG_INFO, "%a: produced GOP %a VirtIo=%p\n", __FUNCTION__, VirtIoBoundJustNow ? "while binding" : "for pre-bound", (VOID *)VgpuDev->VirtIo)); return EFI_SUCCESS; @@ -756,7 +756,7 @@ VirtioGpuDriverBindingStop ( break; } - DEBUG ((EFI_D_INFO, "%a: unbinding GOP-less VirtIo=%p\n", __FUNCTION__, + DEBUG ((DEBUG_INFO, "%a: unbinding GOP-less VirtIo=%p\n", __FUNCTION__, (VOID *)VgpuDev->VirtIo)); Status = gBS->UninstallProtocolInterface (ControllerHandle, @@ -797,7 +797,7 @@ VirtioGpuDriverBindingStop ( VgpuDev->Child->GopHandle, &gVirtioDeviceProtocolGuid)); - DEBUG ((EFI_D_INFO, "%a: destroying GOP under VirtIo=%p\n", __FUNCTION__, + DEBUG ((DEBUG_INFO, "%a: destroying GOP under VirtIo=%p\n", __FUNCTION__, (VOID *)VgpuDev->VirtIo)); UninitVgpuGop (VgpuDev, ControllerHandle, This->DriverBindingHandle); break; diff --git a/OvmfPkg/VirtioGpuDxe/VirtioGpu.h b/OvmfPkg/VirtioGpuDxe/VirtioGpu.h index c32052d83a82..236cc4789237 100644 --- a/OvmfPkg/VirtioGpuDxe/VirtioGpu.h +++ b/OvmfPkg/VirtioGpuDxe/VirtioGpu.h @@ -295,7 +295,7 @@ VirtioGpuExitBoot ( @retval EFI_SUCCESS Operation successful. @retval EFI_DEVICE_ERROR The host rejected the request. The host error - code has been logged on the EFI_D_ERROR level. + code has been logged on the DEBUG_ERROR level. @return Codes for unexpected errors in VirtIo messaging. diff --git a/OvmfPkg/XenBusDxe/EventChannel.c b/OvmfPkg/XenBusDxe/EventChannel.c index 690007178288..6c905b511f80 100644 --- a/OvmfPkg/XenBusDxe/EventChannel.c +++ b/OvmfPkg/XenBusDxe/EventChannel.c @@ -44,7 +44,7 @@ XenBusEventChannelAllocate ( EVTCHNOP_alloc_unbound, &Parameter); if (ReturnCode != 0) { - DEBUG ((EFI_D_ERROR, "ERROR: alloc_unbound failed with rc=%d", ReturnCode)); + DEBUG ((DEBUG_ERROR, "ERROR: alloc_unbound failed with rc=%d", ReturnCode)); return ReturnCode; } *Port = Parameter.port; diff --git a/OvmfPkg/XenBusDxe/GrantTable.c b/OvmfPkg/XenBusDxe/GrantTable.c index 1130404cd198..58d687abad6b 100644 --- a/OvmfPkg/XenBusDxe/GrantTable.c +++ b/OvmfPkg/XenBusDxe/GrantTable.c @@ -107,7 +107,7 @@ XenGrantTableEndAccess ( OldFlags = GrantTable[Ref].flags; do { if ((Flags = OldFlags) & (GTF_reading | GTF_writing)) { - DEBUG ((EFI_D_WARN, "WARNING: g.e. still in use! (%x)\n", Flags)); + DEBUG ((DEBUG_WARN, "WARNING: g.e. still in use! (%x)\n", Flags)); return EFI_NOT_READY; } OldFlags = InterlockedCompareExchange16 (&GrantTable[Ref].flags, Flags, 0); @@ -142,7 +142,7 @@ XenGrantTableInit ( Parameters.gpfn = (xen_pfn_t) ((UINTN) GrantTable >> EFI_PAGE_SHIFT) + Index; ReturnCode = XenHypercallMemoryOp (XENMEM_add_to_physmap, &Parameters); if (ReturnCode != 0) { - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "Xen GrantTable, add_to_physmap hypercall error: %Ld\n", (INT64)ReturnCode)); } @@ -164,11 +164,11 @@ XenGrantTableDeinit ( for (Index = NR_GRANT_FRAMES - 1; Index >= 0; Index--) { Parameters.domid = DOMID_SELF; Parameters.gpfn = (xen_pfn_t) ((UINTN) GrantTable >> EFI_PAGE_SHIFT) + Index; - DEBUG ((EFI_D_INFO, "Xen GrantTable, removing %Lx\n", + DEBUG ((DEBUG_INFO, "Xen GrantTable, removing %Lx\n", (UINT64)Parameters.gpfn)); ReturnCode = XenHypercallMemoryOp (XENMEM_remove_from_physmap, &Parameters); if (ReturnCode != 0) { - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "Xen GrantTable, remove_from_physmap hypercall error: %Ld\n", (INT64)ReturnCode)); } diff --git a/OvmfPkg/XenBusDxe/XenBus.c b/OvmfPkg/XenBusDxe/XenBus.c index a203beaaa7e7..f8a41b6d3632 100644 --- a/OvmfPkg/XenBusDxe/XenBus.c +++ b/OvmfPkg/XenBusDxe/XenBus.c @@ -148,7 +148,7 @@ XenBusAddDevice ( * happen if a device is going away after * switching to Closed. */ - DEBUG ((EFI_D_INFO, "XenBus: Device %a ignored. " + DEBUG ((DEBUG_INFO, "XenBus: Device %a ignored. " "State %d\n", DevicePath, State)); Status = EFI_SUCCESS; goto out; @@ -157,7 +157,7 @@ XenBusAddDevice ( StatusXenStore = XenStoreRead (XST_NIL, DevicePath, "backend", NULL, (VOID **) &BackendPath); if (StatusXenStore != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_ERROR, "xenbus: %a no backend path.\n", DevicePath)); + DEBUG ((DEBUG_ERROR, "xenbus: %a no backend path.\n", DevicePath)); Status = EFI_NOT_FOUND; goto out; } @@ -197,12 +197,12 @@ XenBusAddDevice ( Private->Handle, EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "open by child controller fail (%r)\n", + DEBUG ((DEBUG_ERROR, "open by child controller fail (%r)\n", Status)); goto ErrorOpenProtocolByChild; } } else { - DEBUG ((EFI_D_ERROR, "XenBus: does not exist: %a\n", DevicePath)); + DEBUG ((DEBUG_ERROR, "XenBus: does not exist: %a\n", DevicePath)); Status = EFI_NOT_FOUND; } @@ -312,7 +312,7 @@ XenBusSetState ( XENSTORE_STATUS Status; CHAR8 *Temp; - DEBUG ((EFI_D_INFO, "XenBus: Set state to %d\n", NewState)); + DEBUG ((DEBUG_INFO, "XenBus: Set state to %d\n", NewState)); Status = XenStoreRead (Transaction, This->Node, "state", NULL, (VOID **)&Temp); if (Status != XENSTORE_STATUS_SUCCESS) { @@ -328,10 +328,10 @@ XenBusSetState ( Status = XenStoreSPrint (Transaction, This->Node, "state", "%d", NewState); } while (Status == XENSTORE_STATUS_EAGAIN); if (Status != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_ERROR, "XenBus: failed to write new state\n")); + DEBUG ((DEBUG_ERROR, "XenBus: failed to write new state\n")); goto Out; } - DEBUG ((EFI_D_INFO, "XenBus: Set state to %d, done\n", NewState)); + DEBUG ((DEBUG_INFO, "XenBus: Set state to %d, done\n", NewState)); Out: return Status; diff --git a/OvmfPkg/XenBusDxe/XenBusDxe.c b/OvmfPkg/XenBusDxe/XenBusDxe.c index c47fad2e80bb..1f5628ad8342 100644 --- a/OvmfPkg/XenBusDxe/XenBusDxe.c +++ b/OvmfPkg/XenBusDxe/XenBusDxe.c @@ -362,7 +362,7 @@ XenBusDxeDriverBindingStart ( Status = XenGetSharedInfoPage (Dev); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "XenBus: Unable to get the shared info page.\n")); + DEBUG ((DEBUG_ERROR, "XenBus: Unable to get the shared info page.\n")); Status = EFI_UNSUPPORTED; goto ErrorAllocated; } @@ -442,7 +442,7 @@ XenBusDxeDriverBindingStop ( ControllerHandle, EFI_OPEN_PROTOCOL_GET_PROTOCOL); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "XenBusDxe: get children protocol failed: %r\n", Status)); + DEBUG ((DEBUG_ERROR, "XenBusDxe: get children protocol failed: %r\n", Status)); continue; } ChildData = XENBUS_PRIVATE_DATA_FROM_THIS (XenBusIo); diff --git a/OvmfPkg/XenBusDxe/XenStore.c b/OvmfPkg/XenBusDxe/XenStore.c index 41fcb390888c..e5cca108e06b 100644 --- a/OvmfPkg/XenBusDxe/XenStore.c +++ b/OvmfPkg/XenBusDxe/XenStore.c @@ -467,7 +467,7 @@ XenStoreWriteStore ( Status = XenStoreWaitForEvent (xs.EventChannelEvent, EFI_TIMER_PERIOD_SECONDS (1)); if (Status == EFI_TIMEOUT) { - DEBUG ((EFI_D_WARN, "XenStore Write, waiting for a ring event.\n")); + DEBUG ((DEBUG_WARN, "XenStore Write, waiting for a ring event.\n")); } continue; } @@ -546,7 +546,7 @@ XenStoreReadStore ( Status = XenStoreWaitForEvent (xs.EventChannelEvent, EFI_TIMER_PERIOD_SECONDS (1)); if (Status == EFI_TIMEOUT) { - DEBUG ((EFI_D_WARN, "XenStore Read, waiting for a ring event.\n")); + DEBUG ((DEBUG_WARN, "XenStore Read, waiting for a ring event.\n")); } continue; } @@ -617,7 +617,7 @@ XenStoreProcessMessage ( Status = XenStoreReadStore (&Message->Header, sizeof (Message->Header)); if (Status != XENSTORE_STATUS_SUCCESS) { FreePool (Message); - DEBUG ((EFI_D_ERROR, "XenStore: Error read store (%d)\n", Status)); + DEBUG ((DEBUG_ERROR, "XenStore: Error read store (%d)\n", Status)); return Status; } @@ -626,7 +626,7 @@ XenStoreProcessMessage ( if (Status != XENSTORE_STATUS_SUCCESS) { FreePool (Body); FreePool (Message); - DEBUG ((EFI_D_ERROR, "XenStore: Error read store (%d)\n", Status)); + DEBUG ((DEBUG_ERROR, "XenStore: Error read store (%d)\n", Status)); return Status; } Body[Message->Header.len] = '\0'; @@ -638,14 +638,14 @@ XenStoreProcessMessage ( EfiAcquireLock (&xs.RegisteredWatchesLock); Message->u.Watch.Handle = XenStoreFindWatch (Message->u.Watch.Vector[XS_WATCH_TOKEN]); - DEBUG ((EFI_D_INFO, "XenStore: Watch event %a\n", + DEBUG ((DEBUG_INFO, "XenStore: Watch event %a\n", Message->u.Watch.Vector[XS_WATCH_TOKEN])); if (Message->u.Watch.Handle != NULL) { EfiAcquireLock (&xs.WatchEventsLock); InsertHeadList (&xs.WatchEvents, &Message->Link); EfiReleaseLock (&xs.WatchEventsLock); } else { - DEBUG ((EFI_D_WARN, "XenStore: Watch handle %a not found\n", + DEBUG ((DEBUG_WARN, "XenStore: Watch handle %a not found\n", Message->u.Watch.Vector[XS_WATCH_TOKEN])); FreePool((VOID*)Message->u.Watch.Vector); FreePool(Message); @@ -711,7 +711,7 @@ XenStoreGetError ( return gXenStoreErrors[Index].Status; } } - DEBUG ((EFI_D_WARN, "XenStore gave unknown error %a\n", ErrorStr)); + DEBUG ((DEBUG_WARN, "XenStore gave unknown error %a\n", ErrorStr)); return XENSTORE_STATUS_EINVAL; } @@ -738,7 +738,7 @@ XenStoreReadReply ( XENSTORE_STATUS Status; Status = XenStoreProcessMessage (); if (Status != XENSTORE_STATUS_SUCCESS && Status != XENSTORE_STATUS_EAGAIN) { - DEBUG ((EFI_D_ERROR, "XenStore, error while reading the ring (%d).", + DEBUG ((DEBUG_ERROR, "XenStore, error while reading the ring (%d).", Status)); return Status; } @@ -803,14 +803,14 @@ XenStoreTalkv ( Status = XenStoreWriteStore (&Message, sizeof (Message)); if (Status != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_ERROR, "XenStoreTalkv failed %d\n", Status)); + DEBUG ((DEBUG_ERROR, "XenStoreTalkv failed %d\n", Status)); goto Error; } for (Index = 0; Index < NumRequests; Index++) { Status = XenStoreWriteStore (WriteRequest[Index].Data, WriteRequest[Index].Len); if (Status != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_ERROR, "XenStoreTalkv failed %d\n", Status)); + DEBUG ((DEBUG_ERROR, "XenStoreTalkv failed %d\n", Status)); goto Error; } } @@ -1006,7 +1006,7 @@ XenStoreInitComms ( while (XenStore->rsp_prod != XenStore->rsp_cons) { Status = gBS->CheckEvent (TimerEvent); if (!EFI_ERROR (Status)) { - DEBUG ((EFI_D_WARN, "XENSTORE response ring is not quiescent " + DEBUG ((DEBUG_WARN, "XENSTORE response ring is not quiescent " "(%08x:%08x): fixing up\n", XenStore->rsp_cons, XenStore->rsp_prod)); XenStore->rsp_cons = XenStore->rsp_prod; @@ -1046,7 +1046,7 @@ XenStoreInit ( xs.EventChannel = (evtchn_port_t)XenHypercallHvmGetParam (HVM_PARAM_STORE_EVTCHN); XenStoreGpfn = (UINTN)XenHypercallHvmGetParam (HVM_PARAM_STORE_PFN); xs.XenStore = (VOID *) (XenStoreGpfn << EFI_PAGE_SHIFT); - DEBUG ((EFI_D_INFO, "XenBusInit: XenBus rings @%p, event channel %x\n", + DEBUG ((DEBUG_INFO, "XenBusInit: XenBus rings @%p, event channel %x\n", xs.XenStore, xs.EventChannel)); InitializeListHead (&xs.ReplyList); @@ -1076,7 +1076,7 @@ XenStoreDeinit ( if (!IsListEmpty (&xs.RegisteredWatches)) { XENSTORE_WATCH *Watch; LIST_ENTRY *Entry; - DEBUG ((EFI_D_WARN, "XenStore: RegisteredWatches is not empty, cleaning up...")); + DEBUG ((DEBUG_WARN, "XenStore: RegisteredWatches is not empty, cleaning up...")); Entry = GetFirstNode (&xs.RegisteredWatches); while (!IsNull (&xs.RegisteredWatches, Entry)) { Watch = XENSTORE_WATCH_FROM_LINK (Entry); @@ -1092,7 +1092,7 @@ XenStoreDeinit ( // if (!IsListEmpty (&xs.WatchEvents)) { LIST_ENTRY *Entry; - DEBUG ((EFI_D_WARN, "XenStore: WatchEvents is not empty, cleaning up...")); + DEBUG ((DEBUG_WARN, "XenStore: WatchEvents is not empty, cleaning up...")); Entry = GetFirstNode (&xs.WatchEvents); while (!IsNull (&xs.WatchEvents, Entry)) { XENSTORE_MESSAGE *Message = XENSTORE_MESSAGE_FROM_LINK (Entry); diff --git a/OvmfPkg/XenIoPciDxe/XenIoPciDxe.c b/OvmfPkg/XenIoPciDxe/XenIoPciDxe.c index 5e7bd94b8951..0b3fd03e08d3 100644 --- a/OvmfPkg/XenIoPciDxe/XenIoPciDxe.c +++ b/OvmfPkg/XenIoPciDxe/XenIoPciDxe.c @@ -175,7 +175,7 @@ XenIoPciDeviceBindingStart ( ASSERT (BarDesc->ResType == ACPI_ADDRESS_SPACE_TYPE_MEM); /* Get a Memory address for mapping the Grant Table. */ - DEBUG ((EFI_D_INFO, "XenIoPci: BAR at %LX\n", BarDesc->AddrRangeMin)); + DEBUG ((DEBUG_INFO, "XenIoPci: BAR at %LX\n", BarDesc->AddrRangeMin)); XenIo->GrantTableAddress = BarDesc->AddrRangeMin; FreePool (BarDesc); diff --git a/OvmfPkg/XenPvBlkDxe/BlockFront.c b/OvmfPkg/XenPvBlkDxe/BlockFront.c index f57f85731568..122a6baed25a 100644 --- a/OvmfPkg/XenPvBlkDxe/BlockFront.c +++ b/OvmfPkg/XenPvBlkDxe/BlockFront.c @@ -123,7 +123,7 @@ XenPvBlkWaitForBackendState ( Status = XENSTORE_STATUS_FAIL; break; } - DEBUG ((EFI_D_INFO, + DEBUG ((DEBUG_INFO, "XenPvBlk: waiting backend state %d, current: %d\n", ExpectedState, State)); XenBusIo->WaitForWatch (XenBusIo, Dev->StateWatchToken); @@ -171,12 +171,12 @@ XenPvBlockFrontInitialization ( if (Dev->MediaInfo.CdRom) { Status = XenBusIo->XsBackendRead (XenBusIo, XST_NIL, "params", (VOID**)&Params); if (Status != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_ERROR, "%a: Failed to read params (%d)\n", __FUNCTION__, Status)); + DEBUG ((DEBUG_ERROR, "%a: Failed to read params (%d)\n", __FUNCTION__, Status)); goto Error; } if (AsciiStrLen (Params) == 0 || AsciiStrCmp (Params, "aio:") == 0) { FreePool (Params); - DEBUG ((EFI_D_INFO, "%a: Empty cdrom\n", __FUNCTION__)); + DEBUG ((DEBUG_INFO, "%a: Empty cdrom\n", __FUNCTION__)); goto Error; } FreePool (Params); @@ -184,7 +184,7 @@ XenPvBlockFrontInitialization ( Status = XenBusReadUint64 (XenBusIo, "backend-id", FALSE, &Value); if (Status != XENSTORE_STATUS_SUCCESS || Value > MAX_UINT16) { - DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to get backend-id (%d)\n", + DEBUG ((DEBUG_ERROR, "XenPvBlk: Failed to get backend-id (%d)\n", Status)); goto Error; } @@ -203,32 +203,32 @@ XenPvBlockFrontInitialization ( Again: Status = XenBusIo->XsTransactionStart (XenBusIo, &Transaction); if (Status != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_WARN, "XenPvBlk: Failed to start transaction, %d\n", Status)); + DEBUG ((DEBUG_WARN, "XenPvBlk: Failed to start transaction, %d\n", Status)); goto Error; } Status = XenBusIo->XsPrintf (XenBusIo, &Transaction, NodeName, "ring-ref", "%d", Dev->RingRef); if (Status != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to write ring-ref.\n")); + DEBUG ((DEBUG_ERROR, "XenPvBlk: Failed to write ring-ref.\n")); goto AbortTransaction; } Status = XenBusIo->XsPrintf (XenBusIo, &Transaction, NodeName, "event-channel", "%d", Dev->EventChannel); if (Status != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to write event-channel.\n")); + DEBUG ((DEBUG_ERROR, "XenPvBlk: Failed to write event-channel.\n")); goto AbortTransaction; } Status = XenBusIo->XsPrintf (XenBusIo, &Transaction, NodeName, "protocol", "%a", XEN_IO_PROTO_ABI_NATIVE); if (Status != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to write protocol.\n")); + DEBUG ((DEBUG_ERROR, "XenPvBlk: Failed to write protocol.\n")); goto AbortTransaction; } Status = XenBusIo->SetState (XenBusIo, &Transaction, XenbusStateConnected); if (Status != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to switch state.\n")); + DEBUG ((DEBUG_ERROR, "XenPvBlk: Failed to switch state.\n")); goto AbortTransaction; } @@ -244,7 +244,7 @@ XenPvBlockFrontInitialization ( // Status = XenPvBlkWaitForBackendState (Dev, XenbusStateConnected, &State); if (Status != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "XenPvBlk: backend for %a/%d not available, rc=%d state=%d\n", XenBusIo->Type, XenBusIo->DeviceId, Status, State)); goto Error2; @@ -274,7 +274,7 @@ XenPvBlockFrontInitialization ( // // This is not supported by the driver. // - DEBUG ((EFI_D_ERROR, "XenPvBlk: Unsupported sector-size value %Lu, " + DEBUG ((DEBUG_ERROR, "XenPvBlk: Unsupported sector-size value %Lu, " "it must be a multiple of 512\n", Value)); goto Error2; } @@ -298,7 +298,7 @@ XenPvBlockFrontInitialization ( Dev->MediaInfo.FeatureFlushCache = FALSE; } - DEBUG ((EFI_D_INFO, "XenPvBlk: New disk with %ld sectors of %d bytes\n", + DEBUG ((DEBUG_INFO, "XenPvBlk: New disk with %ld sectors of %d bytes\n", Dev->MediaInfo.Sectors, Dev->MediaInfo.SectorSize)); *DevPtr = Dev; @@ -330,7 +330,7 @@ XenPvBlockFrontShutdown ( Status = XenBusIo->SetState (XenBusIo, XST_NIL, XenbusStateClosing); if (Status != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "XenPvBlk: error while changing state to Closing: %d\n", Status)); goto Close; @@ -338,7 +338,7 @@ XenPvBlockFrontShutdown ( Status = XenPvBlkWaitForBackendState (Dev, XenbusStateClosing, NULL); if (Status != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "XenPvBlk: error while waiting for closing backend state: %d\n", Status)); goto Close; @@ -346,7 +346,7 @@ XenPvBlockFrontShutdown ( Status = XenBusIo->SetState (XenBusIo, XST_NIL, XenbusStateClosed); if (Status != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "XenPvBlk: error while changing state to Closed: %d\n", Status)); goto Close; @@ -354,7 +354,7 @@ XenPvBlockFrontShutdown ( Status = XenPvBlkWaitForBackendState (Dev, XenbusStateClosed, NULL); if (Status != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "XenPvBlk: error while waiting for closed backend state: %d\n", Status)); goto Close; @@ -362,7 +362,7 @@ XenPvBlockFrontShutdown ( Status = XenBusIo->SetState (XenBusIo, XST_NIL, XenbusStateInitialising); if (Status != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "XenPvBlk: error while changing state to initialising: %d\n", Status)); goto Close; @@ -371,7 +371,7 @@ XenPvBlockFrontShutdown ( while (TRUE) { Status = XenBusReadUint64 (XenBusIo, "state", TRUE, &Value); if (Status != XENSTORE_STATUS_SUCCESS) { - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "XenPvBlk: error while waiting for new backend state: %d\n", Status)); goto Close; @@ -379,7 +379,7 @@ XenPvBlockFrontShutdown ( if (Value <= XenbusStateInitWait || Value >= XenbusStateClosed) { break; } - DEBUG ((EFI_D_INFO, + DEBUG ((DEBUG_INFO, "XenPvBlk: waiting backend state %d, current: %Lu\n", XenbusStateInitWait, Value)); XenBusIo->WaitForWatch (XenBusIo, Dev->StateWatchToken); @@ -473,7 +473,7 @@ XenPvBlockAsyncIo ( UINT32 ReturnCode; ReturnCode = XenBusIo->EventChannelNotify (XenBusIo, Dev->EventChannel); if (ReturnCode != 0) { - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "XenPvBlk: Unexpected return value from EventChannelNotify: %d\n", ReturnCode)); } @@ -528,7 +528,7 @@ XenPvBlockPushOperation ( UINT32 ReturnCode; ReturnCode = XenBusIo->EventChannelNotify (XenBusIo, Dev->EventChannel); if (ReturnCode != 0) { - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "XenPvBlk: Unexpected return value from EventChannelNotify: %d\n", ReturnCode)); } @@ -590,7 +590,7 @@ XenPvBlockAsyncIoPoll ( INT32 Index; if (Status != BLKIF_RSP_OKAY) { - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "XenPvBlk: " "%a error %d on %a at sector %Lx, num bytes %Lx\n", Response->operation == BLKIF_OP_READ ? "read" : "write", @@ -608,17 +608,17 @@ XenPvBlockAsyncIoPoll ( case BLKIF_OP_WRITE_BARRIER: if (Status != BLKIF_RSP_OKAY) { - DEBUG ((EFI_D_ERROR, "XenPvBlk: write barrier error %d\n", Status)); + DEBUG ((DEBUG_ERROR, "XenPvBlk: write barrier error %d\n", Status)); } break; case BLKIF_OP_FLUSH_DISKCACHE: if (Status != BLKIF_RSP_OKAY) { - DEBUG ((EFI_D_ERROR, "XenPvBlk: flush error %d\n", Status)); + DEBUG ((DEBUG_ERROR, "XenPvBlk: flush error %d\n", Status)); } break; default: - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "XenPvBlk: unrecognized block operation %d response (status %d)\n", Response->operation, Status)); break; diff --git a/OvmfPkg/XenPvBlkDxe/BlockIo.c b/OvmfPkg/XenPvBlkDxe/BlockIo.c index b3a527e4e303..c013fc80f012 100644 --- a/OvmfPkg/XenPvBlkDxe/BlockIo.c +++ b/OvmfPkg/XenPvBlkDxe/BlockIo.c @@ -89,14 +89,14 @@ XenPvBlkDxeBlockIoReadWriteBlocks ( } if (BufferSize % Media->BlockSize != 0) { - DEBUG ((EFI_D_ERROR, "XenPvBlkDxe: Bad buffer size: 0x%Lx\n", + DEBUG ((DEBUG_ERROR, "XenPvBlkDxe: Bad buffer size: 0x%Lx\n", (UINT64)BufferSize)); return EFI_BAD_BUFFER_SIZE; } if (Lba > Media->LastBlock || (BufferSize / Media->BlockSize) - 1 > Media->LastBlock - Lba) { - DEBUG ((EFI_D_ERROR, + DEBUG ((DEBUG_ERROR, "XenPvBlkDxe: %a with invalid LBA: 0x%Lx, size: 0x%Lx\n", IsWrite ? "Write" : "Read", Lba, (UINT64)BufferSize)); return EFI_INVALID_PARAMETER; @@ -150,7 +150,7 @@ XenPvBlkDxeBlockIoReadWriteBlocks ( Sector += IoData.Size / 512; Status = XenPvBlockIo (&IoData, IsWrite); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "XenPvBlkDxe: Error during %a operation.\n", + DEBUG ((DEBUG_ERROR, "XenPvBlkDxe: Error during %a operation.\n", IsWrite ? "write" : "read")); return Status; } diff --git a/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.c b/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.c index 779a7f630c03..1440e1d23b66 100644 --- a/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.c +++ b/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.c @@ -304,7 +304,7 @@ XenPvBlkDxeDriverBindingStart ( NULL ); if (EFI_ERROR (Status)) { - DEBUG ((EFI_D_ERROR, "XenPvBlk: install protocol fail: %r\n", Status)); + DEBUG ((DEBUG_ERROR, "XenPvBlk: install protocol fail: %r\n", Status)); goto UninitBlockFront; } -- 2.25.1