OvmfPkg: Change complex DEBUG_CODE() to DEBUG_CODE_BEGIN/END()

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3767

Update use of DEBUG_CODE(Expression) if Expression is a complex code
block with if/while/for/case statements that use {}.

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Andrew Fish <afish@apple.com>

5 files changed, 12 insertions, 12 deletions

diff --git a/OvmfPkg/Csm/LegacyBiosDxe/Thunk.c b/OvmfPkg/Csm/LegacyBiosDxe/Thunk.c
index d9828bb2f8..dd706fbd6e 100644
--- a/OvmfPkg/Csm/LegacyBiosDxe/Thunk.c
+++ b/OvmfPkg/Csm/LegacyBiosDxe/Thunk.c
@@ -228,7 +228,7 @@ InternalLegacyBiosFarCall (
   // interupts other than the Timer interrupt that was disabled above can not be

   // handled properly from real mode.

   //

-  DEBUG_CODE (

+  DEBUG_CODE_BEGIN ();

     UINTN  Vector;

     UINTN  Count;

 

@@ -245,7 +245,7 @@ InternalLegacyBiosFarCall (
       DEBUG ((DEBUG_ERROR, "ERROR: More than one HW interrupt active with CSM enabled\n"));

     }

     ASSERT (Count < 2);

-  );

+  DEBUG_CODE_END ();

 

   //

   // If the Timer AP has enabled the 8254 timer IRQ and the current 8254 timer

@@ -310,7 +310,7 @@ InternalLegacyBiosFarCall (
   // EBDA base address, if the current EBDA base address is smaller, it indicates

   // PcdEbdaReservedMemorySize should be adjusted to larger for more OPROMs.

   //

-  DEBUG_CODE (

+  DEBUG_CODE_BEGIN ();

     {

       UINTN                 EbdaBaseAddress;

       UINTN                 ReservedEbdaBaseAddress;

@@ -322,7 +322,7 @@ InternalLegacyBiosFarCall (
         ASSERT (ReservedEbdaBaseAddress <= EbdaBaseAddress);

       );

     }

-  );

+  DEBUG_CODE_END ();

 

   //

   // Restore interrupt of debug timer

diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
index 186401296a..1408d94f7d 100644
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
@@ -250,7 +250,7 @@ RemoveStaleFvFileOptions (
     //

     Status = EfiBootManagerDeleteLoadOptionVariable (

                BootOptions[Index].OptionNumber, LoadOptionTypeBoot);

-    DEBUG_CODE (

+    DEBUG_CODE_BEGIN ();

       CHAR16 *DevicePathString;

 

       DevicePathString = ConvertDevicePathToText(BootOptions[Index].FilePath,

@@ -266,7 +266,7 @@ RemoveStaleFvFileOptions (
       if (DevicePathString != NULL) {

         FreePool (DevicePathString);

       }

-      );

+    DEBUG_CODE_END ();

   }

 

   EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount);

diff --git a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c
index 639dbd6e45..32b70a46d0 100644
--- a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c
@@ -247,7 +247,7 @@ RemoveStaleFvFileOptions (
     //

     Status = EfiBootManagerDeleteLoadOptionVariable (

                BootOptions[Index].OptionNumber, LoadOptionTypeBoot);

-    DEBUG_CODE (

+    DEBUG_CODE_BEGIN ();

       CHAR16 *DevicePathString;

 

       DevicePathString = ConvertDevicePathToText(BootOptions[Index].FilePath,

@@ -263,7 +263,7 @@ RemoveStaleFvFileOptions (
       if (DevicePathString != NULL) {

         FreePool (DevicePathString);

       }

-      );

+    DEBUG_CODE_END ();

   }

 

   EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount);

diff --git a/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c
index fd80577355..e238af21f1 100644
--- a/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c
@@ -251,7 +251,7 @@ RemoveStaleFvFileOptions (
     //

     Status = EfiBootManagerDeleteLoadOptionVariable (

                BootOptions[Index].OptionNumber, LoadOptionTypeBoot);

-    DEBUG_CODE (

+    DEBUG_CODE_BEGIN ();

       CHAR16 *DevicePathString;

 

       DevicePathString = ConvertDevicePathToText(BootOptions[Index].FilePath,

@@ -267,7 +267,7 @@ RemoveStaleFvFileOptions (
       if (DevicePathString != NULL) {

         FreePool (DevicePathString);

       }

-      );

+    DEBUG_CODE_END ();

   }

 

   EfiBootManagerFreeLoadOptions (BootOptions, BootOptionCount);

diff --git a/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c b/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c
index 62e42d6771..387b1e80eb 100644
--- a/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c
+++ b/OvmfPkg/PciHotPlugInitDxe/PciHotPlugInit.c
@@ -564,7 +564,7 @@ GetResourcePadding (
 

   Address = (EFI_PCI_ROOT_BRIDGE_IO_PROTOCOL_PCI_ADDRESS *)&HpcPciAddress;

 

-  DEBUG_CODE (

+  DEBUG_CODE_BEGIN ();

     CHAR16                                      *DevicePathString;

 

     DevicePathString = ConvertDevicePathToText (HpcDevicePath, FALSE, FALSE);

@@ -576,7 +576,7 @@ GetResourcePadding (
     if (DevicePathString != NULL) {

       FreePool (DevicePathString);

     }

-    );

+  DEBUG_CODE_END ();

 

   if (HpcState == NULL || Padding == NULL || Attributes == NULL) {

     return EFI_INVALID_PARAMETER;