OvmfPkg/Sec: Cleanup debug messages

Remove some not-so-useful messages (during FV scanning).

Convert ERROR to INFO and vise versa where appropriate.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15148 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/OvmfPkg/Sec/SecMain.c b/OvmfPkg/Sec/SecMain.c
index 8bdf6e5238c5b762343578a1faaf4fbae10781cf..b9564b48d740a5c9e66fea941bf47f28dfaa4f43 100644 (file)
--- a/OvmfPkg/Sec/SecMain.c
+++ b/OvmfPkg/Sec/SecMain.c
@@ -1,7 +1,7 @@
 /** @file\r
   Main SEC phase code.  Transitions to PEI.\r
 \r
 /** @file\r
   Main SEC phase code.  Transitions to PEI.\r
 \r

-  Copyright (c) 2008 - 2011, Intel Corporation. All rights reserved.<BR>\r
+  Copyright (c) 2008 - 2013, Intel Corporation. All rights reserved.<BR>\r

 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r
 \r
   This program and the accompanying materials\r
   are licensed and made available under the terms and conditions of the BSD License\r


@@ -167,7 +167,6 @@ FindFfsSectionInSections (
     }\r
 \r
     Section = (EFI_COMMON_SECTION_HEADER*)(UINTN) CurrentAddress;\r
     }\r
 \r
     Section = (EFI_COMMON_SECTION_HEADER*)(UINTN) CurrentAddress;\r

-    DEBUG ((EFI_D_INFO, "Section->Type: 0x%x\n", Section->Type));\r

 \r
     Size = SECTION_SIZE (Section);\r
     if (Size < sizeof (*Section)) {\r
 \r
     Size = SECTION_SIZE (Section);\r
     if (Size < sizeof (*Section)) {\r


@@ -186,7 +185,6 @@ FindFfsSectionInSections (
       *FoundSection = Section;\r
       return EFI_SUCCESS;\r
     }\r
       *FoundSection = Section;\r
       return EFI_SUCCESS;\r
     }\r

-    DEBUG ((EFI_D_INFO, "Section->Type (0x%x) != SectionType (0x%x)\n", Section->Type, SectionType));\r

   }\r
 \r
   return EFI_NOT_FOUND;\r
   }\r
 \r
   return EFI_NOT_FOUND;\r


@@ -223,7 +221,7 @@ FindFfsFileAndSection (
   EFI_PHYSICAL_ADDRESS        EndOfFile;\r
 \r
   if (Fv->Signature != EFI_FVH_SIGNATURE) {\r
   EFI_PHYSICAL_ADDRESS        EndOfFile;\r
 \r
   if (Fv->Signature != EFI_FVH_SIGNATURE) {\r

-    DEBUG ((EFI_D_INFO, "FV at %p does not have FV header signature\n", Fv));\r
+    DEBUG ((EFI_D_ERROR, "FV at %p does not have FV header signature\n", Fv));\r

     return EFI_VOLUME_CORRUPTED;\r
   }\r
 \r
     return EFI_VOLUME_CORRUPTED;\r
   }\r
 \r


@@ -245,7 +243,6 @@ FindFfsFileAndSection (
     if (Size < (sizeof (*File) + sizeof (EFI_COMMON_SECTION_HEADER))) {\r
       return EFI_VOLUME_CORRUPTED;\r
     }\r
     if (Size < (sizeof (*File) + sizeof (EFI_COMMON_SECTION_HEADER))) {\r
       return EFI_VOLUME_CORRUPTED;\r
     }\r

-    DEBUG ((EFI_D_INFO, "File->Type: 0x%x\n", File->Type));\r

 \r
     EndOfFile = CurrentAddress + Size;\r
     if (EndOfFile > EndOfFirmwareVolume) {\r
 \r
     EndOfFile = CurrentAddress + Size;\r
     if (EndOfFile > EndOfFirmwareVolume) {\r


@@ -256,7 +253,6 @@ FindFfsFileAndSection (
     // Look for the request file type\r
     //\r
     if (File->Type != FileType) {\r
     // Look for the request file type\r
     //\r
     if (File->Type != FileType) {\r

-      DEBUG ((EFI_D_INFO, "File->Type (0x%x) != FileType (0x%x)\n", File->Type, FileType));\r

       continue;\r
     }\r
 \r
       continue;\r
     }\r
 \r


@@ -590,7 +586,7 @@ SecCoreStartupWithStack (
 \r
   ProcessLibraryConstructorList (NULL, NULL);\r
 \r
 \r
   ProcessLibraryConstructorList (NULL, NULL);\r
 \r

-  DEBUG ((EFI_D_ERROR,\r
+  DEBUG ((EFI_D_INFO,\r

     "SecCoreStartupWithStack(0x%x, 0x%x)\n",\r
     (UINT32)(UINTN)BootFv,\r
     (UINT32)(UINTN)TopOfCurrentStack\r
     "SecCoreStartupWithStack(0x%x, 0x%x)\n",\r
     (UINT32)(UINTN)BootFv,\r
     (UINT32)(UINTN)TopOfCurrentStack\r


@@ -725,7 +721,12 @@ TemporaryRamMigration (
   BOOLEAN                          OldStatus;\r
   BASE_LIBRARY_JUMP_BUFFER         JumpBuffer;\r
   \r
   BOOLEAN                          OldStatus;\r
   BASE_LIBRARY_JUMP_BUFFER         JumpBuffer;\r
   \r

-  DEBUG ((EFI_D_ERROR, "TemporaryRamMigration(0x%x, 0x%x, 0x%x)\n", (UINTN)TemporaryMemoryBase, (UINTN)PermanentMemoryBase, CopySize));\r
+  DEBUG ((EFI_D_INFO,\r
+    "TemporaryRamMigration(0x%x, 0x%x, 0x%x)\n",\r
+    (UINTN) TemporaryMemoryBase,\r
+    (UINTN) PermanentMemoryBase,\r
+    CopySize\r
+    ));\r

   \r
   OldHeap = (VOID*)(UINTN)TemporaryMemoryBase;\r
   NewHeap = (VOID*)((UINTN)PermanentMemoryBase + (CopySize >> 1));\r
   \r
   OldHeap = (VOID*)(UINTN)TemporaryMemoryBase;\r
   NewHeap = (VOID*)((UINTN)PermanentMemoryBase + (CopySize >> 1));\r