From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by mx.groups.io with SMTP id smtpd.web12.2848.1635812101447976170 for ; Mon, 01 Nov 2021 17:15:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=n+BKdk+E; spf=pass (domain: intel.com, ip: 192.55.52.43, mailfrom: jiewen.yao@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10155"; a="317350236" X-IronPort-AV: E=Sophos;i="5.87,201,1631602800"; d="scan'208";a="317350236" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 17:14:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,201,1631602800"; d="scan'208";a="583193512" Received: from orsmsx604.amr.corp.intel.com ([10.22.229.17]) by fmsmga002.fm.intel.com with ESMTP; 01 Nov 2021 17:14:53 -0700 Received: from orsmsx601.amr.corp.intel.com (10.22.229.14) by ORSMSX604.amr.corp.intel.com (10.22.229.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Mon, 1 Nov 2021 17:14:53 -0700 Received: from orsedg603.ED.cps.intel.com (10.7.248.4) by orsmsx601.amr.corp.intel.com (10.22.229.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Mon, 1 Nov 2021 17:14:53 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.169) by edgegateway.intel.com (134.134.137.100) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Mon, 1 Nov 2021 17:14:52 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Pfdm3Hx3EisHHbVrWKRYe0q7iqBTEIgtNfpl1oE954XOhSJuofIWHXZ2hbBWlj+ZS/3Vo4s/t6bXkf/ZopIkT/mr9G0ll2SZwRkH63yu6ZhUdBnKucUMI4eX6z2dzmNBjaKjmQ9hSyPhDV607lZn+7UE7U9VoHqjdVXtJus+8QduDJsHNMpvhTYBML6XEnxJEdw1gk4CQqC8R01jhqPnorGyWGIPJmaZsKu26UBXLuOUGh2NSiqC0eXEOeSVSS/WTD1US9uterU1oW27zKQa0rlv5J9frJIo6WsvmeRVtP2rQgUaa/QEWUaLT41OYxrkzIFJIQOY43QORqbCC/xKpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=OW/YoxeAOvjNlt79glAgvl+lpxtfsYGUzs5D/e7J88Y=; b=GKwJxXThl2TGtkKAiSl5okzZPcq1g9LAZQa0HVVgI1gmGhPH8j1eFs/wtTj4raet18XWn5Zd/xYVH43w1ztA69NImk4rYvuz+UQ74/zWbtFsLtn1rrQIQ4T0w9/qtEcQuOSa6REfCz2cu2ZPe7ycNgGwqfqEjMtTO0x2+HtpbPINPY+WSHC/E5qUZvb7E5pguI1enGulJN9BBtz5clEi8kG6ivdzIA47cWV216E98yQm7fKaTsoWrnlioHPJ5EP6IFO2FcZIiOs/wuablI/Q3tklP6+L8J1ssatzyhpkX9Wt4xaeBXfaL26TOI9AqF+ToopFy62YnYJeTlbmQE8cOw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=OW/YoxeAOvjNlt79glAgvl+lpxtfsYGUzs5D/e7J88Y=; b=n+BKdk+EpvKv+llmoOOHP3+i+YdYbiHDmplEp23oer+iPiZcWSTfzJjCGDOSrf17D5bHsJhcuFZ4/nL3K1p3i9WY4HKrqc6Z+1yBGLGh+sS+d0ZBLdrQWnM96wOmx59s2EVK2YhPV0OL2B8HY56ObTvu935b7gUBbqNrx8C3nlw= Received: from PH0PR11MB4885.namprd11.prod.outlook.com (2603:10b6:510:35::14) by PH0PR11MB5206.namprd11.prod.outlook.com (2603:10b6:510:3f::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.17; Tue, 2 Nov 2021 00:14:51 +0000 Received: from PH0PR11MB4885.namprd11.prod.outlook.com ([fe80::c5cb:e37a:9f3:8f80]) by PH0PR11MB4885.namprd11.prod.outlook.com ([fe80::c5cb:e37a:9f3:8f80%5]) with mapi id 15.20.4649.019; Tue, 2 Nov 2021 00:14:51 +0000 From: "Yao, Jiewen" To: "Kinney, Michael D" , "devel@edk2.groups.io" CC: "Wang, Jian J" , Michael Kubacki Subject: Re: [Patch V2 6/7] SecurityPkg: Reproduce builds across source format changes Thread-Topic: [Patch V2 6/7] SecurityPkg: Reproduce builds across source format changes Thread-Index: AQHXz2i9Ztzq6+oaoUSKljkQV6ZjKqvvXm9A Date: Tue, 2 Nov 2021 00:14:50 +0000 Message-ID: References: <20211101213737.586-1-michael.d.kinney@intel.com> <20211101213737.586-7-michael.d.kinney@intel.com> In-Reply-To: <20211101213737.586-7-michael.d.kinney@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-version: 11.6.200.16 dlp-product: dlpe-windows dlp-reaction: no-action authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 00a0665e-b91b-417b-0de4-08d99d95c9cf x-ms-traffictypediagnostic: PH0PR11MB5206: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:190; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: JqukdxSkDH+20hXMzq4rc0O3i4plCAeKKLPFaoKYD7JEO+a86fNzG2UwQiEdaW/JaCqxPeYiXfcFOUK5hns396M+KE8UnjOw6s9lQZYkHpK/1Gr6iufAbRQrrEJW2jxP6lX+58ZDBj2lneV9JzEJqxTtozd01hULJCcLCKe+VZG/UyFpvZQ+8y8teFOdtDH6EMb1wP8/43Mwv7rZWiHs1ksPSGAvYt1aDlGBhorsKpKHvI6s/oXYKN8A6O/HifR1S4ONe5T2rpyNHNhmph5gGeVlv668Q6OkemDEmuhIXzSUY3buh2ZYCFaOqVOguwlc+J5hEPAsImZzgtE96PYMXJ+trmTwCAr4PeoU0M779SftixJvYeMw7GoN2sHfYMwLNST3dmypTwZsvgaXm/axZpkkgPtxa6sDV1tyRCZCVrRNfnKxXV+8eioN7X9nV1bzT/izCisJw4b17FNeqN1p2cLR2+6r0AsActhCdVpage3HdNq6pgeBCOXiCfMIj1POshyMrr/vo3xLdNpnvMqcFWTQibN/od4ilc34aEVgxoId1Xq3RRW7Q4/SO7ya3a1ZHdupqkhKg0ePJ0CfIsqTsdQ/rRB8Ye7a9vjdCHWX1b2z137o13S5MlOqpkCWR1aeyhfnxwm0Q2pgOEcfnrOxGoNx4qtOAI33pQR3zK6GEI7SMVkinwTMZ1tYoTSrS8KuGxIwnVGhAfoG6l+81YcXq7II63bFB6A4U9+Sa+N0Ph45hvwJ3HzrqkBdCj1ZG65yZRvCdAcUHryj9kCOctE4sev9nGe36naJu+d311qADk8= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PH0PR11MB4885.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(2906002)(76116006)(66446008)(64756008)(66556008)(66476007)(66946007)(4326008)(8936002)(8676002)(186003)(5660300002)(52536014)(26005)(38070700005)(33656002)(86362001)(38100700002)(122000001)(508600001)(316002)(110136005)(71200400001)(6506007)(15650500001)(55016002)(9686003)(83380400001)(53546011)(7696005)(966005)(54906003)(82960400001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?xZ8roPrjIw3cHppMWDCtAMmdHu8Sf9HjCrlJdY/9mjdZMo/dM35lDAksixxL?= =?us-ascii?Q?ZWZlvj6gV4xdg0odaThVjUFyKfpsdgixKGRTl9321zbXzHymgvGYvLVOinUN?= =?us-ascii?Q?g/IO46ZoJa9ZPxijNeZKu0zOWxFPsGKjI6UGNtgpN/6nEi4AB59hcrXgGIBo?= =?us-ascii?Q?f5i87zqmiADEMzG3wGG7qsthDTsA+E1pQZzKkvEuPvK/VO0JqGxn+VMnIo8T?= =?us-ascii?Q?6mHbPMIonbZinYbfiigNfSdI4RABBpCUpxkZ/oL9yQMRdCTKDeY74mWRxk/V?= =?us-ascii?Q?kPkzvg6tvoJ0yIu09k0KT/T6aEXNps9a5ryI++8pyymF0WdL7flc0eUTY/vE?= =?us-ascii?Q?dHc17772zNCybHQ9BfeeCE9FSFv9Q2dDeyy8PbW4CVxOrewx1MWDjK9Txa7z?= =?us-ascii?Q?o+DIC9mKBUDqgk8u71w+lFpk+Laii/hQEIovNC6bnIUfcLtoHHa/mtQEaUKZ?= =?us-ascii?Q?+a3e2MATI/UWNxX1ho6Ds38+1SWKMHZtTiSTgCRVr5LtahvwgmXxw3/maNWv?= =?us-ascii?Q?Thun/ippJZFoVuI5lGPPl6mpKYFjzEv/NI2+0yYN/LIj7JzTjN0MbrvIZkRc?= =?us-ascii?Q?0QJOL0/gBcI5B+w4EuB8Ksz3Tjk33uNZ4gUt5AVY/eaCYGapLReTUg1ONaTP?= =?us-ascii?Q?y04oHk13U8its8hnRlgqPQEK229M9MULXpRCm7RoxCyH4HWfCA2QL+0fxU7C?= =?us-ascii?Q?x+wEDRv6aQ89D1TQvmf2Rf/eXZxY299raPTcuwvvu3vnTZjLzzk0qUixY/YV?= =?us-ascii?Q?ZVHoGIl3I6H2zNSZB9Cn2P8obPbtSxgvX4QBkdFuB3YPGjNzpQnL+GA+Lkto?= =?us-ascii?Q?R93WOglJcMfJskr0GK8E7wklvZODOeHj6tAULJaxsxP1FBscS7rY+UCVd7Sa?= =?us-ascii?Q?qiOjpByw56XzAf8BvDRO3X4H4be6LrVZUIc50pzzccjwpDveBlpIzcLSQkT8?= =?us-ascii?Q?nfsgk30FZh7dc1OoegpWwvinfqf8+r2Tgs+ZQePJxmTroWXxzV+Spn3Sr9wi?= =?us-ascii?Q?BQakOTO3UeH4OAmQ2hkcG3BJS4xoimUfxPW1DhVTojah+A/zoovvQW68VCk/?= =?us-ascii?Q?yaLPkwTt0e4ks4dRVFPsNY7OtWBZaq0lgadVcTU4zoRzNawfpS57Bb9iUhJy?= =?us-ascii?Q?QpTzhY3vfgtEqtAOA+blW50CojuHsXc+oaS18708zxF7nGxiXjEpPLV1syjc?= =?us-ascii?Q?/bFQqfLexYgtbBy0gRe4/SSTozteEEUulTMKLlhhil00Nzw0k8rA8Wn2RkhE?= =?us-ascii?Q?NI/f5laOEGnW/DqOUG1OS0an2jl9VJkSxQQo47Ub6i8EPJXCSm4APdmUpD+f?= =?us-ascii?Q?lQp83cddzmZfap/KTwFNfGExQ37cakqTH9vub4+TBXGUj9Y02cTs1m64VlAE?= =?us-ascii?Q?cPTNIaOtBGiel4mC0dxFUNS3iUo4rH4PaA8qLSYU9CDDayel+SolApugEinx?= =?us-ascii?Q?JhWhUlu8/+Ku0XI6dFUlC4cokf/SAhpvl7Vgb5Ee2Wb3zlb1I5/+a4dz8CzZ?= =?us-ascii?Q?OQbhcecfu0vSJ/0YUXqxm07fafRsh5/ehrAkx53mpFdHPrte96x6k+kbvL8v?= =?us-ascii?Q?j1xGsESITFZrGFL+wFJr3x14EX8yTbuGRTKdl3OAGNRXmd2Ssq8XA/EbaqE2?= =?us-ascii?Q?jbnLKmqDb6vcnmmMRqQyphk=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PH0PR11MB4885.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 00a0665e-b91b-417b-0de4-08d99d95c9cf X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Nov 2021 00:14:50.9610 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: tzYbL5vM+UgcamlZgAJviPPsy4bkQFCEu6+LHL2asfGmnpLjv5Tl7Ft6WpEb+3N5OF5fcJgsXT5JJH8BBldJrQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB5206 Return-Path: jiewen.yao@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jiewen Yao > -----Original Message----- > From: Kinney, Michael D > Sent: Tuesday, November 2, 2021 5:38 AM > To: devel@edk2.groups.io > Cc: Yao, Jiewen ; Wang, Jian J ; > Michael Kubacki > Subject: [Patch V2 6/7] SecurityPkg: Reproduce builds across source forma= t > changes >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3688 >=20 > Use DEBUG_LINE_NUMBER instead of __LINE__. >=20 > Cc: Jiewen Yao > Cc: Jian J Wang > Cc: Michael Kubacki > Signed-off-by: Michael D Kinney > --- > .../Include/Library/TcgStorageCoreLib.h | 26 +++++++++---------- > 1 file changed, 13 insertions(+), 13 deletions(-) >=20 > 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__, > __LINE__)); \ > - 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) > -- > 2.32.0.windows.1