From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out03.mta.xmission.com (out03.mta.xmission.com [166.70.13.233]) by mx.groups.io with SMTP id smtpd.web10.1394.1587766655739056380 for ; Fri, 24 Apr 2020 15:17:35 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: bsdio.com, ip: 166.70.13.233, mailfrom: rebecca@bsdio.com) Received: from in02.mta.xmission.com ([166.70.13.52]) by out03.mta.xmission.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jS6dZ-0002mf-8P; Fri, 24 Apr 2020 16:17:33 -0600 Received: from mta3.zcs.xmission.com ([166.70.13.67]) by in02.mta.xmission.com with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.87) (envelope-from ) id 1jS6dL-000531-L5; Fri, 24 Apr 2020 16:17:33 -0600 Received: from localhost (localhost [127.0.0.1]) by mta3.zcs.xmission.com (Postfix) with ESMTP id C3AB7161885; Fri, 24 Apr 2020 16:17:17 -0600 (MDT) X-Amavis-Modified: Mail body modified (using disclaimer) - mta3.zcs.xmission.com Received: from mta3.zcs.xmission.com ([127.0.0.1]) by localhost (mta3.zcs.xmission.com [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id iiyJbov7kyX4; Fri, 24 Apr 2020 16:17:17 -0600 (MDT) Received: from photon.int.bluestop.org (c-174-52-16-57.hsd1.ut.comcast.net [174.52.16.57]) (Authenticated sender: rebecca@bsdio.com) by mta3.zcs.xmission.com (Postfix) with ESMTPSA id 170AD161857; Fri, 24 Apr 2020 16:17:17 -0600 (MDT) From: "Rebecca Cran" To: devel@edk2.groups.io Cc: Rebecca Cran , Jordan Justen , Laszlo Ersek , Ard Biesheuvel Date: Fri, 24 Apr 2020 16:17:07 -0600 Message-Id: <20200424221707.183492-1-rebecca@bsdio.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-XM-SPF: eid=1jS6dL-000531-L5;;;mid=<20200424221707.183492-1-rebecca@bsdio.com>;;;hst=in02.mta.xmission.com;;;ip=166.70.13.67;;;frm=rebecca@bsdio.com;;;spf=pass X-SA-Exim-Connect-IP: 166.70.13.67 X-SA-Exim-Mail-From: rebecca@bsdio.com X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on sa08.xmission.com X-Spam-Level: ******* X-Spam-Status: No, score=7.2 required=8.0 tests=ALL_TRUSTED,BAYES_60, DCC_CHECK_NEGATIVE,FVGT_m_MULTI_ODD,LotsOfNums_01,TM2_M_VERY_LONG_WORD, XMBrknScrpt_02,XMSubLong,XMSubMetaSx_00,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 * 1.5 BAYES_60 BODY: Bayes spam probability is 60 to 80% * [score: 0.7986] * 0.7 XMSubLong Long Subject * 1.2 LotsOfNums_01 BODY: Lots of long strings of numbers * 1.0 TM2_M_VERY_LONG_WORD BODY: Very long word (longer than 40 * chars) * -0.0 DCC_CHECK_NEGATIVE Not listed in DCC * [sa08 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. * 1.0 XM_B_Phish_Phrases Commonly used Phishing Phrases * 0.4 XMBrknScrpt_02 Possible Broken Spam Script X-Spam-DCC: XMission; sa08 1397; IP=ok Body=1 Fuz1=1 Fuz2=1 X-Spam-Combo: *******;devel@edk2.groups.io X-Spam-Relay-Country: X-Spam-Timing: total 13204 ms - load_scoreonly_sql: 0.05 (0.0%), signal_user_changed: 15 (0.1%), b_tie_ro: 13 (0.1%), parse: 7 (0.1%), extract_message_metadata: 67 (0.5%), get_uri_detail_list: 39 (0.3%), tests_pri_-1000: 2.8 (0.0%), tests_pri_-950: 1.60 (0.0%), tests_pri_-900: 1.39 (0.0%), tests_pri_-90: 342 (2.6%), check_bayes: 320 (2.4%), b_tokenize: 164 (1.2%), b_tok_get_all: 78 (0.6%), b_comp_prob: 16 (0.1%), b_tok_touch_all: 51 (0.4%), b_finish: 1.16 (0.0%), tests_pri_0: 3674 (27.8%), check_dkim_signature: 2.5 (0.0%), check_dkim_adsp: 58 (0.4%), poll_dns_idle: 9112 (69.0%), tests_pri_10: 2.4 (0.0%), tests_pri_500: 9076 (68.7%), rewrite_mail: 0.00 (0.0%) Subject: [PATCH] OvmfPkg: replace old EFI_D_ debug levels with new DEBUG_ ones X-Spam-Flag: No 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: quoted-printable Signed-off-by: Rebecca Cran Cc: Jordan Justen Cc: Laszlo Ersek Cc: Ard Biesheuvel --- OvmfPkg/AcpiPlatformDxe/EntryPoint.c | 8 +- OvmfPkg/AcpiPlatformDxe/PciDecoding.c | 10 +-- OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c | 32 ++++---- 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 | 62 +++++++------- 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 | 30 +++---- 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/PlatformDxe/Platform.c | 6 +- OvmfPkg/PlatformPei/FeatureControl.c | 4 +- OvmfPkg/PlatformPei/Fv.c | 2 +- OvmfPkg/PlatformPei/MemDetect.c | 10 +-- 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 | 22 ++--- OvmfPkg/SmmAccess/SmmAccessPei.c | 4 +- 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 +- 62 files changed, 335 insertions(+), 335 deletions(-) diff --git a/OvmfPkg/AcpiPlatformDxe/EntryPoint.c b/OvmfPkg/AcpiPlatformDxe= /EntryPoint.c index 4fd7abc0b4..f66f892911 100644 --- a/OvmfPkg/AcpiPlatformDxe/EntryPoint.c +++ b/OvmfPkg/AcpiPlatformDxe/EntryPoint.c @@ -39,12 +39,12 @@ OnRootBridgesConnected ( {=0D EFI_STATUS Status;=0D =0D - DEBUG ((EFI_D_INFO,=0D + DEBUG ((DEBUG_INFO,=0D "%a: root bridges have been connected, installing ACPI tables\n",=0D __FUNCTION__));=0D Status =3D InstallAcpiTables (FindAcpiTableProtocol ());=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "%a: InstallAcpiTables: %r\n", __FUNCTION__, Stat= us));=0D + DEBUG ((DEBUG_ERROR, "%a: InstallAcpiTables: %r\n", __FUNCTION__, Stat= us));=0D }=0D gBS->CloseEvent (Event);=0D }=0D @@ -66,7 +66,7 @@ AcpiPlatformEntryPoint ( // the full functionality.=0D //=0D if (PcdGetBool (PcdPciDisableBusEnumeration)) {=0D - DEBUG ((EFI_D_INFO, "%a: PCI or its enumeration disabled, installing "= =0D + DEBUG ((DEBUG_INFO, "%a: PCI or its enumeration disabled, installing "= =0D "ACPI tables\n", __FUNCTION__));=0D return InstallAcpiTables (FindAcpiTableProtocol ());=0D }=0D @@ -81,7 +81,7 @@ AcpiPlatformEntryPoint ( OnRootBridgesConnected, NULL /* Context */,=0D &gRootBridgesConnectedEventGroupGuid, &RootBridgesConnec= ted);=0D if (!EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_INFO,=0D + DEBUG ((DEBUG_INFO,=0D "%a: waiting for root bridges to be connected, registered callback\n= ",=0D __FUNCTION__));=0D }=0D diff --git a/OvmfPkg/AcpiPlatformDxe/PciDecoding.c b/OvmfPkg/AcpiPlatformDx= e/PciDecoding.c index eb0417bba4..73894106c9 100644 --- a/OvmfPkg/AcpiPlatformDxe/PciDecoding.c +++ b/OvmfPkg/AcpiPlatformDxe/PciDecoding.c @@ -69,14 +69,14 @@ EnablePciDecoding ( }=0D =0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_WARN, "%a: LocateHandleBuffer(): %r\n", __FUNCTION__,=0D + DEBUG ((DEBUG_WARN, "%a: LocateHandleBuffer(): %r\n", __FUNCTION__,=0D Status));=0D return;=0D }=0D =0D OrigAttrs =3D AllocatePool (NoHandles * sizeof *OrigAttrs);=0D if (OrigAttrs =3D=3D NULL) {=0D - DEBUG ((EFI_D_WARN, "%a: AllocatePool(): out of resources\n",=0D + DEBUG ((DEBUG_WARN, "%a: AllocatePool(): out of resources\n",=0D __FUNCTION__));=0D goto FreeHandles;=0D }=0D @@ -99,7 +99,7 @@ EnablePciDecoding ( Status =3D PciIo->Attributes (PciIo, EfiPciIoAttributeOperationGet, 0,= =0D &OrigAttrs[Idx].PciAttributes);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_WARN, "%a: EfiPciIoAttributeOperationGet: %r\n",=0D + DEBUG ((DEBUG_WARN, "%a: EfiPciIoAttributeOperationGet: %r\n",=0D __FUNCTION__, Status));=0D goto RestoreAttributes;=0D }=0D @@ -110,7 +110,7 @@ EnablePciDecoding ( Status =3D PciIo->Attributes (PciIo, EfiPciIoAttributeOperationSupport= ed, 0,=0D &Attributes);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_WARN, "%a: EfiPciIoAttributeOperationSupported: %r\n",= =0D + DEBUG ((DEBUG_WARN, "%a: EfiPciIoAttributeOperationSupported: %r\n",= =0D __FUNCTION__, Status));=0D goto RestoreAttributes;=0D }=0D @@ -122,7 +122,7 @@ EnablePciDecoding ( Status =3D PciIo->Attributes (PciIo, EfiPciIoAttributeOperationEnable,= =0D Attributes, NULL);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_WARN, "%a: EfiPciIoAttributeOperationEnable: %r\n",=0D + DEBUG ((DEBUG_WARN, "%a: EfiPciIoAttributeOperationEnable: %r\n",=0D __FUNCTION__, Status));=0D goto RestoreAttributes;=0D }=0D diff --git a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c b/OvmfPkg/AcpiPlatform= Dxe/QemuFwCfgAcpi.c index 75a3a88a36..526b49501e 100644 --- a/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c +++ b/OvmfPkg/AcpiPlatformDxe/QemuFwCfgAcpi.c @@ -329,19 +329,19 @@ ProcessCmdAllocate ( BLOB *Blob;=0D =0D if (Allocate->File[QEMU_LOADER_FNAME_SIZE - 1] !=3D '\0') {=0D - DEBUG ((EFI_D_ERROR, "%a: malformed file name\n", __FUNCTION__));=0D + DEBUG ((DEBUG_ERROR, "%a: malformed file name\n", __FUNCTION__));=0D return EFI_PROTOCOL_ERROR;=0D }=0D =0D if (Allocate->Alignment > EFI_PAGE_SIZE) {=0D - DEBUG ((EFI_D_ERROR, "%a: unsupported alignment 0x%x\n", __FUNCTION__,= =0D + DEBUG ((DEBUG_ERROR, "%a: unsupported alignment 0x%x\n", __FUNCTION__,= =0D Allocate->Alignment));=0D return EFI_UNSUPPORTED;=0D }=0D =0D Status =3D QemuFwCfgFindFile ((CHAR8 *)Allocate->File, &FwCfgItem, &FwCf= gSize);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "%a: QemuFwCfgFindFile(\"%a\"): %r\n", __FUNCTION= __,=0D + DEBUG ((DEBUG_ERROR, "%a: QemuFwCfgFindFile(\"%a\"): %r\n", __FUNCTION= __,=0D Allocate->File, Status));=0D return Status;=0D }=0D @@ -372,7 +372,7 @@ ProcessCmdAllocate ( =0D Status =3D OrderedCollectionInsert (Tracker, NULL, Blob);=0D if (Status =3D=3D RETURN_ALREADY_STARTED) {=0D - DEBUG ((EFI_D_ERROR, "%a: duplicated file \"%a\"\n", __FUNCTION__,=0D + DEBUG ((DEBUG_ERROR, "%a: duplicated file \"%a\"\n", __FUNCTION__,=0D Allocate->File));=0D Status =3D EFI_PROTOCOL_ERROR;=0D }=0D @@ -432,14 +432,14 @@ ProcessCmdAddPointer ( =0D if (AddPointer->PointerFile[QEMU_LOADER_FNAME_SIZE - 1] !=3D '\0' ||=0D AddPointer->PointeeFile[QEMU_LOADER_FNAME_SIZE - 1] !=3D '\0') {=0D - DEBUG ((EFI_D_ERROR, "%a: malformed file name\n", __FUNCTION__));=0D + DEBUG ((DEBUG_ERROR, "%a: malformed file name\n", __FUNCTION__));=0D return EFI_PROTOCOL_ERROR;=0D }=0D =0D TrackerEntry =3D OrderedCollectionFind (Tracker, AddPointer->PointerFile= );=0D TrackerEntry2 =3D OrderedCollectionFind (Tracker, AddPointer->PointeeFil= e);=0D if (TrackerEntry =3D=3D NULL || TrackerEntry2 =3D=3D NULL) {=0D - DEBUG ((EFI_D_ERROR, "%a: invalid blob reference(s) \"%a\" / \"%a\"\n"= ,=0D + DEBUG ((DEBUG_ERROR, "%a: invalid blob reference(s) \"%a\" / \"%a\"\n"= ,=0D __FUNCTION__, AddPointer->PointerFile, AddPointer->PointeeFile));=0D return EFI_PROTOCOL_ERROR;=0D }=0D @@ -450,7 +450,7 @@ ProcessCmdAddPointer ( AddPointer->PointerSize !=3D 4 && AddPointer->PointerSize !=3D 8) |= |=0D Blob->Size < AddPointer->PointerSize ||=0D Blob->Size - AddPointer->PointerSize < AddPointer->PointerOffset) {= =0D - DEBUG ((EFI_D_ERROR, "%a: invalid pointer location or size in \"%a\"\n= ",=0D + DEBUG ((DEBUG_ERROR, "%a: invalid pointer location or size in \"%a\"\n= ",=0D __FUNCTION__, AddPointer->PointerFile));=0D return EFI_PROTOCOL_ERROR;=0D }=0D @@ -459,7 +459,7 @@ ProcessCmdAddPointer ( PointerValue =3D 0;=0D CopyMem (&PointerValue, PointerField, AddPointer->PointerSize);=0D if (PointerValue >=3D Blob2->Size) {=0D - DEBUG ((EFI_D_ERROR, "%a: invalid pointer value in \"%a\"\n", __FUNCTI= ON__,=0D + DEBUG ((DEBUG_ERROR, "%a: invalid pointer value in \"%a\"\n", __FUNCTI= ON__,=0D AddPointer->PointerFile));=0D return EFI_PROTOCOL_ERROR;=0D }=0D @@ -473,7 +473,7 @@ ProcessCmdAddPointer ( PointerValue +=3D (UINT64)(UINTN)Blob2->Base;=0D if (AddPointer->PointerSize < 8 &&=0D RShiftU64 (PointerValue, AddPointer->PointerSize * 8) !=3D 0) {=0D - DEBUG ((EFI_D_ERROR, "%a: relocated pointer value unrepresentable in "= =0D + DEBUG ((DEBUG_ERROR, "%a: relocated pointer value unrepresentable in "= =0D "\"%a\"\n", __FUNCTION__, AddPointer->PointerFile));=0D return EFI_PROTOCOL_ERROR;=0D }=0D @@ -515,13 +515,13 @@ ProcessCmdAddChecksum ( BLOB *Blob;=0D =0D if (AddChecksum->File[QEMU_LOADER_FNAME_SIZE - 1] !=3D '\0') {=0D - DEBUG ((EFI_D_ERROR, "%a: malformed file name\n", __FUNCTION__));=0D + DEBUG ((DEBUG_ERROR, "%a: malformed file name\n", __FUNCTION__));=0D return EFI_PROTOCOL_ERROR;=0D }=0D =0D TrackerEntry =3D OrderedCollectionFind (Tracker, AddChecksum->File);=0D if (TrackerEntry =3D=3D NULL) {=0D - DEBUG ((EFI_D_ERROR, "%a: invalid blob reference \"%a\"\n", __FUNCTION= __,=0D + DEBUG ((DEBUG_ERROR, "%a: invalid blob reference \"%a\"\n", __FUNCTION= __,=0D AddChecksum->File));=0D return EFI_PROTOCOL_ERROR;=0D }=0D @@ -530,7 +530,7 @@ ProcessCmdAddChecksum ( if (Blob->Size <=3D AddChecksum->ResultOffset ||=0D Blob->Size < AddChecksum->Length ||=0D Blob->Size - AddChecksum->Length < AddChecksum->Start) {=0D - DEBUG ((EFI_D_ERROR, "%a: invalid checksum range in \"%a\"\n",=0D + DEBUG ((DEBUG_ERROR, "%a: invalid checksum range in \"%a\"\n",=0D __FUNCTION__, AddChecksum->File));=0D return EFI_PROTOCOL_ERROR;=0D }=0D @@ -907,7 +907,7 @@ Process2ndPassCmdAddPointer ( }=0D =0D if (*NumInstalled =3D=3D INSTALLED_TABLES_MAX) {=0D - DEBUG ((EFI_D_ERROR, "%a: can't install more than %d tables\n",=0D + DEBUG ((DEBUG_ERROR, "%a: can't install more than %d tables\n",=0D __FUNCTION__, INSTALLED_TABLES_MAX));=0D Status =3D EFI_OUT_OF_RESOURCES;=0D goto RollbackSeenPointer;=0D @@ -917,7 +917,7 @@ Process2ndPassCmdAddPointer ( (VOID *)(UINTN)PointerValue, TableSize,=0D &InstalledKey[*NumInstalled]);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "%a: InstallAcpiTable(): %r\n", __FUNCTION__,=0D + DEBUG ((DEBUG_ERROR, "%a: InstallAcpiTable(): %r\n", __FUNCTION__,=0D Status));=0D goto RollbackSeenPointer;=0D }=0D @@ -980,7 +980,7 @@ InstallQemuFwCfgTables ( return Status;=0D }=0D if (FwCfgSize % sizeof *LoaderEntry !=3D 0) {=0D - DEBUG ((EFI_D_ERROR, "%a: \"etc/table-loader\" has invalid size 0x%Lx\= n",=0D + DEBUG ((DEBUG_ERROR, "%a: \"etc/table-loader\" has invalid size 0x%Lx\= n",=0D __FUNCTION__, (UINT64)FwCfgSize));=0D return EFI_PROTOCOL_ERROR;=0D }=0D @@ -1128,7 +1128,7 @@ UninstallAcpiTables: AcpiProtocol->UninstallAcpiTable (AcpiProtocol, InstalledKey[Install= ed]);=0D }=0D } else {=0D - DEBUG ((EFI_D_INFO, "%a: installed %d tables\n", __FUNCTION__, Install= ed));=0D + DEBUG ((DEBUG_INFO, "%a: installed %d tables\n", __FUNCTION__, Install= ed));=0D }=0D =0D for (SeenPointerEntry =3D OrderedCollectionMin (SeenPointers);=0D diff --git a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c b/OvmfPkg/Csm/BiosT= hunk/VideoDxe/BiosVideo.c index 0a189bc592..5a52298983 100644 --- a/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c +++ b/OvmfPkg/Csm/BiosThunk/VideoDxe/BiosVideo.c @@ -711,7 +711,7 @@ BiosVideoChildHandleInstall ( //=0D if (FeaturePcdGet (PcdBiosVideoCheckVbeEnable)) {=0D Status =3D BiosVideoCheckForVbe (BiosVideoPrivate);=0D - DEBUG ((EFI_D_INFO, "BiosVideoCheckForVbe - %r\n", Status));=0D + DEBUG ((DEBUG_INFO, "BiosVideoCheckForVbe - %r\n", Status));=0D } else {=0D Status =3D EFI_UNSUPPORTED;=0D }=0D @@ -720,11 +720,11 @@ BiosVideoChildHandleInstall ( // The VESA BIOS Extensions are not compatible with Graphics Output, s= o check for support=0D // for the standard 640x480 16 color VGA mode=0D //=0D - DEBUG ((EFI_D_INFO, "VgaCompatible - %x\n", BiosVideoPrivate->VgaCompa= tible));=0D + DEBUG ((DEBUG_INFO, "VgaCompatible - %x\n", BiosVideoPrivate->VgaCompa= tible));=0D if (BiosVideoPrivate->VgaCompatible) {=0D if (FeaturePcdGet (PcdBiosVideoCheckVgaEnable)) {=0D Status =3D BiosVideoCheckForVga (BiosVideoPrivate);=0D - DEBUG ((EFI_D_INFO, "BiosVideoCheckForVga - %r\n", Status));=0D + DEBUG ((DEBUG_INFO, "BiosVideoCheckForVga - %r\n", Status));=0D } else {=0D Status =3D EFI_UNSUPPORTED;=0D }=0D @@ -1122,7 +1122,7 @@ ParseEdidData ( ((EdidDataBlock->EstablishedTimings[2] & 0x80) << 9) ;=0D for (Index =3D 0; Index < VESA_BIOS_EXTENSIONS_EDID_ESTABLISHED_TIMING= _MAX_NUMBER; Index ++) {=0D if ((TimingBits & 0x1) !=3D 0) {=0D - DEBUG ((EFI_D_INFO, "Established Timing: %d x %d\n",=0D + DEBUG ((DEBUG_INFO, "Established Timing: %d x %d\n",=0D mEstablishedEdidTiming[Index].HorizontalResolution, mEstablishedEd= idTiming[Index].VerticalResolution));=0D ValidEdidTiming->Key[ValidNumber] =3D CalculateEdidKey (&mEstablis= hedEdidTiming[Index]);=0D ValidNumber ++;=0D @@ -1164,7 +1164,7 @@ ParseEdidData ( break;=0D }=0D RefreshRate =3D (UINT8) ((BufferIndex[1] & 0x1f) + 60);=0D - DEBUG ((EFI_D_INFO, "Standard Timing: %d x %d\n", HorizontalResoluti= on, VerticalResolution));=0D + DEBUG ((DEBUG_INFO, "Standard Timing: %d x %d\n", HorizontalResoluti= on, VerticalResolution));=0D TempTiming.HorizontalResolution =3D HorizontalResolution;=0D TempTiming.VerticalResolution =3D VerticalResolution;=0D TempTiming.RefreshRate =3D RefreshRate;=0D @@ -1191,7 +1191,7 @@ ParseEdidData ( //=0D TempTiming.HorizontalResolution =3D ((UINT16)(BufferIndex[4] & 0xF0) <= < 4) | (BufferIndex[2]);=0D TempTiming.VerticalResolution =3D ((UINT16)(BufferIndex[7] & 0xF0) << = 4) | (BufferIndex[5]);=0D - DEBUG ((EFI_D_INFO, "Detailed Timing %d: %d x %d\n",=0D + DEBUG ((DEBUG_INFO, "Detailed Timing %d: %d x %d\n",=0D Index, TempTiming.HorizontalResolution, TempTiming.VerticalRes= olution));=0D ValidEdidTiming->Key[ValidNumber] =3D CalculateEdidKey (&TempTiming);= =0D ValidNumber ++;=0D @@ -1572,7 +1572,7 @@ BiosVideoCheckForVbe ( continue;=0D }=0D =0D - DEBUG ((EFI_D_INFO, "Video Controller Mode 0x%x: %d x %d\n",=0D + DEBUG ((DEBUG_INFO, "Video Controller Mode 0x%x: %d x %d\n",=0D VbeModeNumber, BiosVideoPrivate->VbeModeInformationBlock->XRes= olution, BiosVideoPrivate->VbeModeInformationBlock->YResolution));=0D =0D if (EdidFound && (ValidEdidTiming.ValidNumber > 0)) {=0D @@ -1737,7 +1737,7 @@ BiosVideoCheckForVbe ( DEBUG_CODE (=0D BIOS_VIDEO_MODE_DATA *ModeData;=0D ModeData =3D &BiosVideoPrivate->ModeData[HighestResolutionMode];=0D - DEBUG ((EFI_D_INFO, "BiosVideo set highest resolution %d x %d\n",=0D + DEBUG ((DEBUG_INFO, "BiosVideo set highest resolution %d x %d\n",=0D ModeData->HorizontalResolution, ModeData->VerticalResolution= ));=0D );=0D PreferMode =3D HighestResolutionMode;=0D diff --git a/OvmfPkg/Csm/CsmSupportLib/LegacyInterrupt.c b/OvmfPkg/Csm/CsmS= upportLib/LegacyInterrupt.c index 2928e26329..97ca21945f 100644 --- a/OvmfPkg/Csm/CsmSupportLib/LegacyInterrupt.c +++ b/OvmfPkg/Csm/CsmSupportLib/LegacyInterrupt.c @@ -192,7 +192,7 @@ LegacyInterruptInstall ( mLegacyInterruptDevice =3D LEGACY_INT_DEV_Q35;=0D break;=0D default:=0D - DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",= =0D + DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",= =0D __FUNCTION__, HostBridgeDevId));=0D ASSERT (FALSE);=0D return EFI_UNSUPPORTED;=0D diff --git a/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c b/OvmfPkg/Csm/CsmSu= pportLib/LegacyPlatform.c index 9c60c4a4cf..96f9934b20 100644 --- a/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c +++ b/OvmfPkg/Csm/CsmSupportLib/LegacyPlatform.c @@ -309,7 +309,7 @@ GetSelectedVgaDeviceInfo ( if (!IS_PCI_VGA (&Pci)) {=0D continue;=0D }=0D - DEBUG ((EFI_D_INFO,=0D + DEBUG ((DEBUG_INFO,=0D "PCI VGA: 0x%04x:0x%04x\n",=0D Pci.Hdr.VendorId,=0D Pci.Hdr.DeviceId=0D diff --git a/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c b/OvmfPkg/Csm/CsmSupp= ortLib/LegacyRegion.c index 73276dc228..fe9ae27c9d 100644 --- a/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c +++ b/OvmfPkg/Csm/CsmSupportLib/LegacyRegion.c @@ -477,7 +477,7 @@ LegacyRegionInit ( mRegisterValues =3D mRegisterValuesQ35;=0D break;=0D default:=0D - DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",=0D + DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",=0D __FUNCTION__, HostBridgeDevId));=0D ASSERT (FALSE);=0D return RETURN_UNSUPPORTED;=0D diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c b/OvmfPkg/Csm/LegacyBio= sDxe/LegacyBios.c index dd3608a64e..3ce19496b0 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBios.c @@ -364,7 +364,7 @@ ShadowAndStartLegacy16 ( }=0D =0D if (Table =3D=3D NULL) {=0D - DEBUG ((EFI_D_ERROR, "No Legacy16 table found\n"));=0D + DEBUG ((DEBUG_ERROR, "No Legacy16 table found\n"));=0D return EFI_NOT_FOUND;=0D }=0D =0D @@ -372,7 +372,7 @@ ShadowAndStartLegacy16 ( //=0D // Legacy16 table header checksum error.=0D //=0D - DEBUG ((EFI_D_ERROR, "Legacy16 table found with bad talbe header check= sum\n"));=0D + DEBUG ((DEBUG_ERROR, "Legacy16 table found with bad talbe header check= sum\n"));=0D }=0D =0D //=0D @@ -483,7 +483,7 @@ ShadowAndStartLegacy16 ( Table->E820Pointer =3D (UINT32) (Regs.X.DS * 16 + Regs.X.BX);=0D Table->E820Length =3D (UINT32) E820Size;=0D if (Regs.X.AX !=3D 0) {=0D - DEBUG ((EFI_D_ERROR, "Legacy16 E820 length insufficient\n"));=0D + DEBUG ((DEBUG_ERROR, "Legacy16 E820 length insufficient\n"));=0D } else {=0D TempData =3D Table->E820Pointer;=0D CopyMem ((VOID *) TempData, Private->E820Table, E820Size);=0D @@ -543,7 +543,7 @@ ShadowAndStartLegacy16 ( =0D TpmPointer =3D (UINT32) (Regs.X.DS * 16 + Regs.X.BX);=0D if (Regs.X.AX !=3D 0) {=0D - DEBUG ((EFI_D_ERROR, "TPM cannot be loaded\n"));=0D + DEBUG ((DEBUG_ERROR, "TPM cannot be loaded\n"));=0D } else {=0D CopyMem ((VOID *) (UINTN)TpmPointer, TpmBinaryImage, TpmBinaryImageS= ize);=0D Table->TpmSegment =3D Regs.X.DS;=0D @@ -738,7 +738,7 @@ InstallSmbiosEventCallback ( mReserveSmbiosEntryPoint =3D 0;=0D return;=0D }=0D - DEBUG ((EFI_D_INFO, "Allocate memory for Smbios Entry Point Structure\= n"));=0D + DEBUG ((DEBUG_INFO, "Allocate memory for Smbios Entry Point Structure\= n"));=0D }=0D =0D if ((mStructureTableAddress !=3D 0) &&=0D @@ -749,7 +749,7 @@ InstallSmbiosEventCallback ( gBS->FreePages (mStructureTableAddress, mStructureTablePages);=0D mStructureTableAddress =3D 0;=0D mStructureTablePages =3D 0;=0D - DEBUG ((EFI_D_INFO, "Original size is not enough. Re-allocate the memo= ry.\n"));=0D + DEBUG ((DEBUG_INFO, "Original size is not enough. Re-allocate the memo= ry.\n"));=0D }=0D =0D if (mStructureTableAddress =3D=3D 0) {=0D @@ -775,7 +775,7 @@ InstallSmbiosEventCallback ( mStructureTablePages =3D 0;=0D return;=0D }=0D - DEBUG ((EFI_D_INFO, "Allocate memory for Smbios Structure Table\n"));= =0D + DEBUG ((DEBUG_INFO, "Allocate memory for Smbios Structure Table\n"));= =0D }=0D }=0D =0D @@ -1051,7 +1051,7 @@ LegacyBiosInstall ( MemoryPtr =3D (VOID *) ((UINTN) StartAddress);=0D ZeroMem (MemoryPtr, 0x1000);=0D } else {=0D - DEBUG ((EFI_D_ERROR, "WARNING: Allocate legacy memory fail for SCSI = card - %x\n", MemStart));=0D + DEBUG ((DEBUG_ERROR, "WARNING: Allocate legacy memory fail for SCSI = card - %x\n", MemStart));=0D }=0D }=0D =0D @@ -1206,7 +1206,7 @@ LegacyBiosInstall ( );=0D Private->Csm16PciInterfaceVersion =3D GetPciInterfaceVersion (Private);= =0D =0D - DEBUG ((EFI_D_INFO, "CSM16 PCI BIOS Interface Version: %02x.%02x\n",=0D + DEBUG ((DEBUG_INFO, "CSM16 PCI BIOS Interface Version: %02x.%02x\n",=0D (UINT8) (Private->Csm16PciInterfaceVersion >> 8),=0D (UINT8) Private->Csm16PciInterfaceVersion=0D ));=0D diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBootSupport.c b/OvmfPkg/Csm/Le= gacyBiosDxe/LegacyBootSupport.c index 20784504d5..9a09d72307 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyBootSupport.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyBootSupport.c @@ -46,9 +46,9 @@ PrintBbsTable ( UINT16 SubIndex;=0D CHAR8 *String;=0D =0D - DEBUG ((EFI_D_INFO, "\n"));=0D - DEBUG ((EFI_D_INFO, " NO Prio bb/dd/ff cl/sc Type Stat segm:offs mfgs:m= fgo dess:deso\n"));=0D - DEBUG ((EFI_D_INFO, "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"));= =0D + DEBUG ((DEBUG_INFO, "\n"));=0D + DEBUG ((DEBUG_INFO, " NO Prio bb/dd/ff cl/sc Type Stat segm:offs mfgs:m= fgo dess:deso\n"));=0D + DEBUG ((DEBUG_INFO, "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"));= =0D for (Index =3D 0; Index < MAX_BBS_ENTRIES; Index++) {=0D //=0D // Filter=0D @@ -58,7 +58,7 @@ PrintBbsTable ( }=0D =0D DEBUG ((=0D - EFI_D_INFO,=0D + DEBUG_INFO,=0D " %02x: %04x %02x/%02x/%02x %02x/%02x %04x %04x",=0D (UINTN) Index,=0D (UINTN) BbsTable[Index].BootPriority,=0D @@ -71,7 +71,7 @@ PrintBbsTable ( (UINTN) * (UINT16 *) &BbsTable[Index].StatusFlags=0D ));=0D DEBUG ((=0D - EFI_D_INFO,=0D + DEBUG_INFO,=0D " %04x:%04x %04x:%04x %04x:%04x",=0D (UINTN) BbsTable[Index].BootHandlerSegment,=0D (UINTN) BbsTable[Index].BootHandlerOffset,=0D @@ -86,16 +86,16 @@ PrintBbsTable ( //=0D String =3D (CHAR8 *)(((UINTN)BbsTable[Index].DescStringSegment << 4) += BbsTable[Index].DescStringOffset);=0D if (String !=3D NULL) {=0D - DEBUG ((EFI_D_INFO," ("));=0D + DEBUG ((DEBUG_INFO," ("));=0D for (SubIndex =3D 0; String[SubIndex] !=3D 0; SubIndex++) {=0D - DEBUG ((EFI_D_INFO, "%c", String[SubIndex]));=0D + DEBUG ((DEBUG_INFO, "%c", String[SubIndex]));=0D }=0D - DEBUG ((EFI_D_INFO,")"));=0D + DEBUG ((DEBUG_INFO,")"));=0D }=0D - DEBUG ((EFI_D_INFO,"\n"));=0D + DEBUG ((DEBUG_INFO,"\n"));=0D }=0D =0D - DEBUG ((EFI_D_INFO, "\n"));=0D + DEBUG ((DEBUG_INFO, "\n"));=0D =0D return ;=0D }=0D @@ -114,20 +114,20 @@ PrintHddInfo ( {=0D UINTN Index;=0D =0D - DEBUG ((EFI_D_INFO, "\n"));=0D + DEBUG ((DEBUG_INFO, "\n"));=0D for (Index =3D 0; Index < MAX_IDE_CONTROLLER; Index++) {=0D - DEBUG ((EFI_D_INFO, "Index - %04x\n", Index));=0D - DEBUG ((EFI_D_INFO, " Status - %04x\n", (UINTN)HddInfo[Index].Stat= us));=0D - DEBUG ((EFI_D_INFO, " B/D/F - %02x/%02x/%02x\n", (UINTN)HddInfo[I= ndex].Bus, (UINTN)HddInfo[Index].Device, (UINTN)HddInfo[Index].Function));= =0D - DEBUG ((EFI_D_INFO, " Command - %04x\n", HddInfo[Index].CommandBase= Address));=0D - DEBUG ((EFI_D_INFO, " Control - %04x\n", HddInfo[Index].ControlBase= Address));=0D - DEBUG ((EFI_D_INFO, " BusMaster - %04x\n", HddInfo[Index].BusMasterAd= dress));=0D - DEBUG ((EFI_D_INFO, " HddIrq - %02x\n", HddInfo[Index].HddIrq));=0D - DEBUG ((EFI_D_INFO, " IdentifyDrive[0].Raw[0] - %x\n", HddInfo[Index]= .IdentifyDrive[0].Raw[0]));=0D - DEBUG ((EFI_D_INFO, " IdentifyDrive[1].Raw[0] - %x\n", HddInfo[Index]= .IdentifyDrive[1].Raw[0]));=0D + DEBUG ((DEBUG_INFO, "Index - %04x\n", Index));=0D + DEBUG ((DEBUG_INFO, " Status - %04x\n", (UINTN)HddInfo[Index].Stat= us));=0D + DEBUG ((DEBUG_INFO, " B/D/F - %02x/%02x/%02x\n", (UINTN)HddInfo[I= ndex].Bus, (UINTN)HddInfo[Index].Device, (UINTN)HddInfo[Index].Function));= =0D + DEBUG ((DEBUG_INFO, " Command - %04x\n", HddInfo[Index].CommandBase= Address));=0D + DEBUG ((DEBUG_INFO, " Control - %04x\n", HddInfo[Index].ControlBase= Address));=0D + DEBUG ((DEBUG_INFO, " BusMaster - %04x\n", HddInfo[Index].BusMasterAd= dress));=0D + DEBUG ((DEBUG_INFO, " HddIrq - %02x\n", HddInfo[Index].HddIrq));=0D + DEBUG ((DEBUG_INFO, " IdentifyDrive[0].Raw[0] - %x\n", HddInfo[Index]= .IdentifyDrive[0].Raw[0]));=0D + DEBUG ((DEBUG_INFO, " IdentifyDrive[1].Raw[0] - %x\n", HddInfo[Index]= .IdentifyDrive[1].Raw[0]));=0D }=0D =0D - DEBUG ((EFI_D_INFO, "\n"));=0D + DEBUG ((DEBUG_INFO, "\n"));=0D =0D return ;=0D }=0D @@ -163,9 +163,9 @@ PrintPciInterruptRegister ( Device =3D 0;=0D Function =3D 0;=0D =0D - DEBUG ((EFI_D_INFO, "\n"));=0D - DEBUG ((EFI_D_INFO, " bb/dd/ff interrupt line interrupt pin\n"));=0D - DEBUG ((EFI_D_INFO, "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"));=0D + DEBUG ((DEBUG_INFO, "\n"));=0D + DEBUG ((DEBUG_INFO, " bb/dd/ff interrupt line interrupt pin\n"));=0D + DEBUG ((DEBUG_INFO, "=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D\n"));=0D for (Index =3D 0; Index < HandleNum; Index++) {=0D Status =3D gBS->HandleProtocol (Handles[Index], &gEfiPciIoProtocolGuid= , (VOID **) &PciIo);=0D if (!EFI_ERROR (Status)) {=0D @@ -187,11 +187,11 @@ PrintPciInterruptRegister ( );=0D }=0D if (!EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_INFO, " %02x/%02x/%02x 0x%02x 0x%02x\n",=0D + DEBUG ((DEBUG_INFO, " %02x/%02x/%02x 0x%02x 0x%02x\n",=0D Bus, Device, Function, Interrupt[0], Interrupt[1]));=0D }=0D }=0D - DEBUG ((EFI_D_INFO, "\n"));=0D + DEBUG ((DEBUG_INFO, "\n"));=0D =0D if (Handles !=3D NULL) {=0D FreePool (Handles);=0D @@ -667,8 +667,8 @@ LegacyGetDataOrTable ( 0,=0D 0=0D );=0D - DEBUG ((EFI_D_INFO, "LegacyGetDataOrTable - ID: %x, %r\n", (UINTN)= Id, Status));=0D - DEBUG ((EFI_D_INFO, " Table - %x, Size - %x, Location - %x, Align= ment - %x\n", (UINTN)Table, (UINTN)TableSize, (UINTN)Location, (UINTN)Align= ment));=0D + DEBUG ((DEBUG_INFO, "LegacyGetDataOrTable - ID: %x, %r\n", (UINTN)= Id, Status));=0D + DEBUG ((DEBUG_INFO, " Table - %x, Size - %x, Location - %x, Align= ment - %x\n", (UINTN)Table, (UINTN)TableSize, (UINTN)Location, (UINTN)Align= ment));=0D break;=0D }=0D =0D @@ -697,7 +697,7 @@ LegacyGetDataOrTable ( );=0D =0D if (Regs.X.AX !=3D 0) {=0D - DEBUG ((EFI_D_ERROR, "Table ID %x length insufficient\n", Id));=0D + DEBUG ((DEBUG_ERROR, "Table ID %x length insufficient\n", Id));=0D return EFI_OUT_OF_RESOURCES;=0D } else {=0D break;=0D @@ -721,7 +721,7 @@ LegacyGetDataOrTable ( {=0D Legacy16Table->MpTablePtr =3D (UINT32) (Regs.X.DS * 16 + Regs.X.= BX);=0D Legacy16Table->MpTableLength =3D (UINT32)TableSize;=0D - DEBUG ((EFI_D_INFO, "MP table in legacy region - %x\n", (UINTN)Legac= y16Table->MpTablePtr));=0D + DEBUG ((DEBUG_INFO, "MP table in legacy region - %x\n", (UINTN)Legac= y16Table->MpTablePtr));=0D break;=0D }=0D =0D @@ -730,7 +730,7 @@ LegacyGetDataOrTable ( =0D Legacy16Table->OemIntSegment =3D Regs.X.DS;=0D Legacy16Table->OemIntOffset =3D Regs.X.BX;=0D - DEBUG ((EFI_D_INFO, "OemInt table in legacy region - %04x:%04x\n", (= UINTN)Legacy16Table->OemIntSegment, (UINTN)Legacy16Table->OemIntOffset));=0D + DEBUG ((DEBUG_INFO, "OemInt table in legacy region - %04x:%04x\n", (= UINTN)Legacy16Table->OemIntSegment, (UINTN)Legacy16Table->OemIntOffset));=0D break;=0D }=0D =0D @@ -738,7 +738,7 @@ LegacyGetDataOrTable ( {=0D Legacy16Table->Oem32Segment =3D Regs.X.DS;=0D Legacy16Table->Oem32Offset =3D Regs.X.BX;=0D - DEBUG ((EFI_D_INFO, "Oem32 table in legacy region - %04x:%04x\n", (U= INTN)Legacy16Table->Oem32Segment, (UINTN)Legacy16Table->Oem32Offset));=0D + DEBUG ((DEBUG_INFO, "Oem32 table in legacy region - %04x:%04x\n", (U= INTN)Legacy16Table->Oem32Segment, (UINTN)Legacy16Table->Oem32Offset));=0D break;=0D }=0D =0D @@ -747,7 +747,7 @@ LegacyGetDataOrTable ( //=0D // Legacy16Table->Oem16Segment =3D Regs.X.DS;=0D // Legacy16Table->Oem16Offset =3D Regs.X.BX;=0D - DEBUG ((EFI_D_INFO, "Oem16 table in legacy region - %04x:%04x\n", (U= INTN)Legacy16Table->Oem16Segment, (UINTN)Legacy16Table->Oem16Offset));=0D + DEBUG ((DEBUG_INFO, "Oem16 table in legacy region - %04x:%04x\n", (U= INTN)Legacy16Table->Oem16Segment, (UINTN)Legacy16Table->Oem16Offset));=0D break;=0D }=0D =0D @@ -880,7 +880,7 @@ GenericLegacyBoot ( =0D Private =3D LEGACY_BIOS_INSTANCE_FROM_THIS (This);=0D DEBUG_CODE (=0D - DEBUG ((EFI_D_ERROR, "Start of legacy boot\n"));=0D + DEBUG ((DEBUG_ERROR, "Start of legacy boot\n"));=0D );=0D =0D Legacy16Table =3D Private->Legacy16Table;=0D @@ -943,7 +943,7 @@ GenericLegacyBoot ( Private->Legacy16Table->E820Pointer =3D (UINT32) (Regs.X.DS * 16 + Reg= s.X.BX);=0D Private->Legacy16Table->E820Length =3D (UINT32) CopySize;=0D if (Regs.X.AX !=3D 0) {=0D - DEBUG ((EFI_D_ERROR, "Legacy16 E820 length insufficient\n"));=0D + DEBUG ((DEBUG_ERROR, "Legacy16 E820 length insufficient\n"));=0D return EFI_OUT_OF_RESOURCES;=0D } else {=0D CopyMem (=0D @@ -965,7 +965,7 @@ GenericLegacyBoot ( // We do not ASSERT if SmbiosTable not found. It is possible that a plat= form does not produce SmbiosTable.=0D //=0D if (mReserveSmbiosEntryPoint =3D=3D 0) {=0D - DEBUG ((EFI_D_INFO, "Smbios table is not found!\n"));=0D + DEBUG ((DEBUG_INFO, "Smbios table is not found!\n"));=0D }=0D CreateSmbiosTableInReservedMemory ();=0D EfiToLegacy16BootTable->SmbiosTable =3D (UINT32)(UINTN)mReserveSmbiosEnt= ryPoint;=0D @@ -985,7 +985,7 @@ GenericLegacyBoot ( // We do not ASSERT if AcpiTable not found. It is possible that a platfo= rm does not produce AcpiTable.=0D //=0D if (AcpiTable =3D=3D NULL) {=0D - DEBUG ((EFI_D_INFO, "ACPI table is not found!\n"));=0D + DEBUG ((DEBUG_INFO, "ACPI table is not found!\n"));=0D }=0D EfiToLegacy16BootTable->AcpiTable =3D (UINT32)(UINTN)AcpiTable;=0D =0D @@ -1245,7 +1245,7 @@ GenericLegacyBoot ( // Here we could reduce UmaAddress down as far as Private->OptionRom, = taking into=0D // account the granularity of the access control.=0D //=0D - DEBUG((EFI_D_INFO, "Unlocking UMB RAM region 0x%x-0x%x\n", Private->Le= gacy16Table->UmaAddress,=0D + DEBUG((DEBUG_INFO, "Unlocking UMB RAM region 0x%x-0x%x\n", Private->Le= gacy16Table->UmaAddress,=0D Private->Legacy16Table->UmaAddress + Private->Lega= cy16Table->UmaSize));=0D =0D Private->LegacyRegion->UnLock (=0D @@ -1285,7 +1285,7 @@ GenericLegacyBoot ( (EFI_SOFTWARE_DXE_BS_DRIVER | EFI_SW_DXE_BS_PC_LEGACY_BOOT_EVENT)=0D );=0D =0D - DEBUG ((EFI_D_INFO, "Legacy INT19 Boot...\n"));=0D + DEBUG ((DEBUG_INFO, "Legacy INT19 Boot...\n"));=0D =0D //=0D // Disable DXE Timer while executing in real mode=0D @@ -1944,7 +1944,7 @@ LegacyBiosBuildE820 ( // Print DEBUG information=0D //=0D for (TempIndex =3D 0; TempIndex < Index; TempIndex++) {=0D - DEBUG((EFI_D_INFO, "E820[%2d]: 0x%016lx - 0x%016lx, Type =3D %d\n",=0D + DEBUG((DEBUG_INFO, "E820[%2d]: 0x%016lx - 0x%016lx, Type =3D %d\n",=0D TempIndex,=0D E820Table[TempIndex].BaseAddr,=0D (E820Table[TempIndex].BaseAddr + E820Table[TempIndex].Length),=0D diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c b/OvmfPkg/Csm/LegacyBios= Dxe/LegacyPci.c index 2656dafde9..746b366448 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c @@ -374,7 +374,7 @@ GetPciLegacyRom ( }=0D }=0D } else {=0D - DEBUG ((EFI_D_ERROR, "GetPciLegacyRom - OpRom not match (%04x-%04x= )\n", (UINTN)VendorId, (UINTN)DeviceId));=0D + DEBUG ((DEBUG_ERROR, "GetPciLegacyRom - OpRom not match (%04x-%04x= )\n", (UINTN)VendorId, (UINTN)DeviceId));=0D }=0D }=0D =0D @@ -752,7 +752,7 @@ Rotate (B,C,D,A) by 1 giving C,D,A,B. Translated PIRQ i= s C. // In case we fail to find the Bridge just above us, this is some potent= ial error and we want to warn the user=0D //=0D if(BridgeIndex >=3D NumberOfBridges){=0D - DEBUG ((EFI_D_ERROR, "Cannot Find IRQ Routing for Bus %d, Device %d, F= unction %d\n", *PciBus, *PciDevice, *PciFunction));=0D + DEBUG ((DEBUG_ERROR, "Cannot Find IRQ Routing for Bus %d, Device %d, F= unction %d\n", *PciBus, *PciDevice, *PciFunction));=0D }=0D =0D *PirqIndex =3D LocalPirqIndex;=0D @@ -823,9 +823,9 @@ CopyPirqTable ( =0D Private->Legacy16Table->IrqRoutingTablePointer =3D (UINT32) (Regs.X.DS= * 16 + Regs.X.BX);=0D if (Regs.X.AX !=3D 0) {=0D - DEBUG ((EFI_D_ERROR, "PIRQ table length insufficient - %x\n", PirqTa= bleSize));=0D + DEBUG ((DEBUG_ERROR, "PIRQ table length insufficient - %x\n", PirqTa= bleSize));=0D } else {=0D - DEBUG ((EFI_D_INFO, "PIRQ table in legacy region - %x\n", Private->L= egacy16Table->IrqRoutingTablePointer));=0D + DEBUG ((DEBUG_INFO, "PIRQ table in legacy region - %x\n", Private->L= egacy16Table->IrqRoutingTablePointer));=0D Private->Legacy16Table->IrqRoutingTableLength =3D (UINT32)PirqTableS= ize;=0D CopyMem (=0D (VOID *) (UINTN)Private->Legacy16Table->IrqRoutingTablePointer,=0D @@ -858,24 +858,24 @@ DumpPciHandle ( IN EFI_LEGACY_INSTALL_PCI_HANDLER *PciHandle=0D )=0D {=0D - DEBUG ((EFI_D_INFO, "PciBus - %02x\n", (UINTN)PciHandle->Pci= Bus));=0D - DEBUG ((EFI_D_INFO, "PciDeviceFun - %02x\n", (UINTN)PciHandle->Pci= DeviceFun));=0D - DEBUG ((EFI_D_INFO, "PciSegment - %02x\n", (UINTN)PciHandle->Pci= Segment));=0D - DEBUG ((EFI_D_INFO, "PciClass - %02x\n", (UINTN)PciHandle->Pci= Class));=0D - DEBUG ((EFI_D_INFO, "PciSubclass - %02x\n", (UINTN)PciHandle->Pci= Subclass));=0D - DEBUG ((EFI_D_INFO, "PciInterface - %02x\n", (UINTN)PciHandle->Pci= Interface));=0D -=0D - DEBUG ((EFI_D_INFO, "PrimaryIrq - %02x\n", (UINTN)PciHandle->Pri= maryIrq));=0D - DEBUG ((EFI_D_INFO, "PrimaryReserved - %02x\n", (UINTN)PciHandle->Pri= maryReserved));=0D - DEBUG ((EFI_D_INFO, "PrimaryControl - %04x\n", (UINTN)PciHandle->Pri= maryControl));=0D - DEBUG ((EFI_D_INFO, "PrimaryBase - %04x\n", (UINTN)PciHandle->Pri= maryBase));=0D - DEBUG ((EFI_D_INFO, "PrimaryBusMaster - %04x\n", (UINTN)PciHandle->Pri= maryBusMaster));=0D -=0D - DEBUG ((EFI_D_INFO, "SecondaryIrq - %02x\n", (UINTN)PciHandle->Sec= ondaryIrq));=0D - DEBUG ((EFI_D_INFO, "SecondaryReserved - %02x\n", (UINTN)PciHandle->Sec= ondaryReserved));=0D - DEBUG ((EFI_D_INFO, "SecondaryControl - %04x\n", (UINTN)PciHandle->Sec= ondaryControl));=0D - DEBUG ((EFI_D_INFO, "SecondaryBase - %04x\n", (UINTN)PciHandle->Sec= ondaryBase));=0D - DEBUG ((EFI_D_INFO, "SecondaryBusMaster - %04x\n", (UINTN)PciHandle->Sec= ondaryBusMaster));=0D + DEBUG ((DEBUG_INFO, "PciBus - %02x\n", (UINTN)PciHandle->Pci= Bus));=0D + DEBUG ((DEBUG_INFO, "PciDeviceFun - %02x\n", (UINTN)PciHandle->Pci= DeviceFun));=0D + DEBUG ((DEBUG_INFO, "PciSegment - %02x\n", (UINTN)PciHandle->Pci= Segment));=0D + DEBUG ((DEBUG_INFO, "PciClass - %02x\n", (UINTN)PciHandle->Pci= Class));=0D + DEBUG ((DEBUG_INFO, "PciSubclass - %02x\n", (UINTN)PciHandle->Pci= Subclass));=0D + DEBUG ((DEBUG_INFO, "PciInterface - %02x\n", (UINTN)PciHandle->Pci= Interface));=0D +=0D + DEBUG ((DEBUG_INFO, "PrimaryIrq - %02x\n", (UINTN)PciHandle->Pri= maryIrq));=0D + DEBUG ((DEBUG_INFO, "PrimaryReserved - %02x\n", (UINTN)PciHandle->Pri= maryReserved));=0D + DEBUG ((DEBUG_INFO, "PrimaryControl - %04x\n", (UINTN)PciHandle->Pri= maryControl));=0D + DEBUG ((DEBUG_INFO, "PrimaryBase - %04x\n", (UINTN)PciHandle->Pri= maryBase));=0D + DEBUG ((DEBUG_INFO, "PrimaryBusMaster - %04x\n", (UINTN)PciHandle->Pri= maryBusMaster));=0D +=0D + DEBUG ((DEBUG_INFO, "SecondaryIrq - %02x\n", (UINTN)PciHandle->Sec= ondaryIrq));=0D + DEBUG ((DEBUG_INFO, "SecondaryReserved - %02x\n", (UINTN)PciHandle->Sec= ondaryReserved));=0D + DEBUG ((DEBUG_INFO, "SecondaryControl - %04x\n", (UINTN)PciHandle->Sec= ondaryControl));=0D + DEBUG ((DEBUG_INFO, "SecondaryBase - %04x\n", (UINTN)PciHandle->Sec= ondaryBase));=0D + DEBUG ((DEBUG_INFO, "SecondaryBusMaster - %04x\n", (UINTN)PciHandle->Sec= ondaryBusMaster));=0D return;=0D }=0D =0D @@ -1254,7 +1254,7 @@ PciProgramAllInterruptLineRegisters ( // If it does return failure status, check your PIRQ routing table t= o see if some item is missing or incorrect=0D //=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "Translate Pirq Failed - Status =3D %r\n ", S= tatus));=0D + DEBUG ((DEBUG_ERROR, "Translate Pirq Failed - Status =3D %r\n ", S= tatus));=0D continue;=0D }=0D =0D @@ -2110,7 +2110,7 @@ LegacyBiosInstallVgaRom ( // This should be video thunk driver which is managing video devic= e=0D // So it need not start again=0D //=0D - DEBUG ((EFI_D_INFO, "Video thunk driver already start! Return!\n")= );=0D + DEBUG ((DEBUG_INFO, "Video thunk driver already start! Return!\n")= );=0D Private->VgaInstalled =3D TRUE;=0D return EFI_SUCCESS;=0D }=0D @@ -2321,7 +2321,7 @@ LegacyBiosInstallRom ( );=0D =0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RE= SOURCES (no more space for OpROM)\n", __LINE__));=0D + DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RE= SOURCES (no more space for OpROM)\n", __LINE__));=0D //=0D // Report Status Code to indicate that there is no enough space for = OpROM=0D //=0D @@ -2337,7 +2337,7 @@ LegacyBiosInstallRom ( //=0D RuntimeAddress =3D Private->OptionRom;=0D if (RuntimeAddress + *RuntimeImageLength > MaxRomAddr) {=0D - DEBUG ((EFI_D_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RE= SOURCES (no more space for OpROM)\n", __LINE__));=0D + DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RE= SOURCES (no more space for OpROM)\n", __LINE__));=0D gBS->FreePages (PhysicalAddress, EFI_SIZE_TO_PAGES (ImageSize));=0D //=0D // Report Status Code to indicate that there is no enough space for = OpROM=0D @@ -2355,7 +2355,7 @@ LegacyBiosInstallRom ( //=0D InitAddress =3D PCI_START_ADDRESS (Private->OptionRom);=0D if (InitAddress + ImageSize > MaxRomAddr) {=0D - DEBUG ((EFI_D_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RE= SOURCES (no more space for OpROM)\n", __LINE__));=0D + DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RE= SOURCES (no more space for OpROM)\n", __LINE__));=0D //=0D // Report Status Code to indicate that there is no enough space for = OpROM=0D //=0D @@ -2383,7 +2383,7 @@ LegacyBiosInstallRom ( &Granularity=0D );=0D =0D - DEBUG ((EFI_D_INFO, " Shadowing OpROM init/runtime/isize =3D %x/%x/%x\n"= , InitAddress, RuntimeAddress, ImageSize));=0D + DEBUG ((DEBUG_INFO, " Shadowing OpROM init/runtime/isize =3D %x/%x/%x\n"= , InitAddress, RuntimeAddress, ImageSize));=0D =0D CopyMem ((VOID *) InitAddress, RomImage, ImageSize);=0D =0D @@ -2501,7 +2501,7 @@ LegacyBiosInstallRom ( &Device,=0D &Function=0D );=0D - DEBUG ((EFI_D_INFO, "Shadowing OpROM on the PCI device %x/%x/%x\n", Bu= s, Device, Function));=0D + DEBUG ((DEBUG_INFO, "Shadowing OpROM on the PCI device %x/%x/%x\n", Bu= s, Device, Function));=0D }=0D =0D mIgnoreBbsUpdateFlag =3D FALSE;=0D @@ -2526,7 +2526,7 @@ LegacyBiosInstallRom ( // Otherwise, it may cause the system to hang in some cases=0D //=0D if (!EFI_ERROR (PciEnableStatus)) {=0D - DEBUG ((EFI_D_INFO, " Legacy16DispatchOprom - %02x/%02x/%02x\n", Bus, = Device, Function));=0D + DEBUG ((DEBUG_INFO, " Legacy16DispatchOprom - %02x/%02x/%02x\n", Bus, = Device, Function));=0D Private->LegacyBios.FarCall86 (=0D &Private->LegacyBios,=0D Private->Legacy16CallSegment,=0D @@ -2594,7 +2594,7 @@ LegacyBiosInstallRom ( *RuntimeImageLength =3D ((EFI_LEGACY_EXPANSION_ROM_HEADER *) RuntimeAd= dress)->Size512 * 512;=0D }=0D =0D - DEBUG ((EFI_D_INFO, " fsize =3D %x\n", *RuntimeImageLength));=0D + DEBUG ((DEBUG_INFO, " fsize =3D %x\n", *RuntimeImageLength));=0D =0D //=0D // If OpROM runs in 2.0 mode=0D diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacySio.c b/OvmfPkg/Csm/LegacyBios= Dxe/LegacySio.c index 17720a74f7..6b9bb5ed8b 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacySio.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacySio.c @@ -117,7 +117,7 @@ LegacyBiosBuildSioDataFromSio ( }=0D }=0D =0D - DEBUG ((EFI_D_INFO, "LegacySio: Address/Dma/Irq =3D %x/%d/%d\n", Addre= ss, Dma, Irq));=0D + DEBUG ((DEBUG_INFO, "LegacySio: Address/Dma/Irq =3D %x/%d/%d\n", Addre= ss, Dma, Irq));=0D =0D DevicePath =3D DevicePathFromHandle (HandleBuffer[Index]);=0D if (DevicePath =3D=3D NULL) {=0D diff --git a/OvmfPkg/Csm/LegacyBiosDxe/Thunk.c b/OvmfPkg/Csm/LegacyBiosDxe/= Thunk.c index 6432030a23..d9828bb2f8 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/Thunk.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/Thunk.c @@ -242,7 +242,7 @@ InternalLegacyBiosFarCall ( }=0D }=0D if (Count >=3D 2) {=0D - DEBUG ((EFI_D_ERROR, "ERROR: More than one HW interrupt active with = CSM enabled\n"));=0D + DEBUG ((DEBUG_ERROR, "ERROR: More than one HW interrupt active with = CSM enabled\n"));=0D }=0D ASSERT (Count < 2);=0D );=0D diff --git a/OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUi.c b/OvmfPkg= /Csm/LegacyBootMaintUiLib/LegacyBootMaintUi.c index 35470abf91..31e211a7b9 100644 --- a/OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUi.c +++ b/OvmfPkg/Csm/LegacyBootMaintUiLib/LegacyBootMaintUi.c @@ -808,7 +808,7 @@ UpdateLegacyDeviceOrderPage ( break;=0D =0D default:=0D - DEBUG ((EFI_D_ERROR, "Invalid command ID for updating page!\n"));=0D + DEBUG ((DEBUG_ERROR, "Invalid command ID for updating page!\n"));=0D return;=0D }=0D =0D diff --git a/OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c b/OvmfPkg/Csm/Lega= cyBootManagerLib/LegacyBm.c index 6ed45785be..cd0e02060f 100644 --- a/OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c +++ b/OvmfPkg/Csm/LegacyBootManagerLib/LegacyBm.c @@ -440,7 +440,7 @@ LegacyBmDeleteAllInvalidBootOptions ( =0D BbsIndex =3D LegacyBmFuzzyMatch (&BootOption[Index], BbsTable, BbsCoun= t, BbsIndexUsed);=0D if (BbsIndex =3D=3D BbsCount) {=0D - DEBUG ((EFI_D_INFO, "[LegacyBds] Delete Boot Option Boot%04x: %s\n",= (UINTN) BootOption[Index].OptionNumber, BootOption[Index].Description));=0D + DEBUG ((DEBUG_INFO, "[LegacyBds] Delete Boot Option Boot%04x: %s\n",= (UINTN) BootOption[Index].OptionNumber, BootOption[Index].Description));=0D //=0D // Delete entry from LegacyDevOrder=0D //=0D @@ -454,7 +454,7 @@ LegacyBmDeleteAllInvalidBootOptions ( EfiBootManagerDeleteLoadOptionVariable (BootOption[Index].OptionNumb= er, BootOption[Index].OptionType);=0D } else {=0D if (((LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOption[Index].OptionalDa= ta)->BbsIndex !=3D BbsIndex) {=0D - DEBUG ((EFI_D_INFO, "[LegacyBds] Update Boot Option Boot%04x: %s B= bs0x%04x->Bbs0x%04x\n", (UINTN) BootOption[Index].OptionNumber, BootOption[= Index].Description,=0D + DEBUG ((DEBUG_INFO, "[LegacyBds] Update Boot Option Boot%04x: %s B= bs0x%04x->Bbs0x%04x\n", (UINTN) BootOption[Index].OptionNumber, BootOption[= Index].Description,=0D (UINTN) ((LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOption[Ind= ex].OptionalData)->BbsIndex, (UINTN) BbsIndex));=0D //=0D // Update the BBS index in LegacyDevOrder=0D @@ -1506,7 +1506,7 @@ LegacyBmRefreshAllBootOption ( if (LegacyBmFindBootOption (&BootOptions[Index], ExistingBootOptions, = ExistingBootOptionCount) =3D=3D -1) {=0D Status =3D EfiBootManagerAddLoadOptionVariable (&BootOptions[Index],= (UINTN) -1);=0D DEBUG ((=0D - EFI_D_INFO, "[LegacyBds] New Boot Option: Boot%04x Bbs0x%04x %s %r= \n",=0D + DEBUG_INFO, "[LegacyBds] New Boot Option: Boot%04x Bbs0x%04x %s %r= \n",=0D (UINTN) BootOptions[Index].OptionNumber,=0D (UINTN) ((LEGACY_BM_BOOT_OPTION_BBS_DATA *) BootOptions[Index].Opt= ionalData)->BbsIndex,=0D BootOptions[Index].Description,=0D diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c b/OvmfPkg/EmuVariableFv= bRuntimeDxe/Fvb.c index b6c6abef1e..766ad1e59f 100644 --- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c +++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c @@ -579,7 +579,7 @@ ValidateFvHeader ( (FwVolHeader->FvLength !=3D EMU_FVB_SIZE) ||=0D (FwVolHeader->HeaderLength !=3D EMU_FV_HEADER_LENGTH)=0D ) {=0D - DEBUG ((EFI_D_INFO, "EMU Variable FVB: Basic FV headers were invalid\n= "));=0D + DEBUG ((DEBUG_INFO, "EMU Variable FVB: Basic FV headers were invalid\n= "));=0D return EFI_NOT_FOUND;=0D }=0D //=0D @@ -588,7 +588,7 @@ ValidateFvHeader ( Checksum =3D CalculateSum16((VOID*) FwVolHeader, FwVolHeader->HeaderLeng= th);=0D =0D if (Checksum !=3D 0) {=0D - DEBUG ((EFI_D_INFO, "EMU Variable FVB: FV checksum was invalid\n"));=0D + DEBUG ((DEBUG_INFO, "EMU Variable FVB: FV checksum was invalid\n"));=0D return EFI_NOT_FOUND;=0D }=0D =0D @@ -719,7 +719,7 @@ FvbInitialize ( EFI_PHYSICAL_ADDRESS Address;=0D RETURN_STATUS PcdStatus;=0D =0D - DEBUG ((EFI_D_INFO, "EMU Variable FVB Started\n"));=0D + DEBUG ((DEBUG_INFO, "EMU Variable FVB Started\n"));=0D =0D //=0D // Verify that the PCD's are set correctly.=0D @@ -732,12 +732,12 @@ FvbInitialize ( ) >=0D EMU_FVB_NUM_SPARE_BLOCKS * EMU_FVB_BLOCK_SIZE=0D ) {=0D - DEBUG ((EFI_D_ERROR, "EMU Variable invalid PCD sizes\n"));=0D + DEBUG ((DEBUG_ERROR, "EMU Variable invalid PCD sizes\n"));=0D return EFI_INVALID_PARAMETER;=0D }=0D =0D if (PcdGet64 (PcdFlashNvStorageVariableBase64) !=3D 0) {=0D - DEBUG ((EFI_D_INFO, "Disabling EMU Variable FVB since "=0D + DEBUG ((DEBUG_INFO, "Disabling EMU Variable FVB since "=0D "flash variables appear to be supported.\n"));=0D return EFI_ABORTED;=0D }=0D @@ -754,13 +754,13 @@ FvbInitialize ( if (PcdGet64 (PcdEmuVariableNvStoreReserved) !=3D 0) {=0D Ptr =3D (VOID*)(UINTN) PcdGet64 (PcdEmuVariableNvStoreReserved);=0D DEBUG ((=0D - EFI_D_INFO,=0D + DEBUG_INFO,=0D "EMU Variable FVB: Using pre-reserved block at %p\n",=0D Ptr=0D ));=0D Status =3D ValidateFvHeader (Ptr);=0D if (!EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_INFO, "EMU Variable FVB: Found valid pre-existing FV\n= "));=0D + DEBUG ((DEBUG_INFO, "EMU Variable FVB: Found valid pre-existing FV\n= "));=0D Initialize =3D FALSE;=0D }=0D } else {=0D @@ -806,7 +806,7 @@ FvbInitialize ( //=0D // Install the protocols=0D //=0D - DEBUG ((EFI_D_INFO, "Installing FVB for EMU Variable support\n"));=0D + DEBUG ((DEBUG_INFO, "Installing FVB for EMU Variable support\n"));=0D Handle =3D 0;=0D Status =3D gBS->InstallMultipleProtocolInterfaces (=0D &Handle,=0D diff --git a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceS= upport.c b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSup= port.c index 21b49a8753..53c768167d 100644 --- a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c +++ b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSupport.c @@ -233,7 +233,7 @@ CheckDevice ( //=0D *Configuration =3D AllocateCopyPool (sizeof mConfiguration, &mConfigurat= ion);=0D if (*Configuration =3D=3D NULL) {=0D - DEBUG ((EFI_D_WARN,=0D + DEBUG ((DEBUG_WARN,=0D "%a: 64-bit MMIO BARs may be degraded for PCI 0x%04x:0x%04x (rev %d)= \n",=0D __FUNCTION__, (UINT32)VendorId, (UINT32)DeviceId, (UINT8)RevisionId)= );=0D return EFI_OUT_OF_RESOURCES;=0D diff --git a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c b/OvmfPkg/Libr= ary/AcpiTimerLib/BaseAcpiTimerLib.c index aa2b5faf1c..7c593e8be1 100644 --- a/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c +++ b/OvmfPkg/Library/AcpiTimerLib/BaseAcpiTimerLib.c @@ -56,7 +56,7 @@ AcpiTimerLibConstructor ( AcpiEnBit =3D ICH9_ACPI_CNTL_ACPI_EN;=0D break;=0D default:=0D - DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",= =0D + DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",= =0D __FUNCTION__, HostBridgeDevId));=0D ASSERT (FALSE);=0D return RETURN_UNSUPPORTED;=0D diff --git a/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c b/OvmfPkg/L= ibrary/AcpiTimerLib/BaseRomAcpiTimerLib.c index dd022aceed..52f3ea2dbf 100644 --- a/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c +++ b/OvmfPkg/Library/AcpiTimerLib/BaseRomAcpiTimerLib.c @@ -54,7 +54,7 @@ AcpiTimerLibConstructor ( AcpiEnBit =3D ICH9_ACPI_CNTL_ACPI_EN;=0D break;=0D default:=0D - DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",= =0D + DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",= =0D __FUNCTION__, HostBridgeDevId));=0D ASSERT (FALSE);=0D return RETURN_UNSUPPORTED;=0D @@ -108,7 +108,7 @@ InternalAcpiGetTimerTick ( Pmba =3D POWER_MGMT_REGISTER_Q35 (ICH9_PMBASE);=0D break;=0D default:=0D - DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",= =0D + DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",= =0D __FUNCTION__, HostBridgeDevId));=0D ASSERT (FALSE);=0D return 0;=0D diff --git a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c b/OvmfPkg/Libra= ry/AcpiTimerLib/DxeAcpiTimerLib.c index ae976cbe9e..09076c0ade 100644 --- a/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c +++ b/OvmfPkg/Library/AcpiTimerLib/DxeAcpiTimerLib.c @@ -51,7 +51,7 @@ AcpiTimerLibConstructor ( Pmba =3D POWER_MGMT_REGISTER_Q35 (ICH9_PMBASE);=0D break;=0D default:=0D - DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",= =0D + DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",= =0D __FUNCTION__, HostBridgeDevId));=0D ASSERT (FALSE);=0D return RETURN_UNSUPPORTED;=0D diff --git a/OvmfPkg/Library/LoadLinuxLib/Linux.c b/OvmfPkg/Library/LoadLin= uxLib/Linux.c index 318e36ff11..c5022f6636 100644 --- a/OvmfPkg/Library/LoadLinuxLib/Linux.c +++ b/OvmfPkg/Library/LoadLinuxLib/Linux.c @@ -137,7 +137,7 @@ LoadLinuxInitializeKernelSetup ( //=0D ZeroMem (KernelSetup, 0x1f1);=0D ZeroMem (((UINT8 *)KernelSetup) + SetupEnd, 4096 - SetupEnd);=0D - DEBUG ((EFI_D_INFO, "Cleared kernel setup 0-0x1f1, 0x%Lx-0x1000\n",=0D + DEBUG ((DEBUG_INFO, "Cleared kernel setup 0-0x1f1, 0x%Lx-0x1000\n",=0D (UINT64)SetupEnd));=0D =0D return EFI_SUCCESS;=0D @@ -338,7 +338,7 @@ SetupLinuxMemmap ( =0D default:=0D DEBUG ((=0D - EFI_D_ERROR,=0D + DEBUG_ERROR,=0D "Invalid EFI memory descriptor type (0x%x)!\n",=0D MemoryMap->Type=0D ));=0D @@ -643,7 +643,7 @@ LoadLinux ( Bp->hdr.code32_start =3D (UINT32)(UINTN) Kernel;=0D if (Bp->hdr.version >=3D 0x20c && Bp->hdr.handover_offset &&=0D (Bp->hdr.xloadflags & (sizeof (UINTN) =3D=3D 4 ? BIT2 : BIT3))) {=0D - DEBUG ((EFI_D_INFO, "Jumping to kernel EFI handover point at ofs %x\n"= , Bp->hdr.handover_offset));=0D + DEBUG ((DEBUG_INFO, "Jumping to kernel EFI handover point at ofs %x\n"= , Bp->hdr.handover_offset));=0D =0D DisableInterrupts ();=0D JumpToUefiKernel ((VOID*) gImageHandle, (VOID*) gST, KernelSetup, Kern= el);=0D @@ -654,7 +654,7 @@ LoadLinux ( //=0D SetupLinuxBootParams (KernelSetup);=0D =0D - DEBUG ((EFI_D_INFO, "Jumping to kernel\n"));=0D + DEBUG ((DEBUG_INFO, "Jumping to kernel\n"));=0D DisableInterrupts ();=0D SetLinuxDescriptorTables ();=0D JumpToKernel (Kernel, (VOID*) KernelSetup);=0D diff --git a/OvmfPkg/Library/NvVarsFileLib/FsAccess.c b/OvmfPkg/Library/NvV= arsFileLib/FsAccess.c index 627a15abd2..2ba03522fb 100644 --- a/OvmfPkg/Library/NvVarsFileLib/FsAccess.c +++ b/OvmfPkg/Library/NvVarsFileLib/FsAccess.c @@ -228,7 +228,7 @@ ReadNvVarsFile ( =0D Status =3D GetNvVarsFile (FsHandle, TRUE, &File);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_INFO, "FsAccess.c: Could not open NV Variables file on t= his file system\n"));=0D + DEBUG ((DEBUG_INFO, "FsAccess.c: Could not open NV Variables file on t= his file system\n"));=0D return Status;=0D }=0D =0D @@ -245,7 +245,7 @@ ReadNvVarsFile ( }=0D =0D DEBUG ((=0D - EFI_D_INFO,=0D + DEBUG_INFO,=0D "FsAccess.c: Read %Lu bytes from NV Variables file\n",=0D (UINT64)FileSize=0D ));=0D @@ -317,7 +317,7 @@ LoadNvVarsFromFs ( BOOLEAN VarData;=0D UINTN Size;=0D =0D - DEBUG ((EFI_D_INFO, "FsAccess.c: LoadNvVarsFromFs\n"));=0D + DEBUG ((DEBUG_INFO, "FsAccess.c: LoadNvVarsFromFs\n"));=0D =0D //=0D // We write a variable to indicate we've already loaded the=0D @@ -338,7 +338,7 @@ LoadNvVarsFromFs ( (VOID*) &VarData=0D );=0D if (Status =3D=3D EFI_SUCCESS) {=0D - DEBUG ((EFI_D_INFO, "NV Variables were already loaded\n"));=0D + DEBUG ((DEBUG_INFO, "NV Variables were already loaded\n"));=0D return EFI_ALREADY_STARTED;=0D }=0D =0D @@ -347,7 +347,7 @@ LoadNvVarsFromFs ( //=0D Status =3D ReadNvVarsFile (FsHandle);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_INFO, "Error while restoring NV variable data\n"));=0D + DEBUG ((DEBUG_INFO, "Error while restoring NV variable data\n"));=0D return Status;=0D }=0D =0D @@ -359,7 +359,7 @@ LoadNvVarsFromFs ( SetNvVarsVariable();=0D =0D DEBUG ((=0D - EFI_D_INFO,=0D + DEBUG_INFO,=0D "FsAccess.c: Read NV Variables file (size=3D%Lu)\n",=0D (UINT64)Size=0D ));=0D @@ -469,7 +469,7 @@ SaveNvVarsToFs ( //=0D Status =3D GetNvVarsFile (FsHandle, FALSE, &File);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_INFO, "FsAccess.c: Unable to open file to saved NV Varia= bles\n"));=0D + DEBUG ((DEBUG_INFO, "FsAccess.c: Unable to open file to saved NV Varia= bles\n"));=0D return Status;=0D }=0D =0D @@ -498,7 +498,7 @@ SaveNvVarsToFs ( //=0D SetNvVarsVariable();=0D =0D - DEBUG ((EFI_D_INFO, "Saved NV Variables to NvVars file\n"));=0D + DEBUG ((DEBUG_INFO, "Saved NV Variables to NvVars file\n"));=0D }=0D =0D return Status;=0D diff --git a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c b/OvmfPkg/= Library/PciHostBridgeLib/PciHostBridgeLib.c index ec2385b75b..e850f7d183 100644 --- a/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c +++ b/OvmfPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c @@ -152,13 +152,13 @@ InitRootBridge ( DevicePath =3D AllocateCopyPool (sizeof mRootBridgeDevicePathTemplate,=0D &mRootBridgeDevicePathTemplate);=0D if (DevicePath =3D=3D NULL) {=0D - DEBUG ((EFI_D_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));= =0D + DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));= =0D return EFI_OUT_OF_RESOURCES;=0D }=0D DevicePath->AcpiDevicePath.UID =3D RootBusNumber;=0D RootBus->DevicePath =3D (EFI_DEVICE_PATH_PROTOCOL *)DevicePath;=0D =0D - DEBUG ((EFI_D_INFO,=0D + DEBUG ((DEBUG_INFO,=0D "%a: populated root bus %d, with room for %d subordinate bus(es)\n",=0D __FUNCTION__, RootBusNumber, MaxSubBusNumber - RootBusNumber));=0D return EFI_SUCCESS;=0D @@ -256,11 +256,11 @@ PciHostBridgeGetRootBridges ( QemuFwCfgReadBytes (FwCfgSize, &ExtraRootBridges);=0D =0D if (ExtraRootBridges > PCI_MAX_BUS) {=0D - DEBUG ((EFI_D_ERROR, "%a: invalid count of extra root buses (%Lu) "= =0D + DEBUG ((DEBUG_ERROR, "%a: invalid count of extra root buses (%Lu) "= =0D "reported by QEMU\n", __FUNCTION__, ExtraRootBridges));=0D return NULL;=0D }=0D - DEBUG ((EFI_D_INFO, "%a: %Lu extra root buses reported by QEMU\n",=0D + DEBUG ((DEBUG_INFO, "%a: %Lu extra root buses reported by QEMU\n",=0D __FUNCTION__, ExtraRootBridges));=0D }=0D =0D @@ -269,7 +269,7 @@ PciHostBridgeGetRootBridges ( //=0D Bridges =3D AllocatePool ((1 + (UINTN)ExtraRootBridges) * sizeof *Bridge= s);=0D if (Bridges =3D=3D NULL) {=0D - DEBUG ((EFI_D_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));= =0D + DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES));= =0D return NULL;=0D }=0D Initialized =3D 0;=0D @@ -409,22 +409,22 @@ PciHostBridgeResourceConflict ( {=0D EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *Descriptor;=0D UINTN RootBridgeIndex;=0D - DEBUG ((EFI_D_ERROR, "PciHostBridge: Resource conflict happens!\n"));=0D + DEBUG ((DEBUG_ERROR, "PciHostBridge: Resource conflict happens!\n"));=0D =0D RootBridgeIndex =3D 0;=0D Descriptor =3D (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR *) Configuration;=0D while (Descriptor->Desc =3D=3D ACPI_ADDRESS_SPACE_DESCRIPTOR) {=0D - DEBUG ((EFI_D_ERROR, "RootBridge[%d]:\n", RootBridgeIndex++));=0D + DEBUG ((DEBUG_ERROR, "RootBridge[%d]:\n", RootBridgeIndex++));=0D for (; Descriptor->Desc =3D=3D ACPI_ADDRESS_SPACE_DESCRIPTOR; Descript= or++) {=0D ASSERT (Descriptor->ResType <=0D ARRAY_SIZE (mPciHostBridgeLibAcpiAddressSpaceTypeStr)=0D );=0D - DEBUG ((EFI_D_ERROR, " %s: Length/Alignment =3D 0x%lx / 0x%lx\n",=0D + DEBUG ((DEBUG_ERROR, " %s: Length/Alignment =3D 0x%lx / 0x%lx\n",=0D mPciHostBridgeLibAcpiAddressSpaceTypeStr[Descriptor->ResType= ],=0D Descriptor->AddrLen, Descriptor->AddrRangeMax=0D ));=0D if (Descriptor->ResType =3D=3D ACPI_ADDRESS_SPACE_TYPE_MEM) {=0D - DEBUG ((EFI_D_ERROR, " Granularity/SpecificFlag =3D %ld / %02x= %s\n",=0D + DEBUG ((DEBUG_ERROR, " Granularity/SpecificFlag =3D %ld / %02x= %s\n",=0D Descriptor->AddrSpaceGranularity, Descriptor->SpecificFlag= ,=0D ((Descriptor->SpecificFlag &=0D EFI_ACPI_MEMORY_RESOURCE_SPECIFIC_FLAG_CACHEABLE_PREFETC= HABLE=0D diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg= /Library/PlatformBootManagerLib/BdsPlatform.c index 45d0ee9cc3..05cf28b33a 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c @@ -252,7 +252,7 @@ RemoveStaleFvFileOptions ( DevicePathString =3D ConvertDevicePathToText(BootOptions[Index].File= Path,=0D FALSE, FALSE);=0D DEBUG ((=0D - EFI_ERROR (Status) ? EFI_D_WARN : EFI_D_VERBOSE,=0D + EFI_ERROR (Status) ? DEBUG_WARN : EFI_D_VERBOSE,=0D "%a: removing stale Boot#%04x %s: %r\n",=0D __FUNCTION__,=0D (UINT32)BootOptions[Index].OptionNumber,=0D @@ -356,7 +356,7 @@ PlatformBootManagerBeforeConsole ( UINT16 FrontPageTimeout;=0D RETURN_STATUS PcdStatus;=0D =0D - DEBUG ((EFI_D_INFO, "PlatformBootManagerBeforeConsole\n"));=0D + DEBUG ((DEBUG_INFO, "PlatformBootManagerBeforeConsole\n"));=0D InstallDevicePathCallback ();=0D =0D VisitAllInstancesOfProtocol (&gEfiPciRootBridgeIoProtocolGuid,=0D @@ -610,7 +610,7 @@ PrepareLpcBridgeDevicePath ( DevPathStr =3D ConvertDevicePathToText (DevicePath, FALSE, FALSE);=0D if (DevPathStr !=3D NULL) {=0D DEBUG((=0D - EFI_D_INFO,=0D + DEBUG_INFO,=0D "BdsPlatform.c+%d: COM%d DevPath: %s\n",=0D __LINE__,=0D gPnp16550ComPortDeviceNode.UID + 1,=0D @@ -642,7 +642,7 @@ PrepareLpcBridgeDevicePath ( DevPathStr =3D ConvertDevicePathToText (DevicePath, FALSE, FALSE);=0D if (DevPathStr !=3D NULL) {=0D DEBUG((=0D - EFI_D_INFO,=0D + DEBUG_INFO,=0D "BdsPlatform.c+%d: COM%d DevPath: %s\n",=0D __LINE__,=0D gPnp16550ComPortDeviceNode.UID + 1,=0D @@ -966,7 +966,7 @@ DetectAndPreparePlatformPciDevicePath ( // Add IsaKeyboard to ConIn,=0D // add IsaSerial to ConOut, ConIn, ErrOut=0D //=0D - DEBUG ((EFI_D_INFO, "Found LPC Bridge device\n"));=0D + DEBUG ((DEBUG_INFO, "Found LPC Bridge device\n"));=0D PrepareLpcBridgeDevicePath (Handle);=0D return EFI_SUCCESS;=0D }=0D @@ -977,7 +977,7 @@ DetectAndPreparePlatformPciDevicePath ( //=0D // Add them to ConOut, ConIn, ErrOut.=0D //=0D - DEBUG ((EFI_D_INFO, "Found PCI 16550 SERIAL device\n"));=0D + DEBUG ((DEBUG_INFO, "Found PCI 16550 SERIAL device\n"));=0D PreparePciSerialDevicePath (Handle);=0D return EFI_SUCCESS;=0D }=0D @@ -989,7 +989,7 @@ DetectAndPreparePlatformPciDevicePath ( //=0D // Add them to ConOut.=0D //=0D - DEBUG ((EFI_D_INFO, "Found PCI display device\n"));=0D + DEBUG ((DEBUG_INFO, "Found PCI display device\n"));=0D PreparePciDisplayDevicePath (Handle);=0D return EFI_SUCCESS;=0D }=0D @@ -1118,7 +1118,7 @@ SetPciIntLine ( }=0D if (RootBusNumber =3D=3D 0 && RootSlot =3D=3D 0) {=0D DEBUG((=0D - EFI_D_ERROR,=0D + DEBUG_ERROR,=0D "%a: PCI host bridge (00:00.0) should have no interrupts!\n",=0D __FUNCTION__=0D ));=0D @@ -1237,7 +1237,7 @@ PciAcpiInitialization ( //=0D return;=0D }=0D - DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",= =0D + DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",= =0D __FUNCTION__, mHostBridgeDevId));=0D ASSERT (FALSE);=0D return;=0D @@ -1287,7 +1287,7 @@ ConnectRecursivelyIfPciMassStorage ( DevPathStr =3D ConvertDevicePathToText (DevicePath, FALSE, FALSE);=0D if (DevPathStr !=3D NULL) {=0D DEBUG((=0D - EFI_D_INFO,=0D + DEBUG_INFO,=0D "Found %s device: %s\n",=0D (IS_CLASS1 (PciHeader, PCI_CLASS_MASS_STORAGE) ?=0D L"Mass Storage" :=0D @@ -1324,7 +1324,7 @@ EmuVariablesUpdatedCallback ( IN VOID *Context=0D )=0D {=0D - DEBUG ((EFI_D_INFO, "EmuVariablesUpdatedCallback\n"));=0D + DEBUG ((DEBUG_INFO, "EmuVariablesUpdatedCallback\n"));=0D UpdateNvVarsOnFileSystem ();=0D }=0D =0D @@ -1393,7 +1393,7 @@ PlatformBdsConnectSequence ( UINTN Index;=0D RETURN_STATUS Status;=0D =0D - DEBUG ((EFI_D_INFO, "PlatformBdsConnectSequence\n"));=0D + DEBUG ((DEBUG_INFO, "PlatformBdsConnectSequence\n"));=0D =0D Index =3D 0;=0D =0D @@ -1473,10 +1473,10 @@ PlatformBootManagerAfterConsole ( {=0D EFI_BOOT_MODE BootMode;=0D =0D - DEBUG ((EFI_D_INFO, "PlatformBootManagerAfterConsole\n"));=0D + DEBUG ((DEBUG_INFO, "PlatformBootManagerAfterConsole\n"));=0D =0D if (PcdGetBool (PcdOvmfFlashVariablesEnable)) {=0D - DEBUG ((EFI_D_INFO, "PlatformBdsPolicyBehavior: not restoring NvVars "= =0D + DEBUG ((DEBUG_INFO, "PlatformBdsPolicyBehavior: not restoring NvVars "= =0D "from disk since flash variables appear to be supported.\n"));=0D } else {=0D //=0D @@ -1629,7 +1629,7 @@ InstallDevicePathCallback ( VOID=0D )=0D {=0D - DEBUG ((EFI_D_INFO, "Registered NotifyDevPath Event\n"));=0D + DEBUG ((DEBUG_INFO, "Registered NotifyDevPath Event\n"));=0D mEfiDevPathEvent =3D EfiCreateProtocolNotifyEvent (=0D &gEfiDevicePathProtocolGuid,=0D TPL_CALLBACK,=0D diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c b/OvmfPkg/Library/= QemuFwCfgLib/QemuFwCfgDxe.c index 983680f8b6..0182c9235c 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgDxe.c @@ -66,14 +66,14 @@ QemuFwCfgInitialize ( =0D QemuFwCfgSelectItem (QemuFwCfgItemSignature);=0D Signature =3D QemuFwCfgRead32 ();=0D - DEBUG ((EFI_D_INFO, "FW CFG Signature: 0x%x\n", Signature));=0D + DEBUG ((DEBUG_INFO, "FW CFG Signature: 0x%x\n", Signature));=0D QemuFwCfgSelectItem (QemuFwCfgItemInterfaceVersion);=0D Revision =3D QemuFwCfgRead32 ();=0D - DEBUG ((EFI_D_INFO, "FW CFG Revision: 0x%x\n", Revision));=0D + DEBUG ((DEBUG_INFO, "FW CFG Revision: 0x%x\n", Revision));=0D if ((Signature !=3D SIGNATURE_32 ('Q', 'E', 'M', 'U')) ||=0D (Revision < 1)=0D ) {=0D - DEBUG ((EFI_D_INFO, "QemuFwCfg interface not supported.\n"));=0D + DEBUG ((DEBUG_INFO, "QemuFwCfg interface not supported.\n"));=0D mQemuFwCfgSupported =3D FALSE;=0D return RETURN_SUCCESS;=0D }=0D diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c b/OvmfPkg/Library/= QemuFwCfgLib/QemuFwCfgLib.c index 4d2c43cb8f..4ef78b7a8b 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgLib.c @@ -35,7 +35,7 @@ QemuFwCfgSelectItem ( IN FIRMWARE_CONFIG_ITEM QemuFwCfgItem=0D )=0D {=0D - DEBUG ((EFI_D_INFO, "Select Item: 0x%x\n", (UINT16)(UINTN) QemuFwCfgItem= ));=0D + DEBUG ((DEBUG_INFO, "Select Item: 0x%x\n", (UINT16)(UINTN) QemuFwCfgItem= ));=0D IoWrite16 (FW_CFG_IO_SELECTOR, (UINT16)(UINTN) QemuFwCfgItem);=0D }=0D =0D diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c b/OvmfPkg/Library/= QemuFwCfgLib/QemuFwCfgPei.c index d07b1714c2..ecabd88fab 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgPei.c @@ -59,14 +59,14 @@ QemuFwCfgInitialize ( =0D QemuFwCfgSelectItem (QemuFwCfgItemSignature);=0D Signature =3D QemuFwCfgRead32 ();=0D - DEBUG ((EFI_D_INFO, "FW CFG Signature: 0x%x\n", Signature));=0D + DEBUG ((DEBUG_INFO, "FW CFG Signature: 0x%x\n", Signature));=0D QemuFwCfgSelectItem (QemuFwCfgItemInterfaceVersion);=0D Revision =3D QemuFwCfgRead32 ();=0D - DEBUG ((EFI_D_INFO, "FW CFG Revision: 0x%x\n", Revision));=0D + DEBUG ((DEBUG_INFO, "FW CFG Revision: 0x%x\n", Revision));=0D if ((Signature !=3D SIGNATURE_32 ('Q', 'E', 'M', 'U')) ||=0D (Revision < 1)=0D ) {=0D - DEBUG ((EFI_D_INFO, "QemuFwCfg interface not supported.\n"));=0D + DEBUG ((DEBUG_INFO, "QemuFwCfg interface not supported.\n"));=0D mQemuFwCfgSupported =3D FALSE;=0D return RETURN_SUCCESS;=0D }=0D diff --git a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSec.c b/OvmfPkg/Library/= QemuFwCfgLib/QemuFwCfgSec.c index d7a44e5897..94e8e92180 100644 --- a/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSec.c +++ b/OvmfPkg/Library/QemuFwCfgLib/QemuFwCfgSec.c @@ -38,18 +38,18 @@ QemuFwCfgIsAvailable ( =0D QemuFwCfgSelectItem (QemuFwCfgItemSignature);=0D Signature =3D QemuFwCfgRead32 ();=0D - DEBUG ((EFI_D_INFO, "FW CFG Signature: 0x%x\n", Signature));=0D + DEBUG ((DEBUG_INFO, "FW CFG Signature: 0x%x\n", Signature));=0D QemuFwCfgSelectItem (QemuFwCfgItemInterfaceVersion);=0D Revision =3D QemuFwCfgRead32 ();=0D - DEBUG ((EFI_D_INFO, "FW CFG Revision: 0x%x\n", Revision));=0D + DEBUG ((DEBUG_INFO, "FW CFG Revision: 0x%x\n", Revision));=0D if ((Signature !=3D SIGNATURE_32 ('Q', 'E', 'M', 'U')) ||=0D (Revision < 1)=0D ) {=0D - DEBUG ((EFI_D_INFO, "QemuFwCfg interface not supported.\n"));=0D + DEBUG ((DEBUG_INFO, "QemuFwCfg interface not supported.\n"));=0D return FALSE;=0D }=0D =0D - DEBUG ((EFI_D_INFO, "QemuFwCfg interface is supported.\n"));=0D + DEBUG ((DEBUG_INFO, "QemuFwCfg interface is supported.\n"));=0D return TRUE;=0D }=0D =0D diff --git a/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c = b/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c index a6cebcb54f..777b93f1a0 100644 --- a/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c +++ b/OvmfPkg/Library/SerializeVariablesLib/SerializeVariablesLib.c @@ -211,7 +211,7 @@ IterateVariablesInBuffer ( //=0D if (TotalSizeUsed !=3D MaxSize) {=0D DEBUG ((=0D - EFI_D_ERROR,=0D + DEBUG_ERROR,=0D "Deserialize variables error: TotalSizeUsed(%Lu) !=3D MaxSize(%Lu)\n= ",=0D (UINT64)TotalSizeUsed,=0D (UINT64)MaxSize=0D diff --git a/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c b/Ov= mfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c index 24ec7cd19b..4d2c23cfb3 100644 --- a/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c +++ b/OvmfPkg/Library/SmbiosVersionLib/DetectSmbiosVersionLib.c @@ -80,7 +80,7 @@ DetectSmbiosVersion ( SmbiosVersion =3D (UINT16)(QemuAnchor.V3.MajorVersion << 8 |=0D QemuAnchor.V3.MinorVersion);=0D =0D - DEBUG ((EFI_D_INFO, "%a: SMBIOS 3.x DocRev from QEMU: 0x%02x\n",=0D + DEBUG ((DEBUG_INFO, "%a: SMBIOS 3.x DocRev from QEMU: 0x%02x\n",=0D __FUNCTION__, QemuAnchor.V3.DocRev));=0D PcdStatus =3D PcdSet8S (PcdSmbiosDocRev, QemuAnchor.V3.DocRev);=0D ASSERT_RETURN_ERROR (PcdStatus);=0D @@ -90,7 +90,7 @@ DetectSmbiosVersion ( return RETURN_SUCCESS;=0D }=0D =0D - DEBUG ((EFI_D_INFO, "%a: SMBIOS version from QEMU: 0x%04x\n", __FUNCTION= __,=0D + DEBUG ((DEBUG_INFO, "%a: SMBIOS version from QEMU: 0x%04x\n", __FUNCTION= __,=0D SmbiosVersion));=0D PcdStatus =3D PcdSet16S (PcdSmbiosVersion, SmbiosVersion);=0D ASSERT_RETURN_ERROR (PcdStatus);=0D diff --git a/OvmfPkg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.c b/OvmfP= kg/Library/VirtioMmioDeviceLib/VirtioMmioDevice.c index d5bed3546d..2f20272c14 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 Ven= dorId.=0D // They return a value of 0x0 for the VendorId.=0D //=0D - DEBUG((EFI_D_WARN, "VirtioMmioInit: Warning: The VendorId (0x%X) does = not "=0D + DEBUG((DEBUG_WARN, "VirtioMmioInit: Warning: The VendorId (0x%X) does = not "=0D "match the VirtIo VendorId (0x%X).\n",=0D VendorId, VIRTIO_VENDOR_ID));=0D }=0D diff --git a/OvmfPkg/Library/XenHypercallLib/XenHypercall.c b/OvmfPkg/Libra= ry/XenHypercallLib/XenHypercall.c index d4fa802743..265aa766d0 100644 --- a/OvmfPkg/Library/XenHypercallLib/XenHypercall.c +++ b/OvmfPkg/Library/XenHypercallLib/XenHypercall.c @@ -45,7 +45,7 @@ XenHypercallHvmGetParam ( Error =3D XenHypercall2 (__HYPERVISOR_hvm_op,=0D HVMOP_get_param, (INTN) &Parameter);=0D if (Error !=3D 0) {=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "XenHypercall: Error %Ld trying to get HVM parameter %d\n",=0D (INT64)Error, Index));=0D return 0;=0D diff --git a/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c b/OvmfPkg/Library/= XenIoMmioLib/XenIoMmioLib.c index 154e4fdeb7..ae4ea0309a 100644 --- a/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c +++ b/OvmfPkg/Library/XenIoMmioLib/XenIoMmioLib.c @@ -88,7 +88,7 @@ XenIoMmioInstall ( XenBusDevicePath =3D AllocateCopyPool (sizeof *XenBusDevicePath,=0D &mXenBusRootDevicePathTemplate);=0D if (!XenBusDevicePath) {=0D - DEBUG ((EFI_D_ERROR, "%a: Out of memory\n", __FUNCTION__));=0D + DEBUG ((DEBUG_ERROR, "%a: Out of memory\n", __FUNCTION__));=0D Status =3D EFI_OUT_OF_RESOURCES;=0D goto FreeXenIo;=0D }=0D @@ -103,7 +103,7 @@ XenIoMmioInstall ( return EFI_SUCCESS;=0D }=0D =0D - DEBUG ((EFI_D_ERROR, "%a: Failed to install the EFI_DEVICE_PATH and "=0D + DEBUG ((DEBUG_ERROR, "%a: Failed to install the EFI_DEVICE_PATH and "=0D "XENIO_PROTOCOL protocols on handle %p (Status =3D=3D %r)\n",=0D __FUNCTION__, OutHandle, Status));=0D =0D diff --git a/OvmfPkg/PlatformDxe/Platform.c b/OvmfPkg/PlatformDxe/Platform.c index 23ad43901f..d0435719a7 100644 --- a/OvmfPkg/PlatformDxe/Platform.c +++ b/OvmfPkg/PlatformDxe/Platform.c @@ -243,7 +243,7 @@ ExtractConfig ( (VOID *) &MainFormState, sizeof MainFormSt= ate,=0D Results, Progress);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "%a: BlockToConfig(): %r, Progress=3D\"%s\"\n",=0D + DEBUG ((DEBUG_ERROR, "%a: BlockToConfig(): %r, Progress=3D\"%s\"\n",=0D __FUNCTION__, Status, (Status =3D=3D EFI_DEVICE_ERROR) ? NULL : *Pro= gress));=0D } else {=0D DEBUG ((EFI_D_VERBOSE, "%a: Results=3D\"%s\"\n", __FUNCTION__, *Result= s));=0D @@ -343,7 +343,7 @@ RouteConfig ( Status =3D gHiiConfigRouting->ConfigToBlock (gHiiConfigRouting, Configur= ation,=0D (VOID *) &MainFormState, &BlockSize, Progr= ess);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "%a: ConfigToBlock(): %r, Progress=3D\"%s\"\n",=0D + DEBUG ((DEBUG_ERROR, "%a: ConfigToBlock(): %r, Progress=3D\"%s\"\n",=0D __FUNCTION__, Status,=0D (Status =3D=3D EFI_BUFFER_TOO_SMALL) ? NULL : *Progress));=0D return Status;=0D @@ -661,7 +661,7 @@ ExecutePlatformConfig ( =0D Status =3D PlatformConfigLoad (&PlatformConfig, &OptionalElements);=0D if (EFI_ERROR (Status)) {=0D - DEBUG (((Status =3D=3D EFI_NOT_FOUND) ? EFI_D_VERBOSE : EFI_D_ERROR,=0D + DEBUG (((Status =3D=3D EFI_NOT_FOUND) ? EFI_D_VERBOSE : DEBUG_ERROR,=0D "%a: failed to load platform config: %r\n", __FUNCTION__, Status));= =0D return Status;=0D }=0D diff --git a/OvmfPkg/PlatformPei/FeatureControl.c b/OvmfPkg/PlatformPei/Fea= tureControl.c index 1a9d75022f..fef27b25a0 100644 --- a/OvmfPkg/PlatformPei/FeatureControl.c +++ b/OvmfPkg/PlatformPei/FeatureControl.c @@ -78,7 +78,7 @@ OnMpServicesAvailable ( NULL // ProcedureArgument=0D );=0D if (EFI_ERROR (Status) && Status !=3D EFI_NOT_STARTED) {=0D - DEBUG ((EFI_D_ERROR, "%a: StartupAllAps(): %r\n", __FUNCTION__, Status= ));=0D + DEBUG ((DEBUG_ERROR, "%a: StartupAllAps(): %r\n", __FUNCTION__, Status= ));=0D return Status;=0D }=0D =0D @@ -122,7 +122,7 @@ InstallFeatureControlCallback ( =0D Status =3D PeiServicesNotifyPpi (&mMpServicesNotify);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "%a: failed to set up MP Services callback: %r\n"= ,=0D + DEBUG ((DEBUG_ERROR, "%a: failed to set up MP Services callback: %r\n"= ,=0D __FUNCTION__, Status));=0D }=0D }=0D diff --git a/OvmfPkg/PlatformPei/Fv.c b/OvmfPkg/PlatformPei/Fv.c index 13b1dd38e6..ee4ecab615 100644 --- a/OvmfPkg/PlatformPei/Fv.c +++ b/OvmfPkg/PlatformPei/Fv.c @@ -28,7 +28,7 @@ PeiFvInitialization ( {=0D BOOLEAN SecureS3Needed;=0D =0D - DEBUG ((EFI_D_INFO, "Platform PEI Firmware Volume Initialization\n"));=0D + DEBUG ((DEBUG_INFO, "Platform PEI Firmware Volume Initialization\n"));=0D =0D //=0D // Create a memory allocation HOB for the PEI FV.=0D diff --git a/OvmfPkg/PlatformPei/MemDetect.c b/OvmfPkg/PlatformPei/MemDetec= t.c index 47dc9c5437..7a3ca88ecf 100644 --- a/OvmfPkg/PlatformPei/MemDetect.c +++ b/OvmfPkg/PlatformPei/MemDetect.c @@ -389,7 +389,7 @@ GetFirstNonAddress ( &FwCfgSize);=0D if (!EFI_ERROR (Status)) {=0D if (FwCfgSize >=3D sizeof MbString) {=0D - DEBUG ((EFI_D_WARN,=0D + DEBUG ((DEBUG_WARN,=0D "%a: ignoring malformed 64-bit PCI host aperture size from fw_cfg\= n",=0D __FUNCTION__));=0D } else {=0D @@ -402,7 +402,7 @@ GetFirstNonAddress ( =0D if (Pci64Size =3D=3D 0) {=0D if (mBootMode !=3D BOOT_ON_S3_RESUME) {=0D - DEBUG ((EFI_D_INFO, "%a: disabling 64-bit PCI host aperture\n",=0D + DEBUG ((DEBUG_INFO, "%a: disabling 64-bit PCI host aperture\n",=0D __FUNCTION__));=0D PcdStatus =3D PcdSet64S (PcdPciMmio64Size, 0);=0D ASSERT_RETURN_ERROR (PcdStatus);=0D @@ -460,7 +460,7 @@ GetFirstNonAddress ( PcdStatus =3D PcdSet64S (PcdPciMmio64Size, Pci64Size);=0D ASSERT_RETURN_ERROR (PcdStatus);=0D =0D - DEBUG ((EFI_D_INFO, "%a: Pci64Base=3D0x%Lx Pci64Size=3D0x%Lx\n",=0D + DEBUG ((DEBUG_INFO, "%a: Pci64Base=3D0x%Lx Pci64Size=3D0x%Lx\n",=0D __FUNCTION__, Pci64Base, Pci64Size));=0D }=0D =0D @@ -620,7 +620,7 @@ PublishPeiMemory ( MemorySize =3D mS3AcpiReservedMemorySize;=0D } else {=0D PeiMemoryCap =3D GetPeiMemoryCap ();=0D - DEBUG ((EFI_D_INFO, "%a: mPhysMemAddressWidth=3D%d PeiMemoryCap=3D%u K= B\n",=0D + DEBUG ((DEBUG_INFO, "%a: mPhysMemAddressWidth=3D%d PeiMemoryCap=3D%u K= B\n",=0D __FUNCTION__, mPhysMemAddressWidth, PeiMemoryCap >> 10));=0D =0D //=0D @@ -699,7 +699,7 @@ QemuInitializeRam ( MTRR_SETTINGS MtrrSettings;=0D EFI_STATUS Status;=0D =0D - DEBUG ((EFI_D_INFO, "%a called\n", __FUNCTION__));=0D + DEBUG ((DEBUG_INFO, "%a called\n", __FUNCTION__));=0D =0D //=0D // Determine total memory size available=0D diff --git a/OvmfPkg/PlatformPei/Platform.c b/OvmfPkg/PlatformPei/Platform.c index 088e616a98..38b35b97f7 100644 --- a/OvmfPkg/PlatformPei/Platform.c +++ b/OvmfPkg/PlatformPei/Platform.c @@ -405,7 +405,7 @@ MiscInitialization ( AcpiEnBit =3D ICH9_ACPI_CNTL_ACPI_EN;=0D break;=0D default:=0D - DEBUG ((EFI_D_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",= =0D + DEBUG ((DEBUG_ERROR, "%a: Unknown Host Bridge Device ID: 0x%04x\n",= =0D __FUNCTION__, mHostBridgeDevId));=0D ASSERT (FALSE);=0D return;=0D @@ -491,7 +491,7 @@ ReserveEmuVariableNvStore ( AllocateRuntimePages (=0D EFI_SIZE_TO_PAGES (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize))=0D );=0D - DEBUG ((EFI_D_INFO,=0D + DEBUG ((DEBUG_INFO,=0D "Reserved variable store memory: 0x%lX; size: %dkb\n",=0D VariableStore,=0D (2 * PcdGet32 (PcdFlashNvStorageFtwSpareSize)) / 1024=0D @@ -508,15 +508,15 @@ DebugDumpCmos ( {=0D UINT32 Loop;=0D =0D - DEBUG ((EFI_D_INFO, "CMOS:\n"));=0D + DEBUG ((DEBUG_INFO, "CMOS:\n"));=0D =0D for (Loop =3D 0; Loop < 0x80; Loop++) {=0D if ((Loop % 0x10) =3D=3D 0) {=0D - DEBUG ((EFI_D_INFO, "%02x:", Loop));=0D + DEBUG ((DEBUG_INFO, "%02x:", Loop));=0D }=0D - DEBUG ((EFI_D_INFO, " %02x", CmosRead8 (Loop)));=0D + DEBUG ((DEBUG_INFO, " %02x", CmosRead8 (Loop)));=0D if ((Loop % 0x10) =3D=3D 0xf) {=0D - DEBUG ((EFI_D_INFO, "\n"));=0D + DEBUG ((DEBUG_INFO, "\n"));=0D }=0D }=0D }=0D @@ -529,12 +529,12 @@ S3Verification ( {=0D #if defined (MDE_CPU_X64)=0D if (FeaturePcdGet (PcdSmmSmramRequire) && mS3Supported) {=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "%a: S3Resume2Pei doesn't support X64 PEI + SMM yet.\n", __FUNCTION_= _));=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "%a: Please disable S3 on the QEMU command line (see the README),\n"= ,=0D __FUNCTION__));=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "%a: or build OVMF with \"OvmfPkgIa32X64.dsc\".\n", __FUNCTION__));= =0D ASSERT (FALSE);=0D CpuDeadLoop ();=0D @@ -749,7 +749,7 @@ InitializePlatform ( XenDetect ();=0D =0D if (QemuFwCfgS3Enabled ()) {=0D - DEBUG ((EFI_D_INFO, "S3 support was detected on QEMU\n"));=0D + DEBUG ((DEBUG_INFO, "S3 support was detected on QEMU\n"));=0D mS3Supported =3D TRUE;=0D Status =3D PcdSetBoolS (PcdAcpiS3Enable, TRUE);=0D ASSERT_EFI_ERROR (Status);=0D @@ -779,7 +779,7 @@ InitializePlatform ( InitializeRamRegions ();=0D =0D if (mXen) {=0D - DEBUG ((EFI_D_INFO, "Xen was detected\n"));=0D + DEBUG ((DEBUG_INFO, "Xen was detected\n"));=0D InitializeXen ();=0D }=0D =0D diff --git a/OvmfPkg/PlatformPei/Xen.c b/OvmfPkg/PlatformPei/Xen.c index 0904c654f1..104922c67e 100644 --- a/OvmfPkg/PlatformPei/Xen.c +++ b/OvmfPkg/PlatformPei/Xen.c @@ -93,7 +93,7 @@ XenConnect ( }=0D =0D AsmCpuid (XenLeaf + 1, &XenVersion, NULL, NULL, NULL);=0D - DEBUG ((EFI_D_ERROR, "Detected Xen version %d.%d\n",=0D + DEBUG ((DEBUG_ERROR, "Detected Xen version %d.%d\n",=0D XenVersion >> 16, XenVersion & 0xFFFF));=0D mXenInfo.VersionMajor =3D (UINT16)(XenVersion >> 16);=0D mXenInfo.VersionMinor =3D (UINT16)(XenVersion & 0xFFFF);=0D @@ -157,7 +157,7 @@ XenPublishRamRegions ( return;=0D }=0D =0D - DEBUG ((EFI_D_INFO, "Using memory map provided by Xen\n"));=0D + DEBUG ((DEBUG_INFO, "Using memory map provided by Xen\n"));=0D =0D //=0D // Parse RAM in E820 map=0D diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c b/Ovmf= Pkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c index 76a7853de0..bc3f1bb5fd 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockService.c @@ -815,7 +815,7 @@ ValidateFvHeader ( Expected =3D=0D (UINT16) (((UINTN) FwVolHeader->Checksum + 0x10000 - Checksum) & 0xf= fff);=0D =0D - DEBUG ((EFI_D_INFO, "FV@%p Checksum is 0x%x, expected 0x%x\n",=0D + DEBUG ((DEBUG_INFO, "FV@%p Checksum is 0x%x, expected 0x%x\n",=0D FwVolHeader, FwVolHeader->Checksum, Expected));=0D return EFI_NOT_FOUND;=0D }=0D @@ -859,7 +859,7 @@ InitializeVariableFvHeader ( UINTN Offset;=0D UINTN Start;=0D =0D - DEBUG ((EFI_D_INFO,=0D + DEBUG ((DEBUG_INFO,=0D "Variable FV header is not valid. It will be reinitialized.\n"));=0D =0D //=0D @@ -929,7 +929,7 @@ FvbInitialize ( //=0D // Return an error so image will be unloaded=0D //=0D - DEBUG ((EFI_D_INFO,=0D + DEBUG ((DEBUG_INFO,=0D "QEMU flash was not detected. Writable FVB is not being installed.\n= "));=0D return EFI_WRITE_PROTECTED;=0D }=0D @@ -946,7 +946,7 @@ FvbInitialize ( =0D Status =3D InitializeVariableFvHeader ();=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_INFO,=0D + DEBUG ((DEBUG_INFO,=0D "QEMU Flash: Unable to initialize variable FV header\n"));=0D return EFI_WRITE_PROTECTED;=0D }=0D @@ -959,7 +959,7 @@ FvbInitialize ( //=0D Status =3D GetFvbInfo (Length, &FwVolHeader);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_INFO, "EFI_ERROR (GetFvbInfo (Length, &FwVolHeader))\n= "));=0D + DEBUG ((DEBUG_INFO, "EFI_ERROR (GetFvbInfo (Length, &FwVolHeader))\n= "));=0D return EFI_WRITE_PROTECTED;=0D }=0D }=0D diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c b/O= vmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceDxe.c index e60978fa12..1f285e0083 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=0D //=0D FwbHandle =3D NULL;=0D - DEBUG ((EFI_D_INFO, "Installing QEMU flash FVB\n"));=0D + DEBUG ((DEBUG_INFO, "Installing QEMU flash FVB\n"));=0D Status =3D gBS->InstallMultipleProtocolInterfaces (=0D &FwbHandle,=0D &gEfiFirmwareVolumeBlockProtocolGuid,=0D @@ -65,7 +65,7 @@ InstallProtocolInterfaces ( );=0D ASSERT_EFI_ERROR (Status);=0D =0D - DEBUG ((EFI_D_INFO, "Reinstalling FVB for QEMU flash region\n"));=0D + DEBUG ((DEBUG_INFO, "Reinstalling FVB for QEMU flash region\n"));=0D Status =3D gBS->ReinstallProtocolInterface (=0D FwbHandle,=0D &gEfiFirmwareVolumeBlockProtocolGuid,=0D diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c b/O= vmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c index 2717930f75..544f88e661 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/FwBlockServiceSmm.c @@ -34,7 +34,7 @@ InstallProtocolInterfaces ( // Firmware Volume Block protocol structure.=0D //=0D FvbHandle =3D NULL;=0D - DEBUG ((EFI_D_INFO, "Installing QEMU flash SMM FVB\n"));=0D + DEBUG ((DEBUG_INFO, "Installing QEMU flash SMM FVB\n"));=0D Status =3D gSmst->SmmInstallProtocolInterface (=0D &FvbHandle,=0D &gEfiSmmFirmwareVolumeBlockProtocolGuid,=0D diff --git a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c b/OvmfPkg/Q= emuFlashFvbServicesRuntimeDxe/QemuFlash.c index c81c58972b..1b0d6c053f 100644 --- a/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c +++ b/OvmfPkg/QemuFlashFvbServicesRuntimeDxe/QemuFlash.c @@ -74,35 +74,35 @@ QemuFlashDetected ( }=0D =0D if (Offset >=3D mFdBlockSize) {=0D - DEBUG ((EFI_D_INFO, "QEMU Flash: Failed to find probe location\n"));=0D + DEBUG ((DEBUG_INFO, "QEMU Flash: Failed to find probe location\n"));=0D return FALSE;=0D }=0D =0D - DEBUG ((EFI_D_INFO, "QEMU Flash: Attempting flash detection at %p\n", Pt= r));=0D + DEBUG ((DEBUG_INFO, "QEMU Flash: Attempting flash detection at %p\n", Pt= r));=0D =0D OriginalUint8 =3D *Ptr;=0D *Ptr =3D CLEAR_STATUS_CMD;=0D ProbeUint8 =3D *Ptr;=0D if (OriginalUint8 !=3D CLEAR_STATUS_CMD &&=0D ProbeUint8 =3D=3D CLEAR_STATUS_CMD) {=0D - DEBUG ((EFI_D_INFO, "QemuFlashDetected =3D> FD behaves as RAM\n"));=0D + DEBUG ((DEBUG_INFO, "QemuFlashDetected =3D> FD behaves as RAM\n"));=0D *Ptr =3D OriginalUint8;=0D } else {=0D *Ptr =3D READ_STATUS_CMD;=0D ProbeUint8 =3D *Ptr;=0D if (ProbeUint8 =3D=3D OriginalUint8) {=0D - DEBUG ((EFI_D_INFO, "QemuFlashDetected =3D> FD behaves as ROM\n"));= =0D + DEBUG ((DEBUG_INFO, "QemuFlashDetected =3D> FD behaves as ROM\n"));= =0D } else if (ProbeUint8 =3D=3D READ_STATUS_CMD) {=0D - DEBUG ((EFI_D_INFO, "QemuFlashDetected =3D> FD behaves as RAM\n"));= =0D + DEBUG ((DEBUG_INFO, "QemuFlashDetected =3D> FD behaves as RAM\n"));= =0D *Ptr =3D OriginalUint8;=0D } else if (ProbeUint8 =3D=3D CLEARED_ARRAY_STATUS) {=0D - DEBUG ((EFI_D_INFO, "QemuFlashDetected =3D> FD behaves as FLASH\n"))= ;=0D + DEBUG ((DEBUG_INFO, "QemuFlashDetected =3D> FD behaves as FLASH\n"))= ;=0D FlashDetected =3D TRUE;=0D *Ptr =3D READ_ARRAY_CMD;=0D }=0D }=0D =0D - DEBUG ((EFI_D_INFO, "QemuFlashDetected =3D> %a\n",=0D + DEBUG ((DEBUG_INFO, "QemuFlashDetected =3D> %a\n",=0D FlashDetected ? "Yes" : "No"));=0D return FlashDetected;=0D }=0D diff --git a/OvmfPkg/QemuVideoDxe/Driver.c b/OvmfPkg/QemuVideoDxe/Driver.c index 37bbbbe843..85edfcb1d6 100644 --- a/OvmfPkg/QemuVideoDxe/Driver.c +++ b/OvmfPkg/QemuVideoDxe/Driver.c @@ -153,7 +153,7 @@ QemuVideoControllerDriverSupported ( }=0D Card =3D QemuVideoDetect(Pci.Hdr.ClassCode[1], Pci.Hdr.VendorId, Pci.Hdr= .DeviceId);=0D if (Card !=3D NULL) {=0D - DEBUG ((EFI_D_INFO, "QemuVideo: %s detected\n", Card->Name));=0D + DEBUG ((DEBUG_INFO, "QemuVideo: %s detected\n", Card->Name));=0D Status =3D EFI_SUCCESS;=0D }=0D =0D @@ -324,10 +324,10 @@ QemuVideoControllerDriverStart ( );=0D if (EFI_ERROR (Status) ||=0D MmioDesc->ResType !=3D ACPI_ADDRESS_SPACE_TYPE_MEM) {=0D - DEBUG ((EFI_D_INFO, "QemuVideo: No mmio bar, fallback to port io\n")= );=0D + DEBUG ((DEBUG_INFO, "QemuVideo: No mmio bar, fallback to port io\n")= );=0D Private->Variant =3D QEMU_VIDEO_BOCHS;=0D } else {=0D - DEBUG ((EFI_D_INFO, "QemuVideo: Using mmio bar @ 0x%lx\n",=0D + DEBUG ((DEBUG_INFO, "QemuVideo: Using mmio bar @ 0x%lx\n",=0D MmioDesc->AddrRangeMin));=0D }=0D =0D @@ -352,7 +352,7 @@ QemuVideoControllerDriverStart ( UINT16 BochsId;=0D BochsId =3D BochsRead(Private, VBE_DISPI_INDEX_ID);=0D if ((BochsId & 0xFFF0) !=3D VBE_DISPI_ID0) {=0D - DEBUG ((EFI_D_INFO, "QemuVideo: BochsID mismatch (got 0x%x)\n", Boch= sId));=0D + DEBUG ((DEBUG_INFO, "QemuVideo: BochsID mismatch (got 0x%x)\n", Boch= sId));=0D Status =3D EFI_DEVICE_ERROR;=0D goto RestoreAttributes;=0D }=0D @@ -959,7 +959,7 @@ InitializeBochsGraphicsMode ( QEMU_VIDEO_BOCHS_MODES *ModeData=0D )=0D {=0D - DEBUG ((EFI_D_INFO, "InitializeBochsGraphicsMode: %dx%d @ %d\n",=0D + DEBUG ((DEBUG_INFO, "InitializeBochsGraphicsMode: %dx%d @ %d\n",=0D ModeData->Width, ModeData->Height, ModeData->ColorDepth));=0D =0D /* unblank */=0D diff --git a/OvmfPkg/QemuVideoDxe/Gop.c b/OvmfPkg/QemuVideoDxe/Gop.c index e49ec32cf1..a44917eb6b 100644 --- a/OvmfPkg/QemuVideoDxe/Gop.c +++ b/OvmfPkg/QemuVideoDxe/Gop.c @@ -30,7 +30,7 @@ QemuVideoCompleteModeInfo ( Info->PixelInformation.BlueMask =3D PIXEL24_BLUE_MASK;=0D Info->PixelInformation.ReservedMask =3D 0;=0D } else if (ModeData->ColorDepth =3D=3D 32) {=0D - DEBUG ((EFI_D_INFO, "PixelBlueGreenRedReserved8BitPerColor\n"));=0D + DEBUG ((DEBUG_INFO, "PixelBlueGreenRedReserved8BitPerColor\n"));=0D Info->PixelFormat =3D PixelBlueGreenRedReserved8BitPerColor;=0D }=0D Info->PixelsPerScanLine =3D Info->HorizontalResolution;=0D @@ -65,7 +65,7 @@ QemuVideoCompleteModeData ( Mode->FrameBufferSize =3D EFI_PAGES_TO_SIZE (=0D EFI_SIZE_TO_PAGES (Mode->FrameBufferSize)=0D );=0D - DEBUG ((EFI_D_INFO, "FrameBufferBase: 0x%Lx, FrameBufferSize: 0x%Lx\n",= =0D + DEBUG ((DEBUG_INFO, "FrameBufferBase: 0x%Lx, FrameBufferSize: 0x%Lx\n",= =0D Mode->FrameBufferBase, (UINT64)Mode->FrameBufferSize));=0D =0D FreePool (FrameBufDesc);=0D diff --git a/OvmfPkg/QemuVideoDxe/Initialize.c b/OvmfPkg/QemuVideoDxe/Initi= alize.c index 6ee42fb8d9..b5a5660ed2 100644 --- a/OvmfPkg/QemuVideoDxe/Initialize.c +++ b/OvmfPkg/QemuVideoDxe/Initialize.c @@ -180,7 +180,7 @@ QemuVideoCirrusModeSetup ( ModeData->HorizontalResolution =3D VideoMode->Width;=0D ModeData->VerticalResolution =3D VideoMode->Height;=0D ModeData->ColorDepth =3D VideoMode->ColorDepth;=0D - DEBUG ((EFI_D_INFO,=0D + DEBUG ((DEBUG_INFO,=0D "Adding Mode %d as Cirrus Internal Mode %d: %dx%d, %d-bit\n",=0D (INT32) (ModeData - Private->ModeData),=0D ModeData->InternalModeIndex,=0D @@ -289,7 +289,7 @@ QemuVideoBochsModeSetup ( EFI_ERROR (=0D Private->PciIo->Mem.Read (Private->PciIo, EfiPciIoWidthUint32,=0D PCI_BAR_IDX2, 40, 1, &AvailableFbSize))) {= =0D - DEBUG ((EFI_D_ERROR, "%a: can't read size of drawable buffer from QX= L "=0D + DEBUG ((DEBUG_ERROR, "%a: can't read size of drawable buffer from QX= L "=0D "ROM\n", __FUNCTION__));=0D return EFI_NOT_FOUND;=0D }=0D @@ -297,7 +297,7 @@ QemuVideoBochsModeSetup ( AvailableFbSize =3D BochsRead (Private, VBE_DISPI_INDEX_VIDEO_MEMORY_= 64K);=0D AvailableFbSize *=3D SIZE_64KB;=0D }=0D - DEBUG ((EFI_D_INFO, "%a: AvailableFbSize=3D0x%x\n", __FUNCTION__,=0D + DEBUG ((DEBUG_INFO, "%a: AvailableFbSize=3D0x%x\n", __FUNCTION__,=0D AvailableFbSize));=0D =0D //=0D @@ -322,7 +322,7 @@ QemuVideoBochsModeSetup ( ModeData->HorizontalResolution =3D VideoMode->Width;=0D ModeData->VerticalResolution =3D VideoMode->Height;=0D ModeData->ColorDepth =3D VideoMode->ColorDepth;=0D - DEBUG ((EFI_D_INFO,=0D + DEBUG ((DEBUG_INFO,=0D "Adding Mode %d as Bochs Internal Mode %d: %dx%d, %d-bit\n",=0D (INT32) (ModeData - Private->ModeData),=0D ModeData->InternalModeIndex,=0D diff --git a/OvmfPkg/QemuVideoDxe/VbeShim.c b/OvmfPkg/QemuVideoDxe/VbeShim.c index c23dc984d4..048ffa7058 100644 --- a/OvmfPkg/QemuVideoDxe/VbeShim.c +++ b/OvmfPkg/QemuVideoDxe/VbeShim.c @@ -114,7 +114,7 @@ InstallVbeShim ( //=0D Handler =3D (Int0x10->Segment << 4) + Int0x10->Offset;=0D if (Handler >=3D SegmentC && Handler < SegmentF) {=0D - DEBUG ((EFI_D_INFO, "%a: Video BIOS handler found at %04x:%04x\n",=0D + DEBUG ((DEBUG_INFO, "%a: Video BIOS handler found at %04x:%04x\n",=0D __FUNCTION__, Int0x10->Segment, Int0x10->Offset));=0D return;=0D }=0D @@ -312,5 +312,5 @@ InstallVbeShim ( Int0x10->Segment =3D (UINT16) ((UINT32)SegmentC >> 4);=0D Int0x10->Offset =3D (UINT16) ((UINTN) (VbeModeInfo + 1) - SegmentC);=0D =0D - DEBUG ((EFI_D_INFO, "%a: VBE shim installed\n", __FUNCTION__));=0D + DEBUG ((DEBUG_INFO, "%a: VBE shim installed\n", __FUNCTION__));=0D }=0D diff --git a/OvmfPkg/SataControllerDxe/SataController.c b/OvmfPkg/SataContr= ollerDxe/SataController.c index 313bfab1be..a5b5f04d27 100644 --- a/OvmfPkg/SataControllerDxe/SataController.c +++ b/OvmfPkg/SataControllerDxe/SataController.c @@ -118,7 +118,7 @@ CalculateBestPioMode ( if ((IdentifyData->AtaData.field_validity & 0x02) =3D=3D 0x02) {=0D =0D AdvancedPioMode =3D IdentifyData->AtaData.advanced_pio_modes;=0D - DEBUG ((EFI_D_INFO, "CalculateBestPioMode: AdvancedPioMode =3D %x\n", = AdvancedPioMode));=0D + DEBUG ((DEBUG_INFO, "CalculateBestPioMode: AdvancedPioMode =3D %x\n", = AdvancedPioMode));=0D =0D for (Index =3D 0; Index < 8; Index++) {=0D if ((AdvancedPioMode & 0x01) !=3D 0) {=0D @@ -232,7 +232,7 @@ CalculateBestUdmaMode ( }=0D =0D DeviceUDmaMode =3D IdentifyData->AtaData.ultra_dma_mode;=0D - DEBUG ((EFI_D_INFO, "CalculateBestUdmaMode: DeviceUDmaMode =3D %x\n", De= viceUDmaMode));=0D + DEBUG ((DEBUG_INFO, "CalculateBestUdmaMode: DeviceUDmaMode =3D %x\n", De= viceUDmaMode));=0D DeviceUDmaMode &=3D 0x3f;=0D TempMode =3D 0; // initialize it to UDMA-0=0D =0D @@ -391,7 +391,7 @@ SataControllerStart ( UINT32 Data32;=0D UINTN ChannelDeviceCount;=0D =0D - DEBUG ((EFI_D_INFO, "SataControllerStart START\n"));=0D + DEBUG ((DEBUG_INFO, "SataControllerStart START\n"));=0D =0D BailLogMask =3D DEBUG_ERROR;=0D SataPrivateData =3D NULL;=0D @@ -518,7 +518,7 @@ SataControllerStart ( goto FreeIdentifyValid;=0D }=0D =0D - DEBUG ((EFI_D_INFO, "SataControllerStart END status =3D %r\n", Status));= =0D + DEBUG ((DEBUG_INFO, "SataControllerStart END status =3D %r\n", Status));= =0D return Status;=0D =0D FreeIdentifyValid:=0D @@ -1034,7 +1034,7 @@ IdeInitCalculateMode ( } else {=0D (*SupportedModes)->PioMode.Valid =3D FALSE;=0D }=0D - DEBUG ((EFI_D_INFO, "IdeInitCalculateMode: PioMode =3D %x\n", (*Supporte= dModes)->PioMode.Mode));=0D + DEBUG ((DEBUG_INFO, "IdeInitCalculateMode: PioMode =3D %x\n", (*Supporte= dModes)->PioMode.Mode));=0D =0D Status =3D CalculateBestUdmaMode (=0D IdentifyData,=0D @@ -1049,7 +1049,7 @@ IdeInitCalculateMode ( } else {=0D (*SupportedModes)->UdmaMode.Valid =3D FALSE;=0D }=0D - DEBUG ((EFI_D_INFO, "IdeInitCalculateMode: UdmaMode =3D %x\n", (*Support= edModes)->UdmaMode.Mode));=0D + DEBUG ((DEBUG_INFO, "IdeInitCalculateMode: UdmaMode =3D %x\n", (*Support= edModes)->UdmaMode.Mode));=0D =0D //=0D // The modes other than PIO and UDMA are not supported=0D diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c index bae9764577..4e94d1fd18 100644 --- a/OvmfPkg/Sec/SecMain.c +++ b/OvmfPkg/Sec/SecMain.c @@ -256,7 +256,7 @@ FindFfsFileAndSection ( EFI_PHYSICAL_ADDRESS EndOfFile;=0D =0D if (Fv->Signature !=3D EFI_FVH_SIGNATURE) {=0D - DEBUG ((EFI_D_ERROR, "FV at %p does not have FV header signature\n", F= v));=0D + DEBUG ((DEBUG_ERROR, "FV at %p does not have FV header signature\n", F= v));=0D return EFI_VOLUME_CORRUPTED;=0D }=0D =0D @@ -342,7 +342,7 @@ DecompressMemFvs ( (EFI_COMMON_SECTION_HEADER**) &Section=0D );=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "Unable to find GUID defined section\n"));=0D + DEBUG ((DEBUG_ERROR, "Unable to find GUID defined section\n"));=0D return Status;=0D }=0D =0D @@ -353,7 +353,7 @@ DecompressMemFvs ( &SectionAttribute=0D );=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "Unable to GetInfo for GUIDed section\n"));=0D + DEBUG ((DEBUG_ERROR, "Unable to GetInfo for GUIDed section\n"));=0D return Status;=0D }=0D =0D @@ -374,7 +374,7 @@ DecompressMemFvs ( &AuthenticationStatus=0D );=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "Error during GUID section decode\n"));=0D + DEBUG ((DEBUG_ERROR, "Error during GUID section decode\n"));=0D return Status;=0D }=0D =0D @@ -386,7 +386,7 @@ DecompressMemFvs ( &FvSection=0D );=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "Unable to find PEI FV section\n"));=0D + DEBUG ((DEBUG_ERROR, "Unable to find PEI FV section\n"));=0D return Status;=0D }=0D =0D @@ -398,7 +398,7 @@ DecompressMemFvs ( CopyMem (PeiMemFv, (VOID*) (FvSection + 1), PcdGet32 (PcdOvmfPeiMemFvSiz= e));=0D =0D if (PeiMemFv->Signature !=3D EFI_FVH_SIGNATURE) {=0D - DEBUG ((EFI_D_ERROR, "Extracted FV at %p does not have FV header signa= ture\n", PeiMemFv));=0D + DEBUG ((DEBUG_ERROR, "Extracted FV at %p does not have FV header signa= ture\n", PeiMemFv));=0D CpuDeadLoop ();=0D return EFI_VOLUME_CORRUPTED;=0D }=0D @@ -411,7 +411,7 @@ DecompressMemFvs ( &FvSection=0D );=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "Unable to find DXE FV section\n"));=0D + DEBUG ((DEBUG_ERROR, "Unable to find DXE FV section\n"));=0D return Status;=0D }=0D =0D @@ -431,7 +431,7 @@ DecompressMemFvs ( CopyMem (DxeMemFv, (VOID*) ((UINTN)FvSection + FvHeaderSize), PcdGet32 (= PcdOvmfDxeMemFvSize));=0D =0D if (DxeMemFv->Signature !=3D EFI_FVH_SIGNATURE) {=0D - DEBUG ((EFI_D_ERROR, "Extracted FV at %p does not have FV header signa= ture\n", DxeMemFv));=0D + DEBUG ((DEBUG_ERROR, "Extracted FV at %p does not have FV header signa= ture\n", DxeMemFv));=0D CpuDeadLoop ();=0D return EFI_VOLUME_CORRUPTED;=0D }=0D @@ -474,7 +474,7 @@ FindPeiCoreImageBaseInFv ( &Section=0D );=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "Unable to find PEI Core image\n"));=0D + DEBUG ((DEBUG_ERROR, "Unable to find PEI Core image\n"));=0D return Status;=0D }=0D }=0D @@ -739,7 +739,7 @@ SecCoreStartupWithStack ( =0D ProcessLibraryConstructorList (NULL, NULL);=0D =0D - DEBUG ((EFI_D_INFO,=0D + DEBUG ((DEBUG_INFO,=0D "SecCoreStartupWithStack(0x%x, 0x%x)\n",=0D (UINT32)(UINTN)BootFv,=0D (UINT32)(UINTN)TopOfCurrentStack=0D @@ -882,7 +882,7 @@ TemporaryRamMigration ( BOOLEAN OldStatus;=0D BASE_LIBRARY_JUMP_BUFFER JumpBuffer;=0D =0D - DEBUG ((EFI_D_INFO,=0D + DEBUG ((DEBUG_INFO,=0D "TemporaryRamMigration(0x%Lx, 0x%Lx, 0x%Lx)\n",=0D TemporaryMemoryBase,=0D PermanentMemoryBase,=0D diff --git a/OvmfPkg/SmmAccess/SmmAccessPei.c b/OvmfPkg/SmmAccess/SmmAccess= Pei.c index c8bbc17e90..84278bad9d 100644 --- a/OvmfPkg/SmmAccess/SmmAccessPei.c +++ b/OvmfPkg/SmmAccess/SmmAccessPei.c @@ -258,7 +258,7 @@ SmmAccessPeiEntryPoint ( //=0D HostBridgeDevId =3D PciRead16 (OVMF_HOSTBRIDGE_DID);=0D if (HostBridgeDevId !=3D INTEL_Q35_MCH_DEVICE_ID) {=0D - DEBUG ((EFI_D_ERROR, "%a: no SMRAM with host bridge DID=3D0x%04x; only= "=0D + DEBUG ((DEBUG_ERROR, "%a: no SMRAM with host bridge DID=3D0x%04x; only= "=0D "DID=3D0x%04x (Q35) is supported\n", __FUNCTION__, HostBridgeDevId,= =0D INTEL_Q35_MCH_DEVICE_ID));=0D goto WrongConfig;=0D @@ -274,7 +274,7 @@ SmmAccessPeiEntryPoint ( EsmramcVal =3D PciRead8 (DRAMC_REGISTER_Q35 (MCH_ESMRAMC));=0D RegMask8 =3D MCH_ESMRAMC_SM_CACHE | MCH_ESMRAMC_SM_L1 | MCH_ESMRAMC_SM_L= 2;=0D if ((EsmramcVal & RegMask8) !=3D RegMask8) {=0D - DEBUG ((EFI_D_ERROR, "%a: this Q35 implementation lacks SMRAM\n",=0D + DEBUG ((DEBUG_ERROR, "%a: this Q35 implementation lacks SMRAM\n",=0D __FUNCTION__));=0D goto WrongConfig;=0D }=0D diff --git a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c b/OvmfPkg/SmmControl2D= xe/SmmControl2Dxe.c index f8940e4d9b..9547c20288 100644 --- a/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c +++ b/OvmfPkg/SmmControl2Dxe/SmmControl2Dxe.c @@ -204,7 +204,7 @@ SmmControl2DxeEntryPoint ( //=0D SmiEnableVal =3D IoRead32 (mSmiEnable);=0D if ((SmiEnableVal & ICH9_SMI_EN_APMC_EN) !=3D 0) {=0D - DEBUG ((EFI_D_ERROR, "%a: this Q35 implementation lacks SMI\n",=0D + DEBUG ((DEBUG_ERROR, "%a: this Q35 implementation lacks SMI\n",=0D __FUNCTION__));=0D goto FatalError;=0D }=0D @@ -228,7 +228,7 @@ SmmControl2DxeEntryPoint ( //=0D IoWrite32 (mSmiEnable, SmiEnableVal & ~(UINT32)ICH9_SMI_EN_GBL_SMI_EN);= =0D if (IoRead32 (mSmiEnable) !=3D SmiEnableVal) {=0D - DEBUG ((EFI_D_ERROR, "%a: failed to lock down GBL_SMI_EN\n",=0D + DEBUG ((DEBUG_ERROR, "%a: failed to lock down GBL_SMI_EN\n",=0D __FUNCTION__));=0D goto FatalError;=0D }=0D @@ -250,14 +250,14 @@ SmmControl2DxeEntryPoint ( OnS3SaveStateInstalled, NULL /* Context */,=0D &mS3SaveStateInstalled);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "%a: CreateEvent: %r\n", __FUNCTION__, Status))= ;=0D + DEBUG ((DEBUG_ERROR, "%a: CreateEvent: %r\n", __FUNCTION__, Status))= ;=0D goto FatalError;=0D }=0D =0D Status =3D gBS->RegisterProtocolNotify (&gEfiS3SaveStateProtocolGuid,= =0D mS3SaveStateInstalled, &Registration);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "%a: RegisterProtocolNotify: %r\n", __FUNCTION_= _,=0D + DEBUG ((DEBUG_ERROR, "%a: RegisterProtocolNotify: %r\n", __FUNCTION_= _,=0D Status));=0D goto ReleaseEvent;=0D }=0D @@ -267,7 +267,7 @@ SmmControl2DxeEntryPoint ( //=0D Status =3D gBS->SignalEvent (mS3SaveStateInstalled);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "%a: SignalEvent: %r\n", __FUNCTION__, Status))= ;=0D + DEBUG ((DEBUG_ERROR, "%a: SignalEvent: %r\n", __FUNCTION__, Status))= ;=0D goto ReleaseEvent;=0D }=0D }=0D @@ -280,7 +280,7 @@ SmmControl2DxeEntryPoint ( &gEfiSmmControl2ProtocolGuid, &mControl2,=0D NULL);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "%a: InstallMultipleProtocolInterfaces: %r\n",=0D + DEBUG ((DEBUG_ERROR, "%a: InstallMultipleProtocolInterfaces: %r\n",=0D __FUNCTION__, Status));=0D goto ReleaseEvent;=0D }=0D @@ -346,7 +346,7 @@ OnS3SaveStateInstalled ( &SmiEnAndMask=0D );=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "%a: EFI_BOOT_SCRIPT_IO_READ_WRITE_OPCODE: %r\n",= =0D + DEBUG ((DEBUG_ERROR, "%a: EFI_BOOT_SCRIPT_IO_READ_WRITE_OPCODE: %r\n",= =0D __FUNCTION__, Status));=0D ASSERT (FALSE);=0D CpuDeadLoop ();=0D @@ -365,7 +365,7 @@ OnS3SaveStateInstalled ( &GenPmCon1AndMask=0D );=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "%a: EFI_BOOT_SCRIPT_PCI_CONFIG_READ_WRITE_OPCODE: %r\n", __FUNCTION= __,=0D Status));=0D ASSERT (FALSE);=0D diff --git a/OvmfPkg/VirtioGpuDxe/Commands.c b/OvmfPkg/VirtioGpuDxe/Command= s.c index 8fb6cad52d..1645100a05 100644 --- a/OvmfPkg/VirtioGpuDxe/Commands.c +++ b/OvmfPkg/VirtioGpuDxe/Commands.c @@ -389,7 +389,7 @@ VirtioGpuExitBoot ( @retval EFI_SUCCESS Operation successful.=0D =0D @retval EFI_DEVICE_ERROR The host rejected the request. The host e= rror=0D - code has been logged on the EFI_D_ERROR l= evel.=0D + code has been logged on the DEBUG_ERROR l= evel.=0D =0D @return Codes for unexpected errors in VirtIo=0D messaging, or request/response=0D @@ -489,7 +489,7 @@ VirtioGpuSendCommand ( // Verify response size.=0D //=0D if (ResponseSize !=3D sizeof Response) {=0D - DEBUG ((EFI_D_ERROR, "%a: malformed response to Request=3D0x%x\n",=0D + DEBUG ((DEBUG_ERROR, "%a: malformed response to Request=3D0x%x\n",=0D __FUNCTION__, (UINT32)RequestType));=0D Status =3D EFI_PROTOCOL_ERROR;=0D goto UnmapResponse;=0D @@ -516,7 +516,7 @@ VirtioGpuSendCommand ( return EFI_SUCCESS;=0D }=0D =0D - DEBUG ((EFI_D_ERROR, "%a: Request=3D0x%x Response=3D0x%x\n", __FUNCTION_= _,=0D + DEBUG ((DEBUG_ERROR, "%a: Request=3D0x%x Response=3D0x%x\n", __FUNCTION_= _,=0D (UINT32)RequestType, Response.Type));=0D return EFI_DEVICE_ERROR;=0D =0D @@ -546,7 +546,7 @@ UnmapRequest: @retval EFI_SUCCESS Operation successful.=0D =0D @retval EFI_DEVICE_ERROR The host rejected the request. The host e= rror=0D - code has been logged on the EFI_D_ERROR l= evel.=0D + code has been logged on the DEBUG_ERROR l= evel.=0D =0D @return Codes for unexpected errors in VirtIo=0D messaging.=0D diff --git a/OvmfPkg/VirtioGpuDxe/DriverBinding.c b/OvmfPkg/VirtioGpuDxe/Dr= iverBinding.c index bf53a9306f..666d577547 100644 --- a/OvmfPkg/VirtioGpuDxe/DriverBinding.c +++ b/OvmfPkg/VirtioGpuDxe/DriverBinding.c @@ -651,7 +651,7 @@ VirtioGpuDriverBindingStart ( //=0D // No child handle should be produced; we're done.=0D //=0D - DEBUG ((EFI_D_INFO, "%a: bound VirtIo=3D%p without producing GOP\n",= =0D + DEBUG ((DEBUG_INFO, "%a: bound VirtIo=3D%p without producing GOP\n",= =0D __FUNCTION__, (VOID *)VgpuDev->VirtIo));=0D return EFI_SUCCESS;=0D }=0D @@ -674,7 +674,7 @@ VirtioGpuDriverBindingStart ( //=0D // We're done.=0D //=0D - DEBUG ((EFI_D_INFO, "%a: produced GOP %a VirtIo=3D%p\n", __FUNCTION__,=0D + DEBUG ((DEBUG_INFO, "%a: produced GOP %a VirtIo=3D%p\n", __FUNCTION__,=0D VirtIoBoundJustNow ? "while binding" : "for pre-bound",=0D (VOID *)VgpuDev->VirtIo));=0D return EFI_SUCCESS;=0D @@ -756,7 +756,7 @@ VirtioGpuDriverBindingStop ( break;=0D }=0D =0D - DEBUG ((EFI_D_INFO, "%a: unbinding GOP-less VirtIo=3D%p\n", __FUNCTION= __,=0D + DEBUG ((DEBUG_INFO, "%a: unbinding GOP-less VirtIo=3D%p\n", __FUNCTION= __,=0D (VOID *)VgpuDev->VirtIo));=0D =0D Status =3D gBS->UninstallProtocolInterface (ControllerHandle,=0D @@ -797,7 +797,7 @@ VirtioGpuDriverBindingStop ( VgpuDev->Child->GopHandle,=0D &gVirtioDeviceProtocolGuid));=0D =0D - DEBUG ((EFI_D_INFO, "%a: destroying GOP under VirtIo=3D%p\n", __FUNCTI= ON__,=0D + DEBUG ((DEBUG_INFO, "%a: destroying GOP under VirtIo=3D%p\n", __FUNCTI= ON__,=0D (VOID *)VgpuDev->VirtIo));=0D UninitVgpuGop (VgpuDev, ControllerHandle, This->DriverBindingHandle);= =0D break;=0D diff --git a/OvmfPkg/VirtioGpuDxe/VirtioGpu.h b/OvmfPkg/VirtioGpuDxe/Virtio= Gpu.h index c32052d83a..236cc47892 100644 --- a/OvmfPkg/VirtioGpuDxe/VirtioGpu.h +++ b/OvmfPkg/VirtioGpuDxe/VirtioGpu.h @@ -295,7 +295,7 @@ VirtioGpuExitBoot ( @retval EFI_SUCCESS Operation successful.=0D =0D @retval EFI_DEVICE_ERROR The host rejected the request. The host e= rror=0D - code has been logged on the EFI_D_ERROR l= evel.=0D + code has been logged on the DEBUG_ERROR l= evel.=0D =0D @return Codes for unexpected errors in VirtIo=0D messaging.=0D diff --git a/OvmfPkg/XenBusDxe/EventChannel.c b/OvmfPkg/XenBusDxe/EventChan= nel.c index 6900071782..6c905b511f 100644 --- a/OvmfPkg/XenBusDxe/EventChannel.c +++ b/OvmfPkg/XenBusDxe/EventChannel.c @@ -44,7 +44,7 @@ XenBusEventChannelAllocate ( EVTCHNOP_alloc_unbound,=0D &Parameter);=0D if (ReturnCode !=3D 0) {=0D - DEBUG ((EFI_D_ERROR, "ERROR: alloc_unbound failed with rc=3D%d", Retur= nCode));=0D + DEBUG ((DEBUG_ERROR, "ERROR: alloc_unbound failed with rc=3D%d", Retur= nCode));=0D return ReturnCode;=0D }=0D *Port =3D Parameter.port;=0D diff --git a/OvmfPkg/XenBusDxe/GrantTable.c b/OvmfPkg/XenBusDxe/GrantTable.c index 1130404cd1..58d687abad 100644 --- a/OvmfPkg/XenBusDxe/GrantTable.c +++ b/OvmfPkg/XenBusDxe/GrantTable.c @@ -107,7 +107,7 @@ XenGrantTableEndAccess ( OldFlags =3D GrantTable[Ref].flags;=0D do {=0D if ((Flags =3D OldFlags) & (GTF_reading | GTF_writing)) {=0D - DEBUG ((EFI_D_WARN, "WARNING: g.e. still in use! (%x)\n", Flags));=0D + DEBUG ((DEBUG_WARN, "WARNING: g.e. still in use! (%x)\n", Flags));=0D return EFI_NOT_READY;=0D }=0D OldFlags =3D InterlockedCompareExchange16 (&GrantTable[Ref].flags, Fla= gs, 0);=0D @@ -142,7 +142,7 @@ XenGrantTableInit ( Parameters.gpfn =3D (xen_pfn_t) ((UINTN) GrantTable >> EFI_PAGE_SHIFT)= + Index;=0D ReturnCode =3D XenHypercallMemoryOp (XENMEM_add_to_physmap, &Parameter= s);=0D if (ReturnCode !=3D 0) {=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "Xen GrantTable, add_to_physmap hypercall error: %Ld\n",=0D (INT64)ReturnCode));=0D }=0D @@ -164,11 +164,11 @@ XenGrantTableDeinit ( for (Index =3D NR_GRANT_FRAMES - 1; Index >=3D 0; Index--) {=0D Parameters.domid =3D DOMID_SELF;=0D Parameters.gpfn =3D (xen_pfn_t) ((UINTN) GrantTable >> EFI_PAGE_SHIFT)= + Index;=0D - DEBUG ((EFI_D_INFO, "Xen GrantTable, removing %Lx\n",=0D + DEBUG ((DEBUG_INFO, "Xen GrantTable, removing %Lx\n",=0D (UINT64)Parameters.gpfn));=0D ReturnCode =3D XenHypercallMemoryOp (XENMEM_remove_from_physmap, &Para= meters);=0D if (ReturnCode !=3D 0) {=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "Xen GrantTable, remove_from_physmap hypercall error: %Ld\n",=0D (INT64)ReturnCode));=0D }=0D diff --git a/OvmfPkg/XenBusDxe/XenBus.c b/OvmfPkg/XenBusDxe/XenBus.c index a203beaaa7..f8a41b6d36 100644 --- a/OvmfPkg/XenBusDxe/XenBus.c +++ b/OvmfPkg/XenBusDxe/XenBus.c @@ -148,7 +148,7 @@ XenBusAddDevice ( * happen if a device is going away after=0D * switching to Closed.=0D */=0D - DEBUG ((EFI_D_INFO, "XenBus: Device %a ignored. "=0D + DEBUG ((DEBUG_INFO, "XenBus: Device %a ignored. "=0D "State %d\n", DevicePath, State));=0D Status =3D EFI_SUCCESS;=0D goto out;=0D @@ -157,7 +157,7 @@ XenBusAddDevice ( StatusXenStore =3D XenStoreRead (XST_NIL, DevicePath, "backend",=0D NULL, (VOID **) &BackendPath);=0D if (StatusXenStore !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_ERROR, "xenbus: %a no backend path.\n", DevicePath));= =0D + DEBUG ((DEBUG_ERROR, "xenbus: %a no backend path.\n", DevicePath));= =0D Status =3D EFI_NOT_FOUND;=0D goto out;=0D }=0D @@ -197,12 +197,12 @@ XenBusAddDevice ( Private->Handle,=0D EFI_OPEN_PROTOCOL_BY_CHILD_CONTROLLER);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "open by child controller fail (%r)\n",=0D + DEBUG ((DEBUG_ERROR, "open by child controller fail (%r)\n",=0D Status));=0D goto ErrorOpenProtocolByChild;=0D }=0D } else {=0D - DEBUG ((EFI_D_ERROR, "XenBus: does not exist: %a\n", DevicePath));=0D + DEBUG ((DEBUG_ERROR, "XenBus: does not exist: %a\n", DevicePath));=0D Status =3D EFI_NOT_FOUND;=0D }=0D =0D @@ -312,7 +312,7 @@ XenBusSetState ( XENSTORE_STATUS Status;=0D CHAR8 *Temp;=0D =0D - DEBUG ((EFI_D_INFO, "XenBus: Set state to %d\n", NewState));=0D + DEBUG ((DEBUG_INFO, "XenBus: Set state to %d\n", NewState));=0D =0D Status =3D XenStoreRead (Transaction, This->Node, "state", NULL, (VOID *= *)&Temp);=0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D @@ -328,10 +328,10 @@ XenBusSetState ( Status =3D XenStoreSPrint (Transaction, This->Node, "state", "%d", New= State);=0D } while (Status =3D=3D XENSTORE_STATUS_EAGAIN);=0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_ERROR, "XenBus: failed to write new state\n"));=0D + DEBUG ((DEBUG_ERROR, "XenBus: failed to write new state\n"));=0D goto Out;=0D }=0D - DEBUG ((EFI_D_INFO, "XenBus: Set state to %d, done\n", NewState));=0D + DEBUG ((DEBUG_INFO, "XenBus: Set state to %d, done\n", NewState));=0D =0D Out:=0D return Status;=0D diff --git a/OvmfPkg/XenBusDxe/XenBusDxe.c b/OvmfPkg/XenBusDxe/XenBusDxe.c index c47fad2e80..1f5628ad83 100644 --- a/OvmfPkg/XenBusDxe/XenBusDxe.c +++ b/OvmfPkg/XenBusDxe/XenBusDxe.c @@ -362,7 +362,7 @@ XenBusDxeDriverBindingStart ( =0D Status =3D XenGetSharedInfoPage (Dev);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "XenBus: Unable to get the shared info page.\n"))= ;=0D + DEBUG ((DEBUG_ERROR, "XenBus: Unable to get the shared info page.\n"))= ;=0D Status =3D EFI_UNSUPPORTED;=0D goto ErrorAllocated;=0D }=0D @@ -442,7 +442,7 @@ XenBusDxeDriverBindingStop ( ControllerHandle,=0D EFI_OPEN_PROTOCOL_GET_PROTOCOL);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "XenBusDxe: get children protocol failed: %r\n"= , Status));=0D + DEBUG ((DEBUG_ERROR, "XenBusDxe: get children protocol failed: %r\n"= , Status));=0D continue;=0D }=0D ChildData =3D XENBUS_PRIVATE_DATA_FROM_THIS (XenBusIo);=0D diff --git a/OvmfPkg/XenBusDxe/XenStore.c b/OvmfPkg/XenBusDxe/XenStore.c index 41fcb39088..e5cca108e0 100644 --- a/OvmfPkg/XenBusDxe/XenStore.c +++ b/OvmfPkg/XenBusDxe/XenStore.c @@ -467,7 +467,7 @@ XenStoreWriteStore ( Status =3D XenStoreWaitForEvent (xs.EventChannelEvent,=0D EFI_TIMER_PERIOD_SECONDS (1));=0D if (Status =3D=3D EFI_TIMEOUT) {=0D - DEBUG ((EFI_D_WARN, "XenStore Write, waiting for a ring event.\n")= );=0D + DEBUG ((DEBUG_WARN, "XenStore Write, waiting for a ring event.\n")= );=0D }=0D continue;=0D }=0D @@ -546,7 +546,7 @@ XenStoreReadStore ( Status =3D XenStoreWaitForEvent (xs.EventChannelEvent,=0D EFI_TIMER_PERIOD_SECONDS (1));=0D if (Status =3D=3D EFI_TIMEOUT) {=0D - DEBUG ((EFI_D_WARN, "XenStore Read, waiting for a ring event.\n"))= ;=0D + DEBUG ((DEBUG_WARN, "XenStore Read, waiting for a ring event.\n"))= ;=0D }=0D continue;=0D }=0D @@ -617,7 +617,7 @@ XenStoreProcessMessage ( Status =3D XenStoreReadStore (&Message->Header, sizeof (Message->Header)= );=0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D FreePool (Message);=0D - DEBUG ((EFI_D_ERROR, "XenStore: Error read store (%d)\n", Status));=0D + DEBUG ((DEBUG_ERROR, "XenStore: Error read store (%d)\n", Status));=0D return Status;=0D }=0D =0D @@ -626,7 +626,7 @@ XenStoreProcessMessage ( if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D FreePool (Body);=0D FreePool (Message);=0D - DEBUG ((EFI_D_ERROR, "XenStore: Error read store (%d)\n", Status));=0D + DEBUG ((DEBUG_ERROR, "XenStore: Error read store (%d)\n", Status));=0D return Status;=0D }=0D Body[Message->Header.len] =3D '\0';=0D @@ -638,14 +638,14 @@ XenStoreProcessMessage ( EfiAcquireLock (&xs.RegisteredWatchesLock);=0D Message->u.Watch.Handle =3D=0D XenStoreFindWatch (Message->u.Watch.Vector[XS_WATCH_TOKEN]);=0D - DEBUG ((EFI_D_INFO, "XenStore: Watch event %a\n",=0D + DEBUG ((DEBUG_INFO, "XenStore: Watch event %a\n",=0D Message->u.Watch.Vector[XS_WATCH_TOKEN]));=0D if (Message->u.Watch.Handle !=3D NULL) {=0D EfiAcquireLock (&xs.WatchEventsLock);=0D InsertHeadList (&xs.WatchEvents, &Message->Link);=0D EfiReleaseLock (&xs.WatchEventsLock);=0D } else {=0D - DEBUG ((EFI_D_WARN, "XenStore: Watch handle %a not found\n",=0D + DEBUG ((DEBUG_WARN, "XenStore: Watch handle %a not found\n",=0D Message->u.Watch.Vector[XS_WATCH_TOKEN]));=0D FreePool((VOID*)Message->u.Watch.Vector);=0D FreePool(Message);=0D @@ -711,7 +711,7 @@ XenStoreGetError ( return gXenStoreErrors[Index].Status;=0D }=0D }=0D - DEBUG ((EFI_D_WARN, "XenStore gave unknown error %a\n", ErrorStr));=0D + DEBUG ((DEBUG_WARN, "XenStore gave unknown error %a\n", ErrorStr));=0D return XENSTORE_STATUS_EINVAL;=0D }=0D =0D @@ -738,7 +738,7 @@ XenStoreReadReply ( XENSTORE_STATUS Status;=0D Status =3D XenStoreProcessMessage ();=0D if (Status !=3D XENSTORE_STATUS_SUCCESS && Status !=3D XENSTORE_STATUS= _EAGAIN) {=0D - DEBUG ((EFI_D_ERROR, "XenStore, error while reading the ring (%d).",= =0D + DEBUG ((DEBUG_ERROR, "XenStore, error while reading the ring (%d).",= =0D Status));=0D return Status;=0D }=0D @@ -803,14 +803,14 @@ XenStoreTalkv ( =0D Status =3D XenStoreWriteStore (&Message, sizeof (Message));=0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_ERROR, "XenStoreTalkv failed %d\n", Status));=0D + DEBUG ((DEBUG_ERROR, "XenStoreTalkv failed %d\n", Status));=0D goto Error;=0D }=0D =0D for (Index =3D 0; Index < NumRequests; Index++) {=0D Status =3D XenStoreWriteStore (WriteRequest[Index].Data, WriteRequest[= Index].Len);=0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_ERROR, "XenStoreTalkv failed %d\n", Status));=0D + DEBUG ((DEBUG_ERROR, "XenStoreTalkv failed %d\n", Status));=0D goto Error;=0D }=0D }=0D @@ -1006,7 +1006,7 @@ XenStoreInitComms ( while (XenStore->rsp_prod !=3D XenStore->rsp_cons) {=0D Status =3D gBS->CheckEvent (TimerEvent);=0D if (!EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_WARN, "XENSTORE response ring is not quiescent "=0D + DEBUG ((DEBUG_WARN, "XENSTORE response ring is not quiescent "=0D "(%08x:%08x): fixing up\n",=0D XenStore->rsp_cons, XenStore->rsp_prod));=0D XenStore->rsp_cons =3D XenStore->rsp_prod;=0D @@ -1046,7 +1046,7 @@ XenStoreInit ( xs.EventChannel =3D (evtchn_port_t)XenHypercallHvmGetParam (HVM_PARAM_ST= ORE_EVTCHN);=0D XenStoreGpfn =3D (UINTN)XenHypercallHvmGetParam (HVM_PARAM_STORE_PFN);=0D xs.XenStore =3D (VOID *) (XenStoreGpfn << EFI_PAGE_SHIFT);=0D - DEBUG ((EFI_D_INFO, "XenBusInit: XenBus rings @%p, event channel %x\n",= =0D + DEBUG ((DEBUG_INFO, "XenBusInit: XenBus rings @%p, event channel %x\n",= =0D xs.XenStore, xs.EventChannel));=0D =0D InitializeListHead (&xs.ReplyList);=0D @@ -1076,7 +1076,7 @@ XenStoreDeinit ( if (!IsListEmpty (&xs.RegisteredWatches)) {=0D XENSTORE_WATCH *Watch;=0D LIST_ENTRY *Entry;=0D - DEBUG ((EFI_D_WARN, "XenStore: RegisteredWatches is not empty, cleanin= g up..."));=0D + DEBUG ((DEBUG_WARN, "XenStore: RegisteredWatches is not empty, cleanin= g up..."));=0D Entry =3D GetFirstNode (&xs.RegisteredWatches);=0D while (!IsNull (&xs.RegisteredWatches, Entry)) {=0D Watch =3D XENSTORE_WATCH_FROM_LINK (Entry);=0D @@ -1092,7 +1092,7 @@ XenStoreDeinit ( //=0D if (!IsListEmpty (&xs.WatchEvents)) {=0D LIST_ENTRY *Entry;=0D - DEBUG ((EFI_D_WARN, "XenStore: WatchEvents is not empty, cleaning up..= ."));=0D + DEBUG ((DEBUG_WARN, "XenStore: WatchEvents is not empty, cleaning up..= ."));=0D Entry =3D GetFirstNode (&xs.WatchEvents);=0D while (!IsNull (&xs.WatchEvents, Entry)) {=0D XENSTORE_MESSAGE *Message =3D XENSTORE_MESSAGE_FROM_LINK (Entry);=0D diff --git a/OvmfPkg/XenIoPciDxe/XenIoPciDxe.c b/OvmfPkg/XenIoPciDxe/XenIoP= ciDxe.c index 5e7bd94b89..0b3fd03e08 100644 --- a/OvmfPkg/XenIoPciDxe/XenIoPciDxe.c +++ b/OvmfPkg/XenIoPciDxe/XenIoPciDxe.c @@ -175,7 +175,7 @@ XenIoPciDeviceBindingStart ( ASSERT (BarDesc->ResType =3D=3D ACPI_ADDRESS_SPACE_TYPE_MEM);=0D =0D /* Get a Memory address for mapping the Grant Table. */=0D - DEBUG ((EFI_D_INFO, "XenIoPci: BAR at %LX\n", BarDesc->AddrRangeMin));=0D + DEBUG ((DEBUG_INFO, "XenIoPci: BAR at %LX\n", BarDesc->AddrRangeMin));=0D XenIo->GrantTableAddress =3D BarDesc->AddrRangeMin;=0D FreePool (BarDesc);=0D =0D diff --git a/OvmfPkg/XenPvBlkDxe/BlockFront.c b/OvmfPkg/XenPvBlkDxe/BlockFr= ont.c index f57f857315..122a6baed2 100644 --- a/OvmfPkg/XenPvBlkDxe/BlockFront.c +++ b/OvmfPkg/XenPvBlkDxe/BlockFront.c @@ -123,7 +123,7 @@ XenPvBlkWaitForBackendState ( Status =3D XENSTORE_STATUS_FAIL;=0D break;=0D }=0D - DEBUG ((EFI_D_INFO,=0D + DEBUG ((DEBUG_INFO,=0D "XenPvBlk: waiting backend state %d, current: %d\n",=0D ExpectedState, State));=0D XenBusIo->WaitForWatch (XenBusIo, Dev->StateWatchToken);=0D @@ -171,12 +171,12 @@ XenPvBlockFrontInitialization ( if (Dev->MediaInfo.CdRom) {=0D Status =3D XenBusIo->XsBackendRead (XenBusIo, XST_NIL, "params", (VOID= **)&Params);=0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_ERROR, "%a: Failed to read params (%d)\n", __FUNCTION_= _, Status));=0D + DEBUG ((DEBUG_ERROR, "%a: Failed to read params (%d)\n", __FUNCTION_= _, Status));=0D goto Error;=0D }=0D if (AsciiStrLen (Params) =3D=3D 0 || AsciiStrCmp (Params, "aio:") =3D= =3D 0) {=0D FreePool (Params);=0D - DEBUG ((EFI_D_INFO, "%a: Empty cdrom\n", __FUNCTION__));=0D + DEBUG ((DEBUG_INFO, "%a: Empty cdrom\n", __FUNCTION__));=0D goto Error;=0D }=0D FreePool (Params);=0D @@ -184,7 +184,7 @@ XenPvBlockFrontInitialization ( =0D Status =3D XenBusReadUint64 (XenBusIo, "backend-id", FALSE, &Value);=0D if (Status !=3D XENSTORE_STATUS_SUCCESS || Value > MAX_UINT16) {=0D - DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to get backend-id (%d)\n",=0D + DEBUG ((DEBUG_ERROR, "XenPvBlk: Failed to get backend-id (%d)\n",=0D Status));=0D goto Error;=0D }=0D @@ -203,32 +203,32 @@ XenPvBlockFrontInitialization ( Again:=0D Status =3D XenBusIo->XsTransactionStart (XenBusIo, &Transaction);=0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_WARN, "XenPvBlk: Failed to start transaction, %d\n", Sta= tus));=0D + DEBUG ((DEBUG_WARN, "XenPvBlk: Failed to start transaction, %d\n", Sta= tus));=0D goto Error;=0D }=0D =0D Status =3D XenBusIo->XsPrintf (XenBusIo, &Transaction, NodeName, "ring-r= ef", "%d",=0D Dev->RingRef);=0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to write ring-ref.\n"));=0D + DEBUG ((DEBUG_ERROR, "XenPvBlk: Failed to write ring-ref.\n"));=0D goto AbortTransaction;=0D }=0D Status =3D XenBusIo->XsPrintf (XenBusIo, &Transaction, NodeName,=0D "event-channel", "%d", Dev->EventChannel);= =0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to write event-channel.\n"));=0D + DEBUG ((DEBUG_ERROR, "XenPvBlk: Failed to write event-channel.\n"));=0D goto AbortTransaction;=0D }=0D Status =3D XenBusIo->XsPrintf (XenBusIo, &Transaction, NodeName,=0D "protocol", "%a", XEN_IO_PROTO_ABI_NATIVE);= =0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to write protocol.\n"));=0D + DEBUG ((DEBUG_ERROR, "XenPvBlk: Failed to write protocol.\n"));=0D goto AbortTransaction;=0D }=0D =0D Status =3D XenBusIo->SetState (XenBusIo, &Transaction, XenbusStateConnec= ted);=0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_ERROR, "XenPvBlk: Failed to switch state.\n"));=0D + DEBUG ((DEBUG_ERROR, "XenPvBlk: Failed to switch state.\n"));=0D goto AbortTransaction;=0D }=0D =0D @@ -244,7 +244,7 @@ Again: //=0D Status =3D XenPvBlkWaitForBackendState (Dev, XenbusStateConnected, &Stat= e);=0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "XenPvBlk: backend for %a/%d not available, rc=3D%d state=3D%d= \n",=0D XenBusIo->Type, XenBusIo->DeviceId, Status, State));=0D goto Error2;=0D @@ -274,7 +274,7 @@ Again: //=0D // This is not supported by the driver.=0D //=0D - DEBUG ((EFI_D_ERROR, "XenPvBlk: Unsupported sector-size value %Lu, "=0D + DEBUG ((DEBUG_ERROR, "XenPvBlk: Unsupported sector-size value %Lu, "=0D "it must be a multiple of 512\n", Value));=0D goto Error2;=0D }=0D @@ -298,7 +298,7 @@ Again: Dev->MediaInfo.FeatureFlushCache =3D FALSE;=0D }=0D =0D - DEBUG ((EFI_D_INFO, "XenPvBlk: New disk with %ld sectors of %d bytes\n",= =0D + DEBUG ((DEBUG_INFO, "XenPvBlk: New disk with %ld sectors of %d bytes\n",= =0D Dev->MediaInfo.Sectors, Dev->MediaInfo.SectorSize));=0D =0D *DevPtr =3D Dev;=0D @@ -330,7 +330,7 @@ XenPvBlockFrontShutdown ( =0D Status =3D XenBusIo->SetState (XenBusIo, XST_NIL, XenbusStateClosing);=0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "XenPvBlk: error while changing state to Closing: %d\n",=0D Status));=0D goto Close;=0D @@ -338,7 +338,7 @@ XenPvBlockFrontShutdown ( =0D Status =3D XenPvBlkWaitForBackendState (Dev, XenbusStateClosing, NULL);= =0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "XenPvBlk: error while waiting for closing backend state: %d\n= ",=0D Status));=0D goto Close;=0D @@ -346,7 +346,7 @@ XenPvBlockFrontShutdown ( =0D Status =3D XenBusIo->SetState (XenBusIo, XST_NIL, XenbusStateClosed);=0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "XenPvBlk: error while changing state to Closed: %d\n",=0D Status));=0D goto Close;=0D @@ -354,7 +354,7 @@ XenPvBlockFrontShutdown ( =0D Status =3D XenPvBlkWaitForBackendState (Dev, XenbusStateClosed, NULL);=0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "XenPvBlk: error while waiting for closed backend state: %d\n"= ,=0D Status));=0D goto Close;=0D @@ -362,7 +362,7 @@ XenPvBlockFrontShutdown ( =0D Status =3D XenBusIo->SetState (XenBusIo, XST_NIL, XenbusStateInitialisin= g);=0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "XenPvBlk: error while changing state to initialising: %d\n",= =0D Status));=0D goto Close;=0D @@ -371,7 +371,7 @@ XenPvBlockFrontShutdown ( while (TRUE) {=0D Status =3D XenBusReadUint64 (XenBusIo, "state", TRUE, &Value);=0D if (Status !=3D XENSTORE_STATUS_SUCCESS) {=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "XenPvBlk: error while waiting for new backend state: %d\n",= =0D Status));=0D goto Close;=0D @@ -379,7 +379,7 @@ XenPvBlockFrontShutdown ( if (Value <=3D XenbusStateInitWait || Value >=3D XenbusStateClosed) {= =0D break;=0D }=0D - DEBUG ((EFI_D_INFO,=0D + DEBUG ((DEBUG_INFO,=0D "XenPvBlk: waiting backend state %d, current: %Lu\n",=0D XenbusStateInitWait, Value));=0D XenBusIo->WaitForWatch (XenBusIo, Dev->StateWatchToken);=0D @@ -473,7 +473,7 @@ XenPvBlockAsyncIo ( UINT32 ReturnCode;=0D ReturnCode =3D XenBusIo->EventChannelNotify (XenBusIo, Dev->EventChann= el);=0D if (ReturnCode !=3D 0) {=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "XenPvBlk: Unexpected return value from EventChannelNotify: = %d\n",=0D ReturnCode));=0D }=0D @@ -528,7 +528,7 @@ XenPvBlockPushOperation ( UINT32 ReturnCode;=0D ReturnCode =3D XenBusIo->EventChannelNotify (XenBusIo, Dev->EventChann= el);=0D if (ReturnCode !=3D 0) {=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "XenPvBlk: Unexpected return value from EventChannelNotify: = %d\n",=0D ReturnCode));=0D }=0D @@ -590,7 +590,7 @@ XenPvBlockAsyncIoPoll ( INT32 Index;=0D =0D if (Status !=3D BLKIF_RSP_OKAY) {=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "XenPvBlk: "=0D "%a error %d on %a at sector %Lx, num bytes %Lx\n",=0D Response->operation =3D=3D BLKIF_OP_READ ? "read" : "w= rite",=0D @@ -608,17 +608,17 @@ XenPvBlockAsyncIoPoll ( =0D case BLKIF_OP_WRITE_BARRIER:=0D if (Status !=3D BLKIF_RSP_OKAY) {=0D - DEBUG ((EFI_D_ERROR, "XenPvBlk: write barrier error %d\n", Statu= s));=0D + DEBUG ((DEBUG_ERROR, "XenPvBlk: write barrier error %d\n", Statu= s));=0D }=0D break;=0D case BLKIF_OP_FLUSH_DISKCACHE:=0D if (Status !=3D BLKIF_RSP_OKAY) {=0D - DEBUG ((EFI_D_ERROR, "XenPvBlk: flush error %d\n", Status));=0D + DEBUG ((DEBUG_ERROR, "XenPvBlk: flush error %d\n", Status));=0D }=0D break;=0D =0D default:=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "XenPvBlk: unrecognized block operation %d response (statu= s %d)\n",=0D Response->operation, Status));=0D break;=0D diff --git a/OvmfPkg/XenPvBlkDxe/BlockIo.c b/OvmfPkg/XenPvBlkDxe/BlockIo.c index b3a527e4e3..c013fc80f0 100644 --- a/OvmfPkg/XenPvBlkDxe/BlockIo.c +++ b/OvmfPkg/XenPvBlkDxe/BlockIo.c @@ -89,14 +89,14 @@ XenPvBlkDxeBlockIoReadWriteBlocks ( }=0D =0D if (BufferSize % Media->BlockSize !=3D 0) {=0D - DEBUG ((EFI_D_ERROR, "XenPvBlkDxe: Bad buffer size: 0x%Lx\n",=0D + DEBUG ((DEBUG_ERROR, "XenPvBlkDxe: Bad buffer size: 0x%Lx\n",=0D (UINT64)BufferSize));=0D return EFI_BAD_BUFFER_SIZE;=0D }=0D =0D if (Lba > Media->LastBlock ||=0D (BufferSize / Media->BlockSize) - 1 > Media->LastBlock - Lba) {=0D - DEBUG ((EFI_D_ERROR,=0D + DEBUG ((DEBUG_ERROR,=0D "XenPvBlkDxe: %a with invalid LBA: 0x%Lx, size: 0x%Lx\n",=0D IsWrite ? "Write" : "Read", Lba, (UINT64)BufferSize));=0D return EFI_INVALID_PARAMETER;=0D @@ -150,7 +150,7 @@ XenPvBlkDxeBlockIoReadWriteBlocks ( Sector +=3D IoData.Size / 512;=0D Status =3D XenPvBlockIo (&IoData, IsWrite);=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "XenPvBlkDxe: Error during %a operation.\n",=0D + DEBUG ((DEBUG_ERROR, "XenPvBlkDxe: Error during %a operation.\n",=0D IsWrite ? "write" : "read"));=0D return Status;=0D }=0D diff --git a/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.c b/OvmfPkg/XenPvBlkDxe/XenPvB= lkDxe.c index 779a7f630c..1440e1d23b 100644 --- a/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.c +++ b/OvmfPkg/XenPvBlkDxe/XenPvBlkDxe.c @@ -304,7 +304,7 @@ XenPvBlkDxeDriverBindingStart ( NULL=0D );=0D if (EFI_ERROR (Status)) {=0D - DEBUG ((EFI_D_ERROR, "XenPvBlk: install protocol fail: %r\n", Status))= ;=0D + DEBUG ((DEBUG_ERROR, "XenPvBlk: install protocol fail: %r\n", Status))= ;=0D goto UninitBlockFront;=0D }=0D =0D --=20 2.25.1