OvmfPkg: Reproduce builds across source format changes

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

Use DEBUG_LINE_NUMBER instead of __LINE__.

Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Jordan Justen <jordan.l.justen@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Michael Kubacki <michael.kubacki@microsoft.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
Reviewed-by: Jiewen Yao <Jiewen.yao@intel.com>
Tested-by: Michael Kubacki <michael.kubacki@microsoft.com>

diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c b/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c
index 746b366448e6c6b5e6361c0334bf7f0a19399c93..350cf3dd0b3a6d787f9b1530a9b7591cbe0faa1f 100644 (file)
--- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c
+++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c
@@ -2321,7 +2321,7 @@ LegacyBiosInstallRom (
                     );\r
 \r
     if (EFI_ERROR (Status)) {\r
                     );\r
 \r
     if (EFI_ERROR (Status)) {\r

-      DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__));\r
+      DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", DEBUG_LINE_NUMBER));\r

       //\r
       // Report Status Code to indicate that there is no enough space for OpROM\r
       //\r
       //\r
       // Report Status Code to indicate that there is no enough space for OpROM\r
       //\r


@@ -2337,7 +2337,7 @@ LegacyBiosInstallRom (
     //\r
     RuntimeAddress = Private->OptionRom;\r
     if (RuntimeAddress + *RuntimeImageLength > MaxRomAddr) {\r
     //\r
     RuntimeAddress = Private->OptionRom;\r
     if (RuntimeAddress + *RuntimeImageLength > MaxRomAddr) {\r

-      DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__));\r
+      DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", DEBUG_LINE_NUMBER));\r

       gBS->FreePages (PhysicalAddress, EFI_SIZE_TO_PAGES (ImageSize));\r
       //\r
       // Report Status Code to indicate that there is no enough space for OpROM\r
       gBS->FreePages (PhysicalAddress, EFI_SIZE_TO_PAGES (ImageSize));\r
       //\r
       // Report Status Code to indicate that there is no enough space for OpROM\r


@@ -2355,7 +2355,7 @@ LegacyBiosInstallRom (
     //\r
     InitAddress    = PCI_START_ADDRESS (Private->OptionRom);\r
     if (InitAddress + ImageSize > MaxRomAddr) {\r
     //\r
     InitAddress    = PCI_START_ADDRESS (Private->OptionRom);\r
     if (InitAddress + ImageSize > MaxRomAddr) {\r

-      DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__));\r
+      DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", DEBUG_LINE_NUMBER));\r

       //\r
       // Report Status Code to indicate that there is no enough space for OpROM\r
       //\r
       //\r
       // Report Status Code to indicate that there is no enough space for OpROM\r
       //\r

diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
index 9b21ba2bd699e8bbfd67c2299d2ca8cdb93549fa..186401296ae2382bb5d82c2824ec9c69cd191bb2 100644 (file)
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
@@ -624,7 +624,7 @@ PrepareLpcBridgeDevicePath (
     DEBUG((\r
       DEBUG_INFO,\r
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",\r
     DEBUG((\r
       DEBUG_INFO,\r
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",\r

-      __LINE__,\r
+      DEBUG_LINE_NUMBER,\r

       gPnp16550ComPortDeviceNode.UID + 1,\r
       DevPathStr\r
       ));\r
       gPnp16550ComPortDeviceNode.UID + 1,\r
       DevPathStr\r
       ));\r


@@ -656,7 +656,7 @@ PrepareLpcBridgeDevicePath (
     DEBUG((\r
       DEBUG_INFO,\r
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",\r
     DEBUG((\r
       DEBUG_INFO,\r
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",\r

-      __LINE__,\r
+      DEBUG_LINE_NUMBER,\r

       gPnp16550ComPortDeviceNode.UID + 1,\r
       DevPathStr\r
       ));\r
       gPnp16550ComPortDeviceNode.UID + 1,\r
       DevPathStr\r
       ));\r

diff --git a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c
index 513d2f00a7471de6035b286757487aaa01e0adb9..e767c3b172ba9b09164fa2843674f67be3785b74 100644 (file)
--- a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c
@@ -586,7 +586,7 @@ PrepareLpcBridgeDevicePath (
     DEBUG((\r
       DEBUG_INFO,\r
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",\r
     DEBUG((\r
       DEBUG_INFO,\r
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",\r

-      __LINE__,\r
+      DEBUG_LINE_NUMBER,\r

       gPnp16550ComPortDeviceNode.UID + 1,\r
       DevPathStr\r
       ));\r
       gPnp16550ComPortDeviceNode.UID + 1,\r
       DevPathStr\r
       ));\r

diff --git a/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c
index 1c5405f620e762fff7efe112ba52d5ad4d293bb8..fd8057735549e139db0d9e3eea27bb49b597ba4d 100644 (file)
--- a/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c
@@ -556,7 +556,7 @@ PrepareLpcBridgeDevicePath (
     DEBUG((\r
       DEBUG_INFO,\r
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",\r
     DEBUG((\r
       DEBUG_INFO,\r
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",\r

-      __LINE__,\r
+      DEBUG_LINE_NUMBER,\r

       gPnp16550ComPortDeviceNode.UID + 1,\r
       DevPathStr\r
       ));\r
       gPnp16550ComPortDeviceNode.UID + 1,\r
       DevPathStr\r
       ));\r


@@ -588,7 +588,7 @@ PrepareLpcBridgeDevicePath (
     DEBUG((\r
       DEBUG_INFO,\r
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",\r
     DEBUG((\r
       DEBUG_INFO,\r
       "BdsPlatform.c+%d: COM%d DevPath: %s\n",\r

-      __LINE__,\r
+      DEBUG_LINE_NUMBER,\r

       gPnp16550ComPortDeviceNode.UID + 1,\r
       DevPathStr\r
       ));\r
       gPnp16550ComPortDeviceNode.UID + 1,\r
       DevPathStr\r
       ));\r