OvmfPkg: replace old EFI_D_ debug levels with new DEBUG_ ones

[mirror_edk2.git] / OvmfPkg / Sec / SecMain.c

diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c
index bae9764577f0dbf9d5cbd5e468e1d7e5fea96618..6dea6e771a29db4d388b55bbee0f473cc19960e6 100644 (file)
--- a/OvmfPkg/Sec/SecMain.c
+++ b/OvmfPkg/Sec/SecMain.c
@@ -256,7 +256,7 @@ FindFfsFileAndSection (
   EFI_PHYSICAL_ADDRESS        EndOfFile;\r
 \r
   if (Fv->Signature != EFI_FVH_SIGNATURE) {\r
-    DEBUG ((EFI_D_ERROR, "FV at %p does not have FV header signature\n", Fv));\r
+    DEBUG ((DEBUG_ERROR, "FV at %p does not have FV header signature\n", Fv));\r
     return EFI_VOLUME_CORRUPTED;\r
   }\r
 \r
@@ -342,7 +342,7 @@ DecompressMemFvs (
              (EFI_COMMON_SECTION_HEADER**) &Section\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "Unable to find GUID defined section\n"));\r
+    DEBUG ((DEBUG_ERROR, "Unable to find GUID defined section\n"));\r
     return Status;\r
   }\r
 \r
@@ -353,14 +353,14 @@ DecompressMemFvs (
              &SectionAttribute\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "Unable to GetInfo for GUIDed section\n"));\r
+    DEBUG ((DEBUG_ERROR, "Unable to GetInfo for GUIDed section\n"));\r
     return Status;\r
   }\r
 \r
   OutputBuffer = (VOID*) ((UINT8*)(UINTN) PcdGet32 (PcdOvmfDxeMemFvBase) + SIZE_1MB);\r
   ScratchBuffer = ALIGN_POINTER ((UINT8*) OutputBuffer + OutputBufferSize, SIZE_1MB);\r
 \r
-  DEBUG ((EFI_D_VERBOSE, "%a: OutputBuffer@%p+0x%x ScratchBuffer@%p+0x%x "\r
+  DEBUG ((DEBUG_VERBOSE, "%a: OutputBuffer@%p+0x%x ScratchBuffer@%p+0x%x "\r
     "PcdOvmfDecompressionScratchEnd=0x%x\n", __FUNCTION__, OutputBuffer,\r
     OutputBufferSize, ScratchBuffer, ScratchBufferSize,\r
     PcdGet32 (PcdOvmfDecompressionScratchEnd)));\r
@@ -374,7 +374,7 @@ DecompressMemFvs (
              &AuthenticationStatus\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "Error during GUID section decode\n"));\r
+    DEBUG ((DEBUG_ERROR, "Error during GUID section decode\n"));\r
     return Status;\r
   }\r
 \r
@@ -386,7 +386,7 @@ DecompressMemFvs (
              &FvSection\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "Unable to find PEI FV section\n"));\r
+    DEBUG ((DEBUG_ERROR, "Unable to find PEI FV section\n"));\r
     return Status;\r
   }\r
 \r
@@ -398,7 +398,7 @@ DecompressMemFvs (
   CopyMem (PeiMemFv, (VOID*) (FvSection + 1), PcdGet32 (PcdOvmfPeiMemFvSize));\r
 \r
   if (PeiMemFv->Signature != EFI_FVH_SIGNATURE) {\r
-    DEBUG ((EFI_D_ERROR, "Extracted FV at %p does not have FV header signature\n", PeiMemFv));\r
+    DEBUG ((DEBUG_ERROR, "Extracted FV at %p does not have FV header signature\n", PeiMemFv));\r
     CpuDeadLoop ();\r
     return EFI_VOLUME_CORRUPTED;\r
   }\r
@@ -411,7 +411,7 @@ DecompressMemFvs (
              &FvSection\r
              );\r
   if (EFI_ERROR (Status)) {\r
-    DEBUG ((EFI_D_ERROR, "Unable to find DXE FV section\n"));\r
+    DEBUG ((DEBUG_ERROR, "Unable to find DXE FV section\n"));\r
     return Status;\r
   }\r
 \r
@@ -431,7 +431,7 @@ DecompressMemFvs (
   CopyMem (DxeMemFv, (VOID*) ((UINTN)FvSection + FvHeaderSize), PcdGet32 (PcdOvmfDxeMemFvSize));\r
 \r
   if (DxeMemFv->Signature != EFI_FVH_SIGNATURE) {\r
-    DEBUG ((EFI_D_ERROR, "Extracted FV at %p does not have FV header signature\n", DxeMemFv));\r
+    DEBUG ((DEBUG_ERROR, "Extracted FV at %p does not have FV header signature\n", DxeMemFv));\r
     CpuDeadLoop ();\r
     return EFI_VOLUME_CORRUPTED;\r
   }\r
@@ -474,7 +474,7 @@ FindPeiCoreImageBaseInFv (
                &Section\r
                );\r
     if (EFI_ERROR (Status)) {\r
-      DEBUG ((EFI_D_ERROR, "Unable to find PEI Core image\n"));\r
+      DEBUG ((DEBUG_ERROR, "Unable to find PEI Core image\n"));\r
       return Status;\r
     }\r
   }\r
@@ -554,14 +554,14 @@ FindPeiCoreImageBase (
     // A malicious runtime OS may have injected something into our previously\r
     // decoded PEI FV, but we don't care about that unless SMM/SMRAM is required.\r
     //\r
-    DEBUG ((EFI_D_VERBOSE, "SEC: S3 resume\n"));\r
+    DEBUG ((DEBUG_VERBOSE, "SEC: S3 resume\n"));\r
     GetS3ResumePeiFv (BootFv);\r
   } else {\r
     //\r
     // We're either not resuming, or resuming "securely" -- we'll decompress\r
     // both PEI FV and DXE FV from pristine flash.\r
     //\r
-    DEBUG ((EFI_D_VERBOSE, "SEC: %a\n",\r
+    DEBUG ((DEBUG_VERBOSE, "SEC: %a\n",\r
       S3Resume ? "S3 resume (with PEI decompression)" : "Normal boot"));\r
     FindMainFv (BootFv);\r
 \r
@@ -739,7 +739,7 @@ SecCoreStartupWithStack (
 \r
   ProcessLibraryConstructorList (NULL, NULL);\r
 \r
-  DEBUG ((EFI_D_INFO,\r
+  DEBUG ((DEBUG_INFO,\r
     "SecCoreStartupWithStack(0x%x, 0x%x)\n",\r
     (UINT32)(UINTN)BootFv,\r
     (UINT32)(UINTN)TopOfCurrentStack\r
@@ -882,7 +882,7 @@ TemporaryRamMigration (
   BOOLEAN                          OldStatus;\r
   BASE_LIBRARY_JUMP_BUFFER         JumpBuffer;\r
 \r
-  DEBUG ((EFI_D_INFO,\r
+  DEBUG ((DEBUG_INFO,\r
     "TemporaryRamMigration(0x%Lx, 0x%Lx, 0x%Lx)\n",\r
     TemporaryMemoryBase,\r
     PermanentMemoryBase,\r