OvmfPkg/BaseMemEncryptSevLib: break DEBUG calls to multiple lines

None of the DEBUG macro invocations in SetMemoryEncDec() fit on a single
line. Break them to multiple lines, for (a) conforming to the coding style
spec, (b) easier modification in later patches.

Cc: Brijesh Singh <brijesh.singh@amd.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Brijesh Singh <brijesh.singh@amd.com>
Tested-by: Brijesh Singh <brijesh.singh@amd.com>

diff --git a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c
index dbaad7766dbe6b5d99d7f2d47507d5e6ffb45036..83e3d8992173085cb0d285a4f03de133185d130b 100644 (file)
--- a/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c
+++ b/OvmfPkg/Library/BaseMemEncryptSevLib/X64/VirtualMemory.c
@@ -286,18 +286,26 @@ SetMemoryEncDec (
     PageMapLevel4Entry = (VOID*) (Cr3BaseAddress & ~PgTableMask);\r
     PageMapLevel4Entry += PML4_OFFSET(PhysicalAddress);\r
     if (!PageMapLevel4Entry->Bits.Present) {\r
-      DEBUG ((DEBUG_WARN,\r
-        "%a:%a ERROR bad PML4 for %lx\n", gEfiCallerBaseName, __FUNCTION__,\r
-        PhysicalAddress));\r
+      DEBUG ((\r
+        DEBUG_WARN,\r
+        "%a:%a ERROR bad PML4 for %lx\n",\r
+        gEfiCallerBaseName,\r
+        __FUNCTION__,\r
+        PhysicalAddress\r
+        ));\r
       return RETURN_NO_MAPPING;\r
     }\r
 \r
     PageDirectory1GEntry = (VOID*) ((PageMapLevel4Entry->Bits.PageTableBaseAddress<<12) & ~PgTableMask);\r
     PageDirectory1GEntry += PDP_OFFSET(PhysicalAddress);\r
     if (!PageDirectory1GEntry->Bits.Present) {\r
-      DEBUG ((DEBUG_WARN,\r
-        "%a:%a ERROR bad PDPE for %lx\n", gEfiCallerBaseName,\r
-         __FUNCTION__, PhysicalAddress));\r
+      DEBUG ((\r
+        DEBUG_WARN,\r
+        "%a:%a ERROR bad PDPE for %lx\n",\r
+        gEfiCallerBaseName,\r
+        __FUNCTION__,\r
+        PhysicalAddress\r
+        ));\r
       return RETURN_NO_MAPPING;\r
     }\r
 \r
@@ -311,17 +319,25 @@ SetMemoryEncDec (
       //\r
       if (!(PhysicalAddress & (BIT30 - 1)) && Length >= BIT30) {\r
         SetOrClearCBit(&PageDirectory1GEntry->Uint64, Mode);\r
-        DEBUG ((DEBUG_VERBOSE,\r
-          "%a:%a Updated 1GB entry for %lx\n", gEfiCallerBaseName,\r
-          __FUNCTION__, PhysicalAddress));\r
+        DEBUG ((\r
+          DEBUG_VERBOSE,\r
+          "%a:%a Updated 1GB entry for %lx\n",\r
+          gEfiCallerBaseName,\r
+          __FUNCTION__,\r
+          PhysicalAddress\r
+          ));\r
         PhysicalAddress += BIT30;\r
         Length -= BIT30;\r
       } else {\r
         //\r
         // We must split the page\r
         //\r
-        DEBUG ((DEBUG_VERBOSE,\r
-          "%a:%a Spliting 1GB page\n", gEfiCallerBaseName, __FUNCTION__));\r
+        DEBUG ((\r
+          DEBUG_VERBOSE,\r
+          "%a:%a Spliting 1GB page\n",\r
+          gEfiCallerBaseName,\r
+          __FUNCTION__\r
+          ));\r
         Split1GPageTo2M(((UINT64)PageDirectory1GEntry->Bits.PageTableBaseAddress)<<30, (UINT64*) PageDirectory1GEntry, 0, 0);\r
         continue;\r
       }\r
@@ -333,9 +349,13 @@ SetMemoryEncDec (
       PageDirectory2MEntry = (VOID*) ((PageUpperDirectoryPointerEntry->Bits.PageTableBaseAddress<<12) & ~PgTableMask);\r
       PageDirectory2MEntry += PDE_OFFSET(PhysicalAddress);\r
       if (!PageDirectory2MEntry->Bits.Present) {\r
-        DEBUG ((DEBUG_WARN,\r
-          "%a:%a ERROR bad PDE for %lx\n", gEfiCallerBaseName, __FUNCTION__,\r
-          PhysicalAddress));\r
+        DEBUG ((\r
+          DEBUG_WARN,\r
+          "%a:%a ERROR bad PDE for %lx\n",\r
+          gEfiCallerBaseName,\r
+          __FUNCTION__,\r
+          PhysicalAddress\r
+          ));\r
         return RETURN_NO_MAPPING;\r
       }\r
       //\r
@@ -354,9 +374,13 @@ SetMemoryEncDec (
           //\r
           // We must split up this page into 4K pages\r
           //\r
-          DEBUG ((DEBUG_VERBOSE,\r
-            "%a:%a Spliting 2MB page at %lx\n", gEfiCallerBaseName,__FUNCTION__,\r
-            PhysicalAddress));\r
+          DEBUG ((\r
+            DEBUG_VERBOSE,\r
+            "%a:%a Spliting 2MB page at %lx\n",\r
+            gEfiCallerBaseName,\r
+            __FUNCTION__,\r
+            PhysicalAddress\r
+            ));\r
           Split2MPageTo4K (((UINT64)PageDirectory2MEntry->Bits.PageTableBaseAddress) << 21, (UINT64*) PageDirectory2MEntry, 0, 0);\r
           continue;\r
         }\r
@@ -365,9 +389,13 @@ SetMemoryEncDec (
         PageTableEntry = (VOID*) (PageDirectoryPointerEntry->Bits.PageTableBaseAddress<<12 & ~PgTableMask);\r
         PageTableEntry += PTE_OFFSET(PhysicalAddress);\r
         if (!PageTableEntry->Bits.Present) {\r
-          DEBUG ((DEBUG_WARN,\r
-            "%a:%a ERROR bad PTE for %lx\n", gEfiCallerBaseName,\r
-            __FUNCTION__, PhysicalAddress));\r
+          DEBUG ((\r
+            DEBUG_WARN,\r
+            "%a:%a ERROR bad PTE for %lx\n",\r
+            gEfiCallerBaseName,\r
+            __FUNCTION__,\r
+            PhysicalAddress\r
+            ));\r
           return RETURN_NO_MAPPING;\r
         }\r
         SetOrClearCBit (&PageTableEntry->Uint64, Mode);\r