Reviewed-by: Jiewen Yao <jiewen....@intel.com> > -----Original Message----- > From: Kinney, Michael D <michael.d.kin...@intel.com> > Sent: Tuesday, November 2, 2021 5:38 AM > To: devel@edk2.groups.io > Cc: Ard Biesheuvel <ardb+tianoc...@kernel.org>; Yao, Jiewen > <jiewen....@intel.com>; Justen, Jordan L <jordan.l.jus...@intel.com>; Gerd > Hoffmann <kra...@redhat.com>; Michael Kubacki > <michael.kuba...@microsoft.com> > Subject: [Patch V2 7/7] 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+tianoc...@kernel.org> > Cc: Jiewen Yao <jiewen....@intel.com> > Cc: Jordan Justen <jordan.l.jus...@intel.com> > Cc: Gerd Hoffmann <kra...@redhat.com> > Cc: Michael Kubacki <michael.kuba...@microsoft.com> > Signed-off-by: Michael D Kinney <michael.d.kin...@intel.com> > --- > OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c | 6 +++--- > OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 4 ++-- > OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c | 2 +- > OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c | 4 ++-- > 4 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c > b/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c > index 746b366448e6..350cf3dd0b3a 100644 > --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c > +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c > @@ -2321,7 +2321,7 @@ LegacyBiosInstallRom ( > ); > > if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): > EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__)); > + DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): > EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", > DEBUG_LINE_NUMBER)); > // > // Report Status Code to indicate that there is no enough space for > OpROM > // > @@ -2337,7 +2337,7 @@ LegacyBiosInstallRom ( > // > RuntimeAddress = Private->OptionRom; > if (RuntimeAddress + *RuntimeImageLength > MaxRomAddr) { > - DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): > EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__)); > + DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): > EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", > DEBUG_LINE_NUMBER)); > gBS->FreePages (PhysicalAddress, EFI_SIZE_TO_PAGES (ImageSize)); > // > // Report Status Code to indicate that there is no enough space for > OpROM > @@ -2355,7 +2355,7 @@ LegacyBiosInstallRom ( > // > InitAddress = PCI_START_ADDRESS (Private->OptionRom); > if (InitAddress + ImageSize > MaxRomAddr) { > - DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): > EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__)); > + DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): > EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", > DEBUG_LINE_NUMBER)); > // > // Report Status Code to indicate that there is no enough space for > OpROM > // > diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > index 9b21ba2bd699..186401296ae2 100644 > --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > @@ -624,7 +624,7 @@ PrepareLpcBridgeDevicePath ( > DEBUG(( > DEBUG_INFO, > "BdsPlatform.c+%d: COM%d DevPath: %s\n", > - __LINE__, > + DEBUG_LINE_NUMBER, > gPnp16550ComPortDeviceNode.UID + 1, > DevPathStr > )); > @@ -656,7 +656,7 @@ PrepareLpcBridgeDevicePath ( > DEBUG(( > DEBUG_INFO, > "BdsPlatform.c+%d: COM%d DevPath: %s\n", > - __LINE__, > + DEBUG_LINE_NUMBER, > gPnp16550ComPortDeviceNode.UID + 1, > DevPathStr > )); > diff --git a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c > b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c > index 513d2f00a747..e767c3b172ba 100644 > --- a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c > +++ b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c > @@ -586,7 +586,7 @@ PrepareLpcBridgeDevicePath ( > DEBUG(( > DEBUG_INFO, > "BdsPlatform.c+%d: COM%d DevPath: %s\n", > - __LINE__, > + DEBUG_LINE_NUMBER, > gPnp16550ComPortDeviceNode.UID + 1, > DevPathStr > )); > diff --git a/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c > b/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c > index 1c5405f620e7..fd8057735549 100644 > --- a/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c > +++ b/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c > @@ -556,7 +556,7 @@ PrepareLpcBridgeDevicePath ( > DEBUG(( > DEBUG_INFO, > "BdsPlatform.c+%d: COM%d DevPath: %s\n", > - __LINE__, > + DEBUG_LINE_NUMBER, > gPnp16550ComPortDeviceNode.UID + 1, > DevPathStr > )); > @@ -588,7 +588,7 @@ PrepareLpcBridgeDevicePath ( > DEBUG(( > DEBUG_INFO, > "BdsPlatform.c+%d: COM%d DevPath: %s\n", > - __LINE__, > + DEBUG_LINE_NUMBER, > gPnp16550ComPortDeviceNode.UID + 1, > DevPathStr > )); > -- > 2.32.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83364): https://edk2.groups.io/g/devel/message/83364 Mute This Topic: https://groups.io/mt/86752908/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
