From nobody Sun May 5 10:15:42 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+83055+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+83055+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1635802672; cv=none; d=zohomail.com; s=zohoarc; b=Nv4o6fZ527Vx6zn9JOzoFgTQX5q0ZP88hSg2uiQ0PJbVBfWCh2sAPjKmsPhlcedib0q82gmKmST8u2/ZwMsALbL+YzAph8TltmHZTSMF7Hui1o4gFyxhErYGxC1Y4lvFdiRbS34xlO96ko1WH3RTgbHcFMGYDEpRdXakDY6BUB8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635802672; 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=BYTEHStNsFEewYxwrbSucD81ZbFGEcaGTHDO8Toz0qk=; b=IDoKtGHYRcileQZO1Z9PLCPGN2w6vaakSZkubxwrvgr4/tJxcAkr59gOmm3A4UyOtDIuId8/InK4aV9tSOUhI9fDSgbaX8Yuycl09uVGM7Or5/9SEjxl5HKS1uqtLSLwMVqgSFE3TF3qVM08jWvEYgs9yLMFEwgxoLMxogIj6+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+83055+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 1635802672129708.6525760689949; Mon, 1 Nov 2021 14:37:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id AJviYY1788612x6B1lq71Tg1; Mon, 01 Nov 2021 14:37:51 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web12.951.1635802671189382275 for ; Mon, 01 Nov 2021 14:37:51 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="291964411" X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="291964411" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 14:37:49 -0700 X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="449113013" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.76.205]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 14:37:49 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao , Zhiguang Liu , Michael Kubacki Subject: [edk2-devel] [Patch V2 1/7] MdePkg/Include: Enhance DebugLib to support reproduce builds Date: Mon, 1 Nov 2021 14:37:31 -0700 Message-Id: <20211101213737.586-2-michael.d.kinney@intel.com> In-Reply-To: <20211101213737.586-1-michael.d.kinney@intel.com> References: <20211101213737.586-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: IrfLTzNIKZ7sIpULRLOJaMkHx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635802671; bh=AwN0v6Pj4cw+rK9SukOmcsBMjxxn4kSaEZoVNZszF2s=; h=Cc:Date:From:Reply-To:Subject:To; b=lL6UUleUHl78hwuOol5Ixn0gaevkut7G16InOJWsjXMIILTcpCjB1R/INKxJHjsURKC vL01N9Wk1ubeY9EZN5SLZSgaGHw0YG3ZXnf71VUjrxZENO5PeIHeQy/ob61dmEXddUOwS e3H9z0lQkJClHqcg7evPwJ+DBG7B9tkHeYA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635802673949100002 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 define DEBUG_LINE_NUMBER to use a fixed value. * Add DEBUG_EXPRESSION_STRING(Expression) macros 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. Cc: Liming Gao Cc: Zhiguang Liu Cc: Michael Kubacki Signed-off-by: Michael D Kinney --- MdePkg/Include/Library/DebugLib.h | 43 ++++++++++++++++++++++++++++--- 1 file changed, 39 insertions(+), 4 deletions(-) diff --git a/MdePkg/Include/Library/DebugLib.h b/MdePkg/Include/Library/Deb= ugLib.h index 4cacd4b8e243..7fb75f956c6e 100644 --- a/MdePkg/Include/Library/DebugLib.h +++ b/MdePkg/Include/Library/DebugLib.h @@ -71,6 +71,41 @@ 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. +// +#ifdef DEBUG_LINE_NUMBER +#else +#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. + +**/ + +#ifdef DEBUG_EXPRESSION_STRING_VALUE +#define DEBUG_EXPRESSION_STRING(Expression) DEBUG_EXPRESSION_STRING_VALUE +#else +#define DEBUG_EXPRESSION_STRING(Expression) #Expression +#endif + /** Prints a debug message to the debug output device if the specified error= level is enabled. =20 @@ -310,15 +345,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 --=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 (#83055): https://edk2.groups.io/g/devel/message/83055 Mute This Topic: https://groups.io/mt/86752902/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 Sun May 5 10:15:42 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+83056+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+83056+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1635802672; cv=none; d=zohomail.com; s=zohoarc; b=M+1xZx6N4CvOqqa1I6CRXoqu3UdWbSoertX2JUSb+BPY4XpIvwOzHrspUDr0QsD/ENjwjypC2TJBzqLpomXjYM4RVCUVfG0Yl15ZBB/CMFPm15xA9O5XQ6vC4q8cUpQWJZsqhN52lKQJBYNFXt+Fx8pKWIqRCnc4iinpZmMnA7Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635802672; 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=gayJ9L7LdL/KVMtkSCtGPe1AyC07ykdRc5Ia4ubLBdo=; b=YqVuU1uvr03PiEYeA1IaG3M+Cl5ZmtzfxftoDytes+KafKIFiIbL2N4oFuCMRAQOdSohpR7BN6ECnzahL4u/Ba2QeY6jRP07kg60tHPomR2LJSC2J7JyWya0kVGFThwUxYEXI+EbpUYqgkyku6e7bYirzZNQVfSHa9mhpa80zaI= 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+83056+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 1635802672707996.2737554887839; Mon, 1 Nov 2021 14:37:52 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id Y7pGYY1788612xGtI4yyLApv; Mon, 01 Nov 2021 14:37:52 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web11.906.1635802670411204424 for ; Mon, 01 Nov 2021 14:37:51 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="291964412" X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="291964412" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 14:37:50 -0700 X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="449113019" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.76.205]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 14:37:49 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Liming Gao , Zhiguang Liu , Michael Kubacki Subject: [edk2-devel] [Patch V2 2/7] MdePkg: Reproduce builds across source format changes Date: Mon, 1 Nov 2021 14:37:32 -0700 Message-Id: <20211101213737.586-3-michael.d.kinney@intel.com> In-Reply-To: <20211101213737.586-1-michael.d.kinney@intel.com> References: <20211101213737.586-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: BhQIdWIuqkccA3vvWgsoY3s1x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635802672; bh=6if5Wnhb2z8TqOfs4HifqBGvpPu24z/LqHU7+V2zdO8=; h=Cc:Date:From:Reply-To:Subject:To; b=qEdbE2pUQ25SoZZsjA/GGVi9xBdWzSb8kiFNEZAAZN82cGNoYMJoV5SHfQD/lC6UStC u9l3EtKe9uVQzhiITb3Q6CB5fO9wnpMVRwboieXuzed2Oh+z6+zxLR/oa8KlBZF4bPvIV M8AdGUPoHxQLS9d3yXEv73hdt7hxpZ9V48o= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635803574933100001 Content-Type: text/plain; charset="utf-8" REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3688 * 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 --- MdePkg/Include/Library/UnitTestLib.h | 46 ++++++++++++++-------------- MdePkg/Library/BaseLib/SafeString.c | 2 +- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/MdePkg/Include/Library/UnitTestLib.h b/MdePkg/Include/Library/= UnitTestLib.h index 99175496c8cd..142e865cb219 100644 --- a/MdePkg/Include/Library/UnitTestLib.h +++ b/MdePkg/Include/Library/UnitTestLib.h @@ -347,9 +347,9 @@ SaveFrameworkState ( =20 @param[in] Expression Expression to be evaluated for TRUE. **/ -#define UT_ASSERT_TRUE(Expression) = \ - if(!UnitTestAssertTrue ((Expression), __FUNCTION__, __LINE__, __FILE__, = #Expression)) { \ - return UNIT_TEST_ERROR_TEST_FAILED; = \ +#define UT_ASSERT_TRUE(Expression) = \ + if(!UnitTestAssertTrue ((Expression), __FUNCTION__, DEBUG_LINE_NUMBER, _= _FILE__, #Expression)) { \ + return UNIT_TEST_ERROR_TEST_FAILED; = \ } =20 /** @@ -359,9 +359,9 @@ SaveFrameworkState ( =20 @param[in] Expression Expression to be evaluated for FALSE. **/ -#define UT_ASSERT_FALSE(Expression) = \ - if(!UnitTestAssertFalse ((Expression), __FUNCTION__, __LINE__, __FILE__,= #Expression)) { \ - return UNIT_TEST_ERROR_TEST_FAILED; = \ +#define UT_ASSERT_FALSE(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 @@ -386,9 +386,9 @@ SaveFrameworkState ( @param[in] BufferB Pointer to a buffer for comparison. @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= )) { \ - return UNIT_TEST_ERROR_TEST_FAILED; = \ +#define UT_ASSERT_MEM_EQUAL(BufferA, BufferB, Length) = = \ + 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 /** @@ -399,9 +399,9 @@ SaveFrameworkState ( @param[in] ValueA Value to be compared for inequality (64-bit comparis= on). @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)) { \ - return UNIT_TEST_ERROR_TEST_FAILED; = \ +#define UT_ASSERT_NOT_EQUAL(ValueA, ValueB) = \ + if(!UnitTestAssertNotEqual ((UINT64)(ValueA), (UINT64)(ValueB), __FUNCTI= ON__, DEBUG_LINE_NUMBER, __FILE__, #ValueA, #ValueB)) { \ + return UNIT_TEST_ERROR_TEST_FAILED; = \ } =20 /** @@ -411,9 +411,9 @@ SaveFrameworkState ( =20 @param[in] Status EFI_STATUS value to check. **/ -#define UT_ASSERT_NOT_EFI_ERROR(Status) = \ - if(!UnitTestAssertNotEfiError ((Status), __FUNCTION__, __LINE__, __FILE_= _, #Status)) { \ - return UNIT_TEST_ERROR_TEST_FAILED; = \ +#define UT_ASSERT_NOT_EFI_ERROR(Status) = \ + if(!UnitTestAssertNotEfiError ((Status), __FUNCTION__, DEBUG_LINE_NUMBER= , __FILE__, #Status)) { \ + return UNIT_TEST_ERROR_TEST_FAILED; = \ } =20 /** @@ -424,9 +424,9 @@ SaveFrameworkState ( @param[in] Status EFI_STATUS values to compare for equality. @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)) { \ - return UNIT_TEST_ERROR_TEST_FAILED; = \ +#define UT_ASSERT_STATUS_EQUAL(Status, Expected) = \ + if(!UnitTestAssertStatusEqual ((Status), (Expected), __FUNCTION__, DEBUG= _LINE_NUMBER, __FILE__, #Status)) { \ + return UNIT_TEST_ERROR_TEST_FAILED; = \ } =20 /** @@ -436,9 +436,9 @@ SaveFrameworkState ( =20 @param[in] Pointer Pointer to be checked against NULL. **/ -#define UT_ASSERT_NOT_NULL(Pointer) = \ - if(!UnitTestAssertNotNull ((Pointer), __FUNCTION__, __LINE__, __FILE__, = #Pointer)) { \ - return UNIT_TEST_ERROR_TEST_FAILED; = \ +#define UT_ASSERT_NOT_NULL(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..24e818b921ea 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 (#83056): https://edk2.groups.io/g/devel/message/83056 Mute This Topic: https://groups.io/mt/86752903/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 Sun May 5 10:15:42 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+83057+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+83057+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1635802674; cv=none; d=zohomail.com; s=zohoarc; b=lTZH6jrLZBzK3kZIpi34CikrtDNQsK4H/dzVu7EZELPcGc1aMET33GCusCnQYkLnH13Rf4QxYPKCWYKyGIUhcn/hCFdaJPGzY5rtMHgYUhRyU3hqMPyyjF56I5+1EhBgg/Hul+FHHowOaRZURDBzccxPuxYfjdbK+Qw78kxqZag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635802674; 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=qV0YYMbCFqfp6Fe7U2882zTBh4f7GfGSk7YB4jjrbTs=; b=kUBFPIIu9qy42nR2MDHvCpEEjU3knb47V0v5wqrHnDsMjQfK8hPlRYxszHvUSoXsFts7k85i0fc+qjDFWDBQ0hDHgcSk9jVbpQnNBZm9nth6Z+CkqUZ7hN1Xl0NZ8FtL99mAoHlLADHfR4ZwAiAFGuZ+JiDmAiv5JkQzjowBTes= 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+83057+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 1635802674604515.9398549631131; Mon, 1 Nov 2021 14:37:54 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id tkmSYY1788612xCdQDS6LkEw; Mon, 01 Nov 2021 14:37:54 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web12.951.1635802671189382275 for ; Mon, 01 Nov 2021 14:37:51 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="291964413" X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="291964413" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 14:37:50 -0700 X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="449113020" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.76.205]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 14:37:50 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Leif Lindholm , Ard Biesheuvel , Michael Kubacki Subject: [edk2-devel] [Patch V2 3/7] ArmPkg: Reproduce builds across source format changes Date: Mon, 1 Nov 2021 14:37:33 -0700 Message-Id: <20211101213737.586-4-michael.d.kinney@intel.com> In-Reply-To: <20211101213737.586-1-michael.d.kinney@intel.com> References: <20211101213737.586-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: VLQ6qHslyLRF7swIqaAH45GIx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635802674; bh=OT85ZyPP426uBoFLknoY+0tpHd0kMEEjbdNYAFxx/7s=; h=Cc:Date:From:Reply-To:Subject:To; b=nGgmB1iHKvId0JI2tU6Cj/vcGKPx2O5piARngtV8ncXBg1EjsvyzJXtt20aHAZD/eWH 0K2pbSqVMnGC+FCaPxZyhUUaHKhWkfSN2vxmIhFTbt7x+TU5BPJFBVeygK1C29T0aa1zj dsq7V6X5X7zf8ec6xlFl3qWyU+clp07jZO8= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635802676267100021 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 --- .../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 (#83057): https://edk2.groups.io/g/devel/message/83057 Mute This Topic: https://groups.io/mt/86752904/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 Sun May 5 10:15:42 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+83058+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+83058+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1635802674; cv=none; d=zohomail.com; s=zohoarc; b=AIdvl73zaddeL3brtUWn8d0dvq7MV+/Gcz3NMLceOWM69QLr2gdZh6P8z+CcKYeo3/PrFB/aPhXkZ0REk44u29qx6OpIPSdP7YJDFPFBMYSnl2DOT/YLE2cAKfu9cj7V9JcEkXWWiDsk/0eTEXjy8BEiz3jTjTE7VnYTzmD9vmU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635802674; 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=VaPpfgo4MuR7jH5QZg98pZzKUSMqawyBEBr2WZdEliY=; b=Th6dp5CEALqYVq0Ms9jBh7fCqgTI3TLo2ClYuJyAZ+IPaVqp6C/6yAWzp19Z4AIMLWhsoLNkFb/hq2ORlN1u6b2BLSqwsrbke6NicKPId6aMrBCSHTVmmbfEY2dMRjzSXE4QEPpJqFf2s33up87AsCzLBQorN5fDGfjcNBPEK3Y= 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+83058+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 1635802674708542.1687261144107; Mon, 1 Nov 2021 14:37:54 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id GMT7YY1788612x6HslIgGZOt; Mon, 01 Nov 2021 14:37:54 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web11.906.1635802670411204424 for ; Mon, 01 Nov 2021 14:37:51 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="291964415" X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="291964415" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 14:37:50 -0700 X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="449113026" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.76.205]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 14:37:50 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jian J Wang , Liming Gao , Michael Kubacki Subject: [edk2-devel] [Patch V2 4/7] MdeModulePkg: Reproduce builds across source format changes Date: Mon, 1 Nov 2021 14:37:34 -0700 Message-Id: <20211101213737.586-5-michael.d.kinney@intel.com> In-Reply-To: <20211101213737.586-1-michael.d.kinney@intel.com> References: <20211101213737.586-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: mtRe4PZWakIuoix8EKpmjO7lx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635802674; bh=5ukI2bVlK2EcA9uCjiX1rCopo9iABz5zOKbvOb2yEC8=; h=Cc:Date:From:Reply-To:Subject:To; b=KqmUJp82ekIeeq+odBPK+4+6xU0VjDxr8J9235wSbcOYSm411ZN/80JYu5JlTzPi3rj tUqVbkTnSn07LxEoLA6SmwN7q3Ixb/n2fDZjyILp91+Tnfu3dLoKrXCj7+bR3B7r6OucG 3bh2XPVZRW3/fT4yxCFTue2APCo6NVZslbA= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635802676201100015 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 --- 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 (#83058): https://edk2.groups.io/g/devel/message/83058 Mute This Topic: https://groups.io/mt/86752905/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 Sun May 5 10:15:42 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+83059+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+83059+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1635802675; cv=none; d=zohomail.com; s=zohoarc; b=UIZQXA2HQrjZI5AkHSD+4+UParlhxEG8gWnaKV2fKxhFsgfNyn/msGLI8bvLa4zZuD8+nxrDheoBfbANg89i2UcCunCK8zaKBt68DEp4Jzc2ImvODZzgnvPLB8UXeLJNoR9+MNacFg9NlZS+S1YUxyGrvFSTcypmJm7ZnYW7BUM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635802675; 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=qs270fnMZfl2IpQ3G7zKZWIetR6efkQyPaZVi6mBUCg=; b=GnxSmn3sfOUudYX/LE1AO81eTHFZ+Cjjzx8Q8Q0P3oTVQVK2y1Tj37RC//z8iDbjJAWilPer/s3fWKDRP8xOlW3ddbyS+1fkdvCGmgF7QOLmxFLxI4/8Os5JsnSBn/T+U7CPQGnQtpQtKdz+8XxXU6A3g+Y/HjZ36wsWJC0e47k= 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+83059+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 1635802675612192.30473110884293; Mon, 1 Nov 2021 14:37:55 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id WOYVYY1788612xtV7U94z52f; Mon, 01 Nov 2021 14:37:55 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web12.951.1635802671189382275 for ; Mon, 01 Nov 2021 14:37:52 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="291964418" X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="291964418" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 14:37:50 -0700 X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="449113032" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.76.205]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 14:37:50 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Maciej Rabeda , Jiaxin Wu , Siyuan Fu , Michael Kubacki Subject: [edk2-devel] [Patch V2 5/7] NetworkPkg: Reproduce builds across source format changes Date: Mon, 1 Nov 2021 14:37:35 -0700 Message-Id: <20211101213737.586-6-michael.d.kinney@intel.com> In-Reply-To: <20211101213737.586-1-michael.d.kinney@intel.com> References: <20211101213737.586-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: XSy9DbpUGfI6SAg4Q76bv2Vmx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635802675; bh=+KwpcfIKRfQIzLeyrLwE8qG4A+jn1dFDp2aE+R0oweA=; h=Cc:Date:From:Reply-To:Subject:To; b=pecWsLSTu5qByOky3s8Oz0dc6K+O1g7FZKXC4zSy4p1im/R/H1MHwzFBMPaSTawFmva URlpHVaM0JmDOhalajlaCPSdevgmi4lz8PEl9sWs0WZOVjumnwAxFj9NJEP+ieKb4Iiyc 9PUkLtxYcTnY+8yCB5BSwQHUADDQdESKw9M= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635802676260100020 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 Reviewed-by: Maciej Rabeda --- 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 (#83059): https://edk2.groups.io/g/devel/message/83059 Mute This Topic: https://groups.io/mt/86752906/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 Sun May 5 10:15:42 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+83060+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+83060+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1635802675; cv=none; d=zohomail.com; s=zohoarc; b=QaUSs06Mf07YLblx2V9T/iNK2hxNhonwssg568pjPzYEGqP//JtF9eCEBonKX3l9z7UreapWf6eaHA4CfnUrhL4NBQ9TM9M3ygFZ+ilDGZ8iTvhQG+KsHN0Ht66ty8V7Mmgd6V7H68kWrKniwnXi6/pzzAfOiP5mHK8Q5e0Nwqw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635802675; 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=x1Awk7Bs9+nVlqHzLj54q2TIykJXE1yQJ57IEKHug60=; b=OzElQomgOFVrVQOcsmF1jJX00FviJDpd0H+nUBJ9wB9TvngevXSgah4qOIVIHMkDFbbpTGl0P5EGMxUSIMrXK11VzjI+g9BRyvRUORrQP75AOP8vBlRuA3Z6dwbA+A4HG8vUf/mbf8togdby1GYuMEvouSOLaGI1XTh+DASW2rQ= 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+83060+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 163580267496847.97833531991637; Mon, 1 Nov 2021 14:37:54 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id LwPyYY1788612xECDyHxRYqu; Mon, 01 Nov 2021 14:37:54 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web11.906.1635802670411204424 for ; Mon, 01 Nov 2021 14:37:52 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="291964419" X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="291964419" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 14:37:50 -0700 X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="449113036" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.76.205]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 14:37:50 -0700 From: "Michael D Kinney" To: devel@edk2.groups.io Cc: Jiewen Yao , Jian J Wang , Michael Kubacki Subject: [edk2-devel] [Patch V2 6/7] SecurityPkg: Reproduce builds across source format changes Date: Mon, 1 Nov 2021 14:37:36 -0700 Message-Id: <20211101213737.586-7-michael.d.kinney@intel.com> In-Reply-To: <20211101213737.586-1-michael.d.kinney@intel.com> References: <20211101213737.586-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: 25LgOhXbdDNGDiUiaD5V0Pw0x1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635802674; bh=/JMd7PcAWX7WtdW2DbjwXoHzgKNDliUr3Fr6I+h3Reg=; h=Cc:Date:From:Reply-To:Subject:To; b=j/psGQkWEs3b2J+he3iGdRQ0TN0foUjik1qEFBTx1mJueMxqUZBDm/6Y0kp1WAWi8Of kBaqILWbMqtNzZgT+ni/Z54PpQxxHCFecrdFDpAWOVDc/9QUimynjWfopGw1mu7m3QpHD MfArZBAjlTCq3LLWs5FD5gQ5Qi/Knkt9GXo= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635802676230100016 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 Reviewed-by: Jiewen Yao --- .../Include/Library/TcgStorageCoreLib.h | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/SecurityPkg/Include/Library/TcgStorageCoreLib.h b/SecurityPkg/= Include/Library/TcgStorageCoreLib.h index 01a44c667c80..a426251d6978 100644 --- a/SecurityPkg/Include/Library/TcgStorageCoreLib.h +++ b/SecurityPkg/Include/Library/TcgStorageCoreLib.h @@ -16,13 +16,13 @@ SPDX-License-Identifier: BSD-2-Clause-Patent =20 #include =20 -#define ERROR_CHECK(arg) = \ - { = \ - TCG_RESULT ret =3D (arg); = \ - if (ret !=3D TcgResultSuccess) { = \ - DEBUG ((DEBUG_INFO, "ERROR_CHECK failed at %a:%u\n", __FILE__, __LIN= E__)); \ - return ret; = \ - } = \ +#define ERROR_CHECK(arg) = \ + { = \ + TCG_RESULT ret =3D (arg); = \ + if (ret !=3D TcgResultSuccess) { = \ + DEBUG ((DEBUG_INFO, "ERROR_CHECK failed at %a:%u\n", __FILE__, DEBUG= _LINE_NUMBER)); \ + return ret; = \ + } = \ } =20 #define METHOD_STATUS_ERROR_CHECK(arg, failRet) = \ @@ -31,12 +31,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent return (failRet); = \ } =20 -#define NULL_CHECK(arg) = \ - do { = \ - if ((arg) =3D=3D NULL) { = \ - DEBUG ((DEBUG_INFO, "NULL_CHECK(%a) failed at %a:%u\n", #arg, __FILE= __, __LINE__)); \ - return TcgResultFailureNullPointer; = \ - } = \ +#define NULL_CHECK(arg) = \ + do { = \ + if ((arg) =3D=3D NULL) { = \ + DEBUG ((DEBUG_INFO, "NULL_CHECK(%a) failed at %a:%u\n", #arg, __FILE= __, DEBUG_LINE_NUMBER)); \ + return TcgResultFailureNullPointer; = \ + } = \ } while (0) =20 #pragma pack(1) --=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 (#83060): https://edk2.groups.io/g/devel/message/83060 Mute This Topic: https://groups.io/mt/86752907/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 Sun May 5 10:15:42 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+83061+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+83061+1787277+3901457@groups.io; dmarc=fail(p=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1635802676; cv=none; d=zohomail.com; s=zohoarc; b=FRljXh3TSpvzfB2fbyz3BKtHKUMdLm/X0l+07xnoM3kVee3LfGC1n4fZ4vOH5AVb5vl8KvQ96l0Nqv2cHb0tI13PK7JauqRIIUELF4iZTewcHUl5Y7wjWT/K/g2tuQFJM7qmMwa6Y5XrzJLOtHVgJHnSFtXJVDHeCoUChOuJUzU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1635802676; 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=wu/Arx6Jdx1xrs9150xf315GizieTMDyGuZ6LTT98oI=; b=MQVUWcpA2/KI+FqqMXf57ZuMQ/JuUgh+ok3Trz//COOhCggAC/5z3uMf7+7xgdKXBqehd9yhaP/ITYAqJPzwAqhM/lirD0pZhQrKtnQ7ohe/s/nlDOd4ZwvwdY7G8MFyukNLoVS9IUlGcaQtf5yy1pTbzVTZwA0BN6530mjoKiA= 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+83061+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 1635802676049224.72161697615888; Mon, 1 Nov 2021 14:37:56 -0700 (PDT) Return-Path: X-Received: by 127.0.0.2 with SMTP id EfDrYY1788612xRwbSwd4Us7; Mon, 01 Nov 2021 14:37:55 -0700 X-Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web11.909.1635802672512084851 for ; Mon, 01 Nov 2021 14:37:52 -0700 X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="291964426" X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="291964426" X-Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 14:37:51 -0700 X-IronPort-AV: E=Sophos;i="5.87,200,1631602800"; d="scan'208";a="449113045" X-Received: from mdkinney-mobl2.amr.corp.intel.com ([10.209.76.205]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 14:37:50 -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 V2 7/7] OvmfPkg: Reproduce builds across source format changes Date: Mon, 1 Nov 2021 14:37:37 -0700 Message-Id: <20211101213737.586-8-michael.d.kinney@intel.com> In-Reply-To: <20211101213737.586-1-michael.d.kinney@intel.com> References: <20211101213737.586-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: yjLaz4ifHWfWwKG7oVHCcq9Qx1787277AA= Content-Transfer-Encoding: quoted-printable DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=groups.io; q=dns/txt; s=20140610; t=1635802675; bh=0TjMbetpO90OfQpQELT0IaXG5cLaqbayi619/0uoP+c=; h=Cc:Date:From:Reply-To:Subject:To; b=Y16xb8W81gRF6sT7MR13OQSusbCbWZRhSz7XbHZ4UX39BqiD+4k59jeVYGirMqkyjiX odBkN5WoJtV1kFi97CM/6WxeeTSlsU8cLaMDSC9rRWFqb6ABiZsF3ck3fD/+Tb8Ub2j0P 0jaUzQuTsyZdzg/CP0PoSDlphpyEMZJpn98= X-ZohoMail-DKIM: pass (identity @groups.io) X-ZM-MESSAGEID: 1635802676379100022 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 Reviewed-by: Jiewen Yao --- 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 (#83061): https://edk2.groups.io/g/devel/message/83061 Mute This Topic: https://groups.io/mt/86752908/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-