From nobody Fri May 3 21:07:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83012+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83012+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1635791946; cv=none; d=zohomail.com; s=zohoarc; b=JDQXvkiaeTIr7qn8ivI8yBntKRwgR9znA9ltArjTmtLbnX7OvNmiQ2Lz82/byzNQvsZqZeUdKDTM9/2/Br6/oOq6NL1ywttT5iGhZedJZbFHIvtpSLs6auNySZHZ9RqJMxSTQRspv2cXfrNQrs07N5xIJqGXEst10jmwts6zKXc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635791946; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=AFVN1aMjC99durUGHkp/0ncK2sMW/F7igL5g2fWDmx8=; b=Ch0Wl7bvzJcPLiN2ZGcTqHB7zLYIULfRDI+a8ZPUY/bQx5tdbEDMLmtf9mBvElFzBc1SARlb5vTDlINgLd5z0rI9TA2kk5GJJm6G8FY5mf6CwiAKAVX2e204xZOXCWajUyvRuuiTJCc1Cuf48IuKHrvDthGSXj91jp6c3UTq1m8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83012+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635791946969671.1885752985694; Mon, 1 Nov 2021 11:39:06 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id EzXaYY1788612xq2wilJwQ0Y; Mon, 01 Nov 2021 11:39:06 -0700 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.378.1635791944897474298 for ; Mon, 01 Nov 2021 11:39:06 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="217997879" X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="217997879" X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 11:29:53 -0700 X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="488751822" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.76.205]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 11:29:53 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao , Zhiguang Liu , Michael Kubacki Subject: [edk2-devel] [Patch 1/6] MdePkg: Reproduce builds across source format changes Date: Mon, 1 Nov 2021 11:29:37 -0700 Message-Id: <20211101182942.321-2-michael.d.kinney@intel.com> In-Reply-To: <20211101182942.321-1-michael.d.kinney@intel.com> References: <20211101182942.321-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com X-Gm-Message-State: 0DBE59xTGapl6f7qYoLn2XwJx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635791946; bh=9008v2i7qvIgBfSOKJQZEZsHPZsehSnhcvKFc0S2ONE=; h=Cc:Date:From:Reply-To:Subject:To; b=cA6DPp5DThKxvwGD0JQQI4W98qej8J7UiZGhqXKkVfRhXxml34hfPHyErlDoHasLy20 7aY1/g+5L7ZD26VWyLFl4Jkoab6+QCKqEpYcq9ammoFAshpS+fX0P+LFuOLnLg0SZANCd PdyvNlAPK7V5QHBsetCUrVMEcS/eYHJMIag= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635791948564100009 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3688 * Add DEBUG_LINE_NUMBER define to DebugLib.h that is by default mapped to __LINE__. A build can pre-define DEBUG_LINE_NUMBER to use a fixed value. * Add DEBUG_EXPRESSION_STRING(Expression) macrso to DebugLib.h that is by default mapped to #Expression. A build can define DEBUG_EXPRESSION_STRING_VALUE to set all expression strings to a fixed string value. * Use DEBUG_LINE_NUMBER instead of __LINE__. * Use DEBUG_EXPRESSION_STRING instead of #Expression. Cc: Liming Gao Cc: Zhiguang Liu Cc: Michael Kubacki Signed-off-by: Michael D Kinney Tested-by: Michael Kubacki --- MdePkg/Include/Library/DebugLib.h | 42 +++++++++++++++++++++++++--- MdePkg/Include/Library/UnitTestLib.h | 18 ++++++------ MdePkg/Library/BaseLib/SafeString.c | 2 +- 3 files changed, 48 insertions(+), 14 deletions(-) diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/Deb= ugLib.h index 4cacd4b8e243..287b922e9f74 100644 --- a/MdePkg/Include/Library/DebugLib.h +++ b/MdePkg/Include/Library/DebugLib.h @@ -71,6 +71,40 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define EFI_D_VERBOSE DEBUG_VERBOSE #define EFI_D_ERROR DEBUG_ERROR =20 +// +// Source file line number. +// Default is use the to compiler provided __LINE__ macro value. The __LIN= E__ +// mapping can be overriden by predefining DEBUG_LINE_NUMBER +// +// Defining DEBUG_LINE_NUMBER to a fixed value is useful when comparing bu= ilds +// across source code formatting changes that may add/remove lines in a so= urce +// file. +// +#ifndef DEBUG_LINE_NUMBER +#define DEBUG_LINE_NUMBER __LINE__ +#endif + +/** + Macro that converts a Boolean expression to a Null-terminated ASCII stri= ng. + + The default is to use the C pre-processor stringizing operator '#' to add + quotes around the C expression. If DEBUG_EXPRESSION_STRING_VALUE is defi= ned + then the C expression is converted to the fixed string value. + + Defining DEBUG_EXPRESSION_STRING_VALUE to a fixed value is useful when + comparing builds across source code formatting changes that may make + changes to spaces or parenthesis in a Boolean expression. + + @param Expression Boolean expression. + +**/ + +#ifndef DEBUG_EXPRESSION_STRING_VALUE +#define DEBUG_EXPRESSION_STRING(Expression) #Expression +#else +#define DEBUG_EXPRESSION_STRING(Expression) DEBUG_EXPRESSION_STRING_VALUE +#endif + /** Prints a debug message to the debug output device if the specified error= level is enabled. =20 @@ -310,15 +344,15 @@ UnitTestDebugAssert ( ); =20 #if defined(__clang__) && defined(__FILE_NAME__) -#define _ASSERT(Expression) UnitTestDebugAssert (__FILE_NAME__, __LINE__,= #Expression) +#define _ASSERT(Expression) UnitTestDebugAssert (__FILE_NAME__, DEBUG_LIN= E_NUMBER, DEBUG_EXPRESSION_STRING(Expression)) #else -#define _ASSERT(Expression) UnitTestDebugAssert (__FILE__, __LINE__, #Exp= ression) +#define _ASSERT(Expression) UnitTestDebugAssert (__FILE__, DEBUG_LINE_NUM= BER, DEBUG_EXPRESSION_STRING(Expression)) #endif #else #if defined(__clang__) && defined(__FILE_NAME__) -#define _ASSERT(Expression) DebugAssert (__FILE_NAME__, __LINE__, #Expres= sion) +#define _ASSERT(Expression) DebugAssert (__FILE_NAME__, DEBUG_LINE_NUMBER= , DEBUG_EXPRESSION_STRING(Expression)) #else -#define _ASSERT(Expression) DebugAssert (__FILE__, __LINE__, #Expression) +#define _ASSERT(Expression) DebugAssert (__FILE__, DEBUG_LINE_NUMBER, DEB= UG_EXPRESSION_STRING(Expression)) #endif #endif =20 diff --git a/MdePkg/Include/Library/UnitTestLib.h b/MdePkg/Include/Library/= UnitTestLib.h index 99175496c8cd..7cc6082387bb 100644 --- a/MdePkg/Include/Library/UnitTestLib.h +++ b/MdePkg/Include/Library/UnitTestLib.h @@ -348,7 +348,7 @@ SaveFrameworkState ( @param[in] Expression Expression to be evaluated for TRUE. **/ #define UT_ASSERT_TRUE(Expression) = \ - if(!UnitTestAssertTrue ((Expression), __FUNCTION__, __LINE__, __FILE__, = #Expression)) { \ + if(!UnitTestAssertTrue ((Expression), __FUNCTION__, DEBUG_LINE_NUMBER, _= _FILE__, #Expression)) { \ return UNIT_TEST_ERROR_TEST_FAILED; = \ } =20 @@ -360,7 +360,7 @@ SaveFrameworkState ( @param[in] Expression Expression to be evaluated for FALSE. **/ #define UT_ASSERT_FALSE(Expression) = \ - if(!UnitTestAssertFalse ((Expression), __FUNCTION__, __LINE__, __FILE__,= #Expression)) { \ + if(!UnitTestAssertFalse ((Expression), __FUNCTION__, DEBUG_LINE_NUMBER, = __FILE__, #Expression)) { \ return UNIT_TEST_ERROR_TEST_FAILED; = \ } =20 @@ -373,7 +373,7 @@ SaveFrameworkState ( @param[in] ValueB Value to be compared for equality (64-bit comparison= ). **/ #define UT_ASSERT_EQUAL(ValueA, ValueB) = \ - if(!UnitTestAssertEqual ((UINT64)(ValueA), (UINT64)(ValueB), __FUNCTION_= _, __LINE__, __FILE__, #ValueA, #ValueB)) { \ + if(!UnitTestAssertEqual ((UINT64)(ValueA), (UINT64)(ValueB), __FUNCTION_= _, DEBUG_LINE_NUMBER, __FILE__, #ValueA, #ValueB)) { \ return UNIT_TEST_ERROR_TEST_FAILED; = \ } =20 @@ -387,7 +387,7 @@ SaveFrameworkState ( @param[in] Length Number of bytes to compare in BufferA and BufferB. **/ #define UT_ASSERT_MEM_EQUAL(BufferA, BufferB, Length) = \ - if(!UnitTestAssertMemEqual ((VOID *)(UINTN)(BufferA), (VOID *)(UINTN)(Bu= fferB), (UINTN)Length, __FUNCTION__, __LINE__, __FILE__, #BufferA, #BufferB= )) { \ + if(!UnitTestAssertMemEqual ((VOID *)(UINTN)(BufferA), (VOID *)(UINTN)(Bu= fferB), (UINTN)Length, __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, #BufferA,= #BufferB)) { \ return UNIT_TEST_ERROR_TEST_FAILED; = \ } =20 @@ -400,7 +400,7 @@ SaveFrameworkState ( @param[in] ValueB Value to be compared for inequality (64-bit comparis= on). **/ #define UT_ASSERT_NOT_EQUAL(ValueA, ValueB) = \ - if(!UnitTestAssertNotEqual ((UINT64)(ValueA), (UINT64)(ValueB), __FUNCTI= ON__, __LINE__, __FILE__, #ValueA, #ValueB)) { \ + if(!UnitTestAssertNotEqual ((UINT64)(ValueA), (UINT64)(ValueB), __FUNCTI= ON__, DEBUG_LINE_NUMBER, __FILE__, #ValueA, #ValueB)) { \ return UNIT_TEST_ERROR_TEST_FAILED; = \ } =20 @@ -412,7 +412,7 @@ SaveFrameworkState ( @param[in] Status EFI_STATUS value to check. **/ #define UT_ASSERT_NOT_EFI_ERROR(Status) = \ - if(!UnitTestAssertNotEfiError ((Status), __FUNCTION__, __LINE__, __FILE_= _, #Status)) { \ + if(!UnitTestAssertNotEfiError ((Status), __FUNCTION__, DEBUG_LINE_NUMBER= , __FILE__, #Status)) { \ return UNIT_TEST_ERROR_TEST_FAILED; = \ } =20 @@ -425,7 +425,7 @@ SaveFrameworkState ( @param[in] Expected EFI_STATUS values to compare for equality. **/ #define UT_ASSERT_STATUS_EQUAL(Status, Expected) = \ - if(!UnitTestAssertStatusEqual ((Status), (Expected), __FUNCTION__, __LIN= E__, __FILE__, #Status)) { \ + if(!UnitTestAssertStatusEqual ((Status), (Expected), __FUNCTION__, DEBUG= _LINE_NUMBER, __FILE__, #Status)) { \ return UNIT_TEST_ERROR_TEST_FAILED; = \ } =20 @@ -437,7 +437,7 @@ SaveFrameworkState ( @param[in] Pointer Pointer to be checked against NULL. **/ #define UT_ASSERT_NOT_NULL(Pointer) = \ - if(!UnitTestAssertNotNull ((Pointer), __FUNCTION__, __LINE__, __FILE__, = #Pointer)) { \ + if(!UnitTestAssertNotNull ((Pointer), __FUNCTION__, DEBUG_LINE_NUMBER, _= _FILE__, #Pointer)) { \ return UNIT_TEST_ERROR_TEST_FAILED; = \ } =20 @@ -482,7 +482,7 @@ SaveFrameworkState ( } \ if (!UnitTestExpectAssertFailure ( \ UnitTestJumpStatus, \ - __FUNCTION__, __LINE__, __FILE__, \ + __FUNCTION__, DEBUG_LINE_NUMBER, __FILE__, = \ #FunctionCall, Status)) { \ return UNIT_TEST_ERROR_TEST_FAILED; \ } \ diff --git a/MdePkg/Library/BaseLib/SafeString.c b/MdePkg/Library/BaseLib/S= afeString.c index 3bb23ca1a130..ce6db2b94eff 100644 --- a/MdePkg/Library/BaseLib/SafeString.c +++ b/MdePkg/Library/BaseLib/SafeString.c @@ -17,7 +17,7 @@ if (!(Expression)) { \ DEBUG ((DEBUG_VERBOSE, \ "%a(%d) %a: SAFE_STRING_CONSTRAINT_CHECK(%a) failed. Return %r\n"= , \ - __FILE__, __LINE__, __FUNCTION__, #Expression, Status)); \ + __FILE__, DEBUG_LINE_NUMBER, __FUNCTION__, DEBUG_EXPRESSION_STRING= (Expression), Status)); \ return Status; \ } \ } while (FALSE) --=20 2.32.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83012): https://edk2.groups.io/g/devel/message/83012 Mute This Topic: https://groups.io/mt/86748727/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 3 21:07:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83011+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83011+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1635791946; cv=none; d=zohomail.com; s=zohoarc; b=Fp2DZelSuzfaXP2sFO/fJjzS2+MzlD9MlYfEVUUeqQcMsf7+4nDBkl1/gyAV4pQRxbxtH3mIULVu52JI6eEyExZ4qJDBX1qRMBrNJEqmikdNeTmlmQDONnmgcwYrbJ2nC9Ig7WvAsZ6dj/XX861z/YwLaiTy5qc/obw9JZ6aThw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635791946; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Tcg8wtWIA7dkorUkUTqrN6gNmEVODTAJtluoImJeyuo=; b=cJTrZ+pfLhiTP7wWmzPrAQiDcWcYTJiCZnHiLZpWX8B3y+JeMFYVKnqie9lXKlSQ2686bCM3Y9Lg1n0aL3HjNWBzSKEP589VyxwPH17s40ZEntMokF4R1yQSTQI8FUiuGOR99vYbs9RMjOWvTEysNH/phzka6XRLddvOVBLSTPg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83011+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635791946430463.0428781447117; Mon, 1 Nov 2021 11:39:06 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id VjreYY1788612xC1IeFPQDBl; Mon, 01 Nov 2021 11:39:06 -0700 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.378.1635791944897474298 for ; Mon, 01 Nov 2021 11:39:05 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="217997880" X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="217997880" X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 11:29:54 -0700 X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="488751823" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.76.205]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 11:29:53 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Michael Kubacki Subject: [edk2-devel] [Patch 2/6] ArmPkg: Reproduce builds across source format changes Date: Mon, 1 Nov 2021 11:29:38 -0700 Message-Id: <20211101182942.321-3-michael.d.kinney@intel.com> In-Reply-To: <20211101182942.321-1-michael.d.kinney@intel.com> References: <20211101182942.321-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com X-Gm-Message-State: YwbNjCT3h05BIbTAD6BAW2tNx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635791946; bh=8/eCbnd2yjASHf0MkHx4IjMzwqtts0I8WNslNeyw034=; h=Cc:Date:From:Reply-To:Subject:To; b=qR0FyBHpmJcVtMN9fhKDza2BvenerG1fiRgNsnTdjbbAHjPkcwlRoGnsNvP1htMXW7t XC1bmnHQalbdQi8Dcg+ssiPQNGDI0mS+trOoGkMn+dgr/ekSyD7IvVK/xer3uPxIko/L3 WVr1Sm9Klchw1CmdO1mvbcL+APKCy9AV2nk= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635791948621100011 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3688 Use DEBUG_LINE_NUMBER instead of __LINE__. Cc: Leif Lindholm Cc: Ard Biesheuvel Cc: Michael Kubacki Signed-off-by: Michael D Kinney Reviewed-by: Leif Lindholm Tested-by: Michael Kubacki --- .../Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c | 2 +- .../Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c | 2 +- .../SmbiosMiscDxe/Type01/MiscSystemManufacturerFunction.c | 2 +- .../SmbiosMiscDxe/Type02/MiscBaseBoardManufacturerFunction.c | 2 +- .../SmbiosMiscDxe/Type03/MiscChassisManufacturerFunction.c | 2 +- .../Type13/MiscNumberOfInstallableLanguagesFunction.c | 2 +- .../Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunction.c | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass= .c b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c index 4b409ff7458c..cbdf6df01ee0 100644 --- a/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c +++ b/ArmPkg/Universal/Smbios/ProcessorSubClassDxe/ProcessorSubClass.c @@ -689,7 +689,7 @@ AddSmbiosProcessorTypeTable ( =20 if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type04 Table Log Failed! %r \n= ", - __FUNCTION__, __LINE__, Status)); + __FUNCTION__, DEBUG_LINE_NUMBER, Status)); } FreePool (Type4Record); =20 diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFun= ction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFuncti= on.c index 5679ebaac8a5..2506c03d64b1 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type00/MiscBiosVendorFunction.c @@ -271,7 +271,7 @@ SMBIOS_MISC_TABLE_FUNCTION (MiscBiosVendor) Status =3D SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type00 Table Log Failed! %r \n= ", - __FUNCTION__, __LINE__, Status)); + __FUNCTION__, DEBUG_LINE_NUMBER, Status)); } =20 FreePool (SmbiosRecord); diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufac= turerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemMa= nufacturerFunction.c index 2c69c2593f5d..555557a2a946 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFu= nction.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type01/MiscSystemManufacturerFu= nction.c @@ -162,7 +162,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscSystemManufacturer) Status =3D SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type01 Table Log Failed! %r \n= ", - __FUNCTION__, __LINE__, Status)); + __FUNCTION__, DEBUG_LINE_NUMBER, Status)); } =20 FreePool (SmbiosRecord); diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManu= facturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseB= oardManufacturerFunction.c index 097777a23904..f11295b199b3 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacture= rFunction.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type02/MiscBaseBoardManufacture= rFunction.c @@ -196,7 +196,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscBaseBoardManufacturer) Status =3D SmbiosMiscAddRecord ((UINT8 *)SmbiosRecord, NULL); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type02 Table Log Failed! %r \n= ", - __FUNCTION__, __LINE__, Status)); + __FUNCTION__, DEBUG_LINE_NUMBER, Status)); } =20 FreePool (SmbiosRecord); diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufa= cturerFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassis= ManufacturerFunction.c index 66e3e5327fc3..d64046182b96 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerF= unction.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type03/MiscChassisManufacturerF= unction.c @@ -178,7 +178,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscChassisManufacturer) Status =3D SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type03 Table Log Failed! %r \n= ", - __FUNCTION__, __LINE__, Status)); + __FUNCTION__, DEBUG_LINE_NUMBER, Status)); } =20 FreePool (SmbiosRecord); diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInsta= llableLanguagesFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/Mi= scNumberOfInstallableLanguagesFunction.c index 7c941b5c0709..017b410a16d0 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableL= anguagesFunction.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type13/MiscNumberOfInstallableL= anguagesFunction.c @@ -158,7 +158,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscNumberOfInstallableLangu= ages) Status =3D SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type13 Table Log Failed! %r \n= ", - __FUNCTION__, __LINE__, Status)); + __FUNCTION__, DEBUG_LINE_NUMBER, Status)); } =20 FreePool (SmbiosRecord); diff --git a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformati= onFunction.c b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInforma= tionFunction.c index 4be1e1cd29a9..c4ce6a5e7608 100644 --- a/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunct= ion.c +++ b/ArmPkg/Universal/Smbios/SmbiosMiscDxe/Type32/MiscBootInformationFunct= ion.c @@ -68,7 +68,7 @@ SMBIOS_MISC_TABLE_FUNCTION(MiscBootInformation) Status =3D SmbiosMiscAddRecord ((UINT8*)SmbiosRecord, NULL); if (EFI_ERROR (Status)) { DEBUG ((DEBUG_ERROR, "[%a]:[%dL] Smbios Type32 Table Log Failed! %r \n= ", - __FUNCTION__, __LINE__, Status)); + __FUNCTION__, DEBUG_LINE_NUMBER, Status)); } =20 FreePool (SmbiosRecord); --=20 2.32.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83011): https://edk2.groups.io/g/devel/message/83011 Mute This Topic: https://groups.io/mt/86748726/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 3 21:07:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83013+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83013+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1635791947; cv=none; d=zohomail.com; s=zohoarc; b=ZNeK+RnpKFRbZaFyEX9jP7Fo3HKbstic3nXL0Emo8mSVlc6Gx++jnJj/XlsUjELvNA7qhln3GhbawAQNYCIT0jCdnfLy0+yi0o5KGBGwT4LXFrDuu//2FDh+x0VITc4SgRakhs0PfNujwMZu5L5jAWbKeBOf9Po76slQDlJSVDU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635791947; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=R5lF5dffaI0iqJ5hxHQklqGUOYXLvrrx+JF8+KSc4Pk=; b=kHy8e8vXbK7uMuRpUQEfaedEKkKYDAMAbS7nZKY46ogbEjoIXnYkCbhkTOQSOOuCZHjyb+UlayxZYwZme1sitNqqVURYQNZWZuSZklv7S8y7+xRkoMdlLHJK0/QdNnmiXJWgkf9in3rdPonSbwRT7jcj4G5oQ5F45VgpdJdHJjE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83013+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635791947578472.1844260071582; Mon, 1 Nov 2021 11:39:07 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id EGNWYY1788612x4Cz8DnWi0G; Mon, 01 Nov 2021 11:39:07 -0700 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web09.413.1635791946568759619 for ; Mon, 01 Nov 2021 11:39:06 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="217997881" X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="217997881" X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 11:29:54 -0700 X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="488751828" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.76.205]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 11:29:53 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jian J Wang , Liming Gao , Michael Kubacki Subject: [edk2-devel] [Patch 3/6] MdeModulePkg: Reproduce builds across source format changes Date: Mon, 1 Nov 2021 11:29:39 -0700 Message-Id: <20211101182942.321-4-michael.d.kinney@intel.com> In-Reply-To: <20211101182942.321-1-michael.d.kinney@intel.com> References: <20211101182942.321-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com X-Gm-Message-State: Ifmoxqy6XYaTEE561U9gZ0UXx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635791947; bh=JAOz7vhgSEYYPtX7GxRMC0P0ZyXghvIXvuL0zziOPRg=; h=Cc:Date:From:Reply-To:Subject:To; b=OtG3/dPFSLxoS5DJxrWUGOnxV/2YpR5xL9IFOKhWx6SR8mSO0HjEk3S8ti4pPHTB2Tx exOqkR0Oaumm7HY9X4jdb0bTEVHiBFQIWcNV39+HqjILkzhKNoZi2r7Y7FvANKXBzY88J psMmkPUWO3YaS8lCuazpfDIoDNLPkwytjuI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635791948689100013 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3688 Use DEBUG_LINE_NUMBER instead of __LINE__. Cc: Jian J Wang Cc: Liming Gao Cc: Michael Kubacki Signed-off-by: Michael D Kinney Tested-by: Michael Kubacki --- MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c | 2 +- MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c b/MdeMod= ulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c index 4ab9415c9600..163e931dd9e8 100644 --- a/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c +++ b/MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridge.c @@ -874,7 +874,7 @@ NotifyPhase ( Translation =3D GetTranslationByResourceType (RootBridge, Index); if ((Translation & Alignment) !=3D 0) { DEBUG ((DEBUG_ERROR, "[%a:%d] Translation %lx is not aligned t= o %lx!\n", - __FUNCTION__, __LINE__, Translation, Alignment + __FUNCTION__, DEBUG_LINE_NUMBER, Translation, Alignment )); ASSERT ((Translation & Alignment) =3D=3D 0); // diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c b/Mde= ModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c index 52e35e45185d..fa1fd87d15ef 100644 --- a/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmDriverHealth.c @@ -574,7 +574,7 @@ BmRepairAllControllers ( BmRepairAllControllers (ReconnectRepairCount + 1); } else { DEBUG ((DEBUG_ERROR, "[%a:%d] Repair failed after %d retries.\n", - __FUNCTION__, __LINE__, ReconnectRepairCount)); + __FUNCTION__, DEBUG_LINE_NUMBER, ReconnectRepairCount)); } } =20 --=20 2.32.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83013): https://edk2.groups.io/g/devel/message/83013 Mute This Topic: https://groups.io/mt/86748728/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 3 21:07:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83014+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83014+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1635791948; cv=none; d=zohomail.com; s=zohoarc; b=cK+/JgRqZl3Xn4LJXoEmBVpNialnDepOIEo/cTOx+eUpZg1PuA7GAU6M7p2+yqlpm8nyjuVUt4hfKlkraNa2quTOYUMb7i5OOASvNO+n3CAhYR1PGbvlnq0CN68dkMeSktscP4lQbf56FWvrsgocBX6+VB7LHQGy61tNKe2P7nk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635791948; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=Oe3/G3zLuc117vj/kliE3sPkJKJ/oGo6Go3eiw28u8I=; b=fEalq/gDEQhzXN/TsOemA4ERfBTryZrf7tUUPuEmeiFhVn1AL3Ovfhblq3OMoVaC1QTz81KXVGmQnGtT5eSZ34Lo2hH8wWay2OIJTQBPYA01bW1OGi5ALAoPAIoqNmJxsXIsUnVl3l4W+Wql26zDSbTG+BlGq04Af2PT/2mxK/I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83014+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635791948020538.2274768071339; Mon, 1 Nov 2021 11:39:08 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id LazsYY1788612xFFgxPDTcUZ; Mon, 01 Nov 2021 11:39:07 -0700 X-Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web11.378.1635791944897474298 for ; Mon, 01 Nov 2021 11:39:06 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="217997882" X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="217997882" X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 11:29:54 -0700 X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="488751832" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.76.205]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 11:29:53 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Maciej Rabeda , Jiaxin Wu , Siyuan Fu , Michael Kubacki Subject: [edk2-devel] [Patch 4/6] NetworkPkg: Reproduce builds across source format changes Date: Mon, 1 Nov 2021 11:29:40 -0700 Message-Id: <20211101182942.321-5-michael.d.kinney@intel.com> In-Reply-To: <20211101182942.321-1-michael.d.kinney@intel.com> References: <20211101182942.321-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com X-Gm-Message-State: JtO4fGH4CtFCNmmPhYIWgvf1x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635791947; bh=/0LYgbUMQORsBqcQX61gShUzH0tF1gA0iQf5lOJsI0Y=; h=Cc:Date:From:Reply-To:Subject:To; b=TsoUWrQPSSQaQcd1GkQNqhmEGt3Hv4ahGhiKjFyqrjw1h+R8gbrFmh/CWJ27SK2Ycxk sAmR/9NRh/XyiVbgaY3l1Q5HJVuT8jYCZ8n7NxAtc7B3LAMt9OD3JY98BNlFUZsbAYRNz ocWEV+40qvXMRVtzXmyzRxCD/KNdpJFIrOI= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635791948759100017 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3688 Use DEBUG_LINE_NUMBER instead of __LINE__. Cc: Maciej Rabeda Cc: Jiaxin Wu Cc: Siyuan Fu Cc: Michael Kubacki Signed-off-by: Michael D Kinney Tested-by: Michael Kubacki --- NetworkPkg/Include/Library/NetLib.h | 8 ++++---- NetworkPkg/Library/DxeNetLib/DxeNetLib.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/NetworkPkg/Include/Library/NetLib.h b/NetworkPkg/Include/Libra= ry/NetLib.h index 858d0b6ba07c..6c0924863147 100644 --- a/NetworkPkg/Include/Library/NetLib.h +++ b/NetworkPkg/Include/Library/NetLib.h @@ -277,7 +277,7 @@ typedef struct { NETDEBUG_LEVEL_TRACE, \ Module, \ __FILE__, \ - __LINE__, \ + DEBUG_LINE_NUMBER, \ NetDebugASPrint PrintArg \ ) =20 @@ -286,7 +286,7 @@ typedef struct { NETDEBUG_LEVEL_WARNING, \ Module, \ __FILE__, \ - __LINE__, \ + DEBUG_LINE_NUMBER, \ NetDebugASPrint PrintArg \ ) =20 @@ -295,7 +295,7 @@ typedef struct { NETDEBUG_LEVEL_ERROR, \ Module, \ __FILE__, \ - __LINE__, \ + DEBUG_LINE_NUMBER, \ NetDebugASPrint PrintArg \ ) =20 @@ -311,7 +311,7 @@ typedef struct { NETDEBUG_LEVEL_TRACE, "Tcp", __FILE__, - __LINE__, + DEBUG_LINE_NUMBER, NetDebugASPrint ("State transit to %a\n", Name) ) =20 diff --git a/NetworkPkg/Library/DxeNetLib/DxeNetLib.c b/NetworkPkg/Library/= DxeNetLib/DxeNetLib.c index 2a555a7b90fa..0f95ce4b710d 100644 --- a/NetworkPkg/Library/DxeNetLib/DxeNetLib.c +++ b/NetworkPkg/Library/DxeNetLib/DxeNetLib.c @@ -434,7 +434,7 @@ SyslogBuildPacket ( NETDEBUG_LEVEL_TRACE, "Tcp", __FILE__, - __LINE__, + DEBUG_LINE_NUMBER, NetDebugASPrint ("State transit to %a\n", Name) ) =20 --=20 2.32.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83014): https://edk2.groups.io/g/devel/message/83014 Mute This Topic: https://groups.io/mt/86748731/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 3 21:07:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83008+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83008+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1635791863; cv=none; d=zohomail.com; s=zohoarc; b=bj2bJoi0R/kVBsgrYgdp1MfrEICADYmvPfmL7l/To0EZNRy51b7T+aq+VoHUWUi55IM+P4Prnt8vXctpjQxqsGUGENC3x5pU2HWVrbKwliye9tvA+iidgltQ4oDPL2JUSD2j/h47y25LVmvtkEnacNpBblq34YwHQWPUZFFpgWk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635791863; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=C+c31h/FQwLgb+E/6yvbf6bwevef5vdewXkWb1tOkLE=; b=Xp8itNRWMqSLAl07t4UjJPcISXgvKF+wL4AfioXCu94QHB5BoGFDy6C2DxWiVyGMCcM3IScWtGqkl2hE0lLcXbVhnbRv1FUsDL0kRNg3dm5UWFpwlsmtcvCkmRgBwvGhpFCCOD4xQOaSOy//CpbXvivzZo/wISupZQ9EcVI9+UQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83008+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635791863447831.4165725335001; Mon, 1 Nov 2021 11:37:43 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id zQbeYY1788612xA0aERw2V7J; Mon, 01 Nov 2021 11:37:43 -0700 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.360.1635791862213530022 for ; Mon, 01 Nov 2021 11:37:42 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="230943420" X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="230943420" X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 11:29:54 -0700 X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="488751839" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.76.205]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 11:29:54 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Michael Kubacki Subject: [edk2-devel] [Patch 5/6] SecurityPkg: Reproduce builds across source format changes Date: Mon, 1 Nov 2021 11:29:41 -0700 Message-Id: <20211101182942.321-6-michael.d.kinney@intel.com> In-Reply-To: <20211101182942.321-1-michael.d.kinney@intel.com> References: <20211101182942.321-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com X-Gm-Message-State: KaQ0ox102UOlXfOvuIMRachCx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635791863; bh=eX+I6YgjbQhxzagQd/8/tur7epZEXCKCEI8xogUsHa8=; h=Cc:Date:From:Reply-To:Subject:To; b=hMtb3LXWEvc52eEamvLO98PrM/9l6HM8h7QLeFdW19kyVHSGxSR9aHMnInT1xtgxyV2 PNkHeoMTJ5mxo28GB/pubrkZ+cc6RVDQ9U06cqW2zNeGReMiCqaNWarPV+oaiOaXCSpmf CzcrGUP+OCgr9nqpJyBSz9EM7kl2pkjQ1cE= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635791865230100001 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3688 Use DEBUG_LINE_NUMBER instead of __LINE__. Cc: Jiewen Yao Cc: Jian J Wang Cc: Michael Kubacki Signed-off-by: Michael D Kinney Tested-by: Michael Kubacki --- SecurityPkg/Include/Library/TcgStorageCoreLib.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SecurityPkg/Include/Library/TcgStorageCoreLib.h b/SecurityPkg/= Include/Library/TcgStorageCoreLib.h index 01a44c667c80..44dbdc0ffa32 100644 --- a/SecurityPkg/Include/Library/TcgStorageCoreLib.h +++ b/SecurityPkg/Include/Library/TcgStorageCoreLib.h @@ -20,7 +20,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent { = \ TCG_RESULT ret =3D (arg); = \ if (ret !=3D TcgResultSuccess) { = \ - DEBUG ((DEBUG_INFO, "ERROR_CHECK failed at %a:%u\n", __FILE__, __LIN= E__)); \ + DEBUG ((DEBUG_INFO, "ERROR_CHECK failed at %a:%u\n", __FILE__, DEBUG= _LINE_NUMBER)); \ return ret; = \ } = \ } @@ -34,7 +34,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent #define NULL_CHECK(arg) = \ do { = \ if ((arg) =3D=3D NULL) { = \ - DEBUG ((DEBUG_INFO, "NULL_CHECK(%a) failed at %a:%u\n", #arg, __FILE= __, __LINE__)); \ + DEBUG ((DEBUG_INFO, "NULL_CHECK(%a) failed at %a:%u\n", #arg, __FILE= __, DEBUG_LINE_NUMBER)); \ return TcgResultFailureNullPointer; = \ } = \ } while (0) --=20 2.32.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83008): https://edk2.groups.io/g/devel/message/83008 Mute This Topic: https://groups.io/mt/86748689/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- From nobody Fri May 3 21:07:00 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) client-ip=66.175.222.108; envelope-from=bounce+27952+83009+1787277+3901457@groups.io; helo=mail02.groups.io; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83009+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1635791863; cv=none; d=zohomail.com; s=zohoarc; b=X9og+CJ+L56DyrZKZxQtcHLJAjl0w6xnrZleLvPSwrZWK+LPw+cgOYirU/9C2N7Gqo2XClOyk5ykJjw8QBpVJzKCVbeoNwKHFxGvDM/DX1fA0kI6jrxB9BMIfPAVkX6ipwD/QNjb8FAuXvraDQHDTSQTvsq5aijsy65k5lpQrS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635791863; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:References:Sender:Subject:To; bh=jLgy4HKAP9UKhtjwqo6xGg3FLUEZyLd9G800wpEIgNk=; b=B4kuPCazFeXrRf1f2YR+koOHB7P8nhBycPJ1ym/Rjfz+gth532n3cKvzPOAOl2G0K5hlEdVyXJAstOSiYHKTKcV+I2yY9eiClPQUKP7fX2RrQ33qa0lZbHRq3K0dZmxAvfhCsJFnjb1NrO2mQtU3uk0Udodp0NXnYB01APwN4jI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce+27952+83009+1787277+3901457@groups.io; dmarc=fail header.from= (p=none dis=none) Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by mx.zohomail.com with SMTPS id 1635791863919738.2248209115791; Mon, 1 Nov 2021 11:37:43 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id lLcVYY1788612xfufKcDBfxS; Mon, 01 Nov 2021 11:37:43 -0700 X-Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web11.360.1635791862213530022 for ; Mon, 01 Nov 2021 11:37:43 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="230943425" X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="230943425" X-Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 11:29:54 -0700 X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="488751848" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.76.205]) by orsmga007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 11:29:54 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Jiewen Yao , Jordan Justen , Gerd Hoffmann , Michael Kubacki Subject: [edk2-devel] [Patch 6/6] OvmfPkg: Reproduce builds across source format changes Date: Mon, 1 Nov 2021 11:29:42 -0700 Message-Id: <20211101182942.321-7-michael.d.kinney@intel.com> In-Reply-To: <20211101182942.321-1-michael.d.kinney@intel.com> References: <20211101182942.321-1-michael.d.kinney@intel.com> MIME-Version: 1.0 Precedence: Bulk List-Unsubscribe: List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,michael.d.kinney@intel.com X-Gm-Message-State: fsogXrfhgkUkiO7sEBIJRjZTx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635791863; bh=UUhR57MEatxfjvhQIM1BxKxkUh2wCStLuDAUywrQiBw=; h=Cc:Date:From:Reply-To:Subject:To; b=ALPfPzsogZ+4KZhwLDtkzG1WE9VBxVxG99cyx6rX8AsS+MVZ8IWDiYaAW0EISHiZWdy 6X8kFAjjsdj9PlgdvcXYtFq1gpUPGXNKZD1eSezOcC1l/vo6qW51t10cDkOgXwCLGMwlq HrIo1xJF5zOOBIU9QHC4TJPPs1552VLXRQM= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635791865289100004 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3688 Use DEBUG_LINE_NUMBER instead of __LINE__. Cc: Ard Biesheuvel Cc: Jiewen Yao Cc: Jordan Justen Cc: Gerd Hoffmann Cc: Michael Kubacki Signed-off-by: Michael D Kinney Tested-by: Michael Kubacki --- 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/LegacyBios= Dxe/LegacyPci.c index 746b366448e6..350cf3dd0b3a 100644 --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c @@ -2321,7 +2321,7 @@ LegacyBiosInstallRom ( ); =20 if (EFI_ERROR (Status)) { - DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RE= SOURCES (no more space for OpROM)\n", __LINE__)); + DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RE= SOURCES (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 =3D Private->OptionRom; if (RuntimeAddress + *RuntimeImageLength > MaxRomAddr) { - DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RE= SOURCES (no more space for OpROM)\n", __LINE__)); + DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RE= SOURCES (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 =3D PCI_START_ADDRESS (Private->OptionRom); if (InitAddress + ImageSize > MaxRomAddr) { - DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RE= SOURCES (no more space for OpROM)\n", __LINE__)); + DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): EFI_OUT_OF_RE= SOURCES (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/Ov= mfPkg/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/Ovm= fPkg/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 )); --=20 2.32.0.windows.1 -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#83009): https://edk2.groups.io/g/devel/message/83009 Mute This Topic: https://groups.io/mt/86748690/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-