From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mx.groups.io with SMTP id smtpd.web09.807.1636082324076362738 for ; Thu, 04 Nov 2021 20:18:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=FzHrqZhD; spf=pass (domain: intel.com, ip: 192.55.52.136, mailfrom: jiewen.yao@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10158"; a="211888421" X-IronPort-AV: E=Sophos;i="5.87,210,1631602800"; d="scan'208";a="211888421" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Nov 2021 20:18:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,210,1631602800"; d="scan'208";a="561783385" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga004.fm.intel.com with ESMTP; 04 Nov 2021 20:18:42 -0700 Received: from fmsmsx607.amr.corp.intel.com (10.18.126.87) by fmsmsx603.amr.corp.intel.com (10.18.126.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Thu, 4 Nov 2021 20:18:41 -0700 Received: from fmsmsx612.amr.corp.intel.com (10.18.126.92) by fmsmsx607.amr.corp.intel.com (10.18.126.87) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Thu, 4 Nov 2021 20:18:41 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) by fmsmsx612.amr.corp.intel.com (10.18.126.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Thu, 4 Nov 2021 20:18:41 -0700 Received: from NAM11-CO1-obe.outbound.protection.outlook.com (104.47.56.170) by edgegateway.intel.com (192.55.55.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Thu, 4 Nov 2021 20:18:40 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QzUrLc0V0zEImZY1EEAuBaOhr5P4uxRIaHWxCMpKHOJ6Yir1AwD5l1XwreBOIsaykeLSSsaj5H5QtIIL+E9rbkAlRkM+svXgLt77qFDLNmdghDgEd5XI5uAZE5jDb9VT0xUsqJ+OeFs7mIeElNlhNYTFjEk1ZxhFkueaAOJoNz5b/MSvgYZZgvLWNlRUi6DFBMMnxbKZYLUu6P0JsRUXHVCYc1QqO6sMWF3TboBzKKjXfcELvFd77qR+aIMG39s6K58gbPcaejRHLaURwRKB2QaYnNvrtKvjvPf8hQbdexNK48Bi7lbgztM/quY97gAiTReDQC5i7uhwS+0DxkNakg== 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=UOx/6J3l+IGrStTD5eZbjTci8kJKGvDGJDlmIYMZXlc=; b=ZNHyHbdVen11KI9wPruMK2lAQj8RPTDa05uCiPkEpkC4ND07c4hFKAhARcz6mNV2bHtqHHNgeShHbC2DRLnBs1Tm66XUa2M/i60MztRQrrGWzxLD/MAjpVbmL4uup0Px+wKCBufTqPXukZ/n6+i59i/Xm9zD0jEpfG/4dXJxO/Mcs8SA/V3yqbqW6V3DUtzi2qaD3BvhTmZrAWVnnpGuVEccyWabbjRxAUtzx3MeQ/Mf9NYWsJ/aQwtE8vFQ5Xi50SuxANDM2WDFGAKQrutmur+ucMh1fksGTdp7Vb2QB8Vs8L3XRSqvA8QGrNSlSiT3Ft0QJzZUrkwy/QlfkQeTZw== 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=UOx/6J3l+IGrStTD5eZbjTci8kJKGvDGJDlmIYMZXlc=; b=FzHrqZhDPcT/MpNwzGQ+M0qzS2cjjaLCLEVLPQWBdqukkehhIVnTSY4QMuknCR6Il+JeJc4IOMgZZWrXDGOFo5H6cnGvs+JtLchTC9hIYgEtoYTHLfGt1roniUQIBo69h8w/2njoOeXoeE2iGYugEHKkJrzqSSQg7h7QtoLimkE= Received: from PH0PR11MB4885.namprd11.prod.outlook.com (2603:10b6:510:35::14) by PH0PR11MB4855.namprd11.prod.outlook.com (2603:10b6:510:41::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Fri, 5 Nov 2021 03:18:37 +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; Fri, 5 Nov 2021 03:18:37 +0000 From: "Yao, Jiewen" To: "Kinney, Michael D" , "devel@edk2.groups.io" CC: Ard Biesheuvel , "Justen, Jordan L" , Gerd Hoffmann , "Michael Kubacki" Subject: Re: [Patch V2 7/7] OvmfPkg: Reproduce builds across source format changes Thread-Topic: [Patch V2 7/7] OvmfPkg: Reproduce builds across source format changes Thread-Index: AQHXz2i+4uE7Auj2CkmT00jIf74ZNav0SMIg Date: Fri, 5 Nov 2021 03:18:37 +0000 Message-ID: References: <20211101213737.586-1-michael.d.kinney@intel.com> <20211101213737.586-8-michael.d.kinney@intel.com> In-Reply-To: <20211101213737.586-8-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: 9161548a-c81c-430f-9e2f-08d9a00af58b x-ms-traffictypediagnostic: PH0PR11MB4855: x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:220; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: aAM/1BcmOV+C8aAyfF3OxvK1sej9+u/JcwAuG2/hrmovnN+hn5QtmXTUGjeEBqBKfqU2y11x8E4EvI/q6AE5qJihPkWvPwqa8P6J6fjxt+H/9nK4Ef/ICJJCTetpg5D4LTEAFK9F+iWkEtmfZHAy4DHaJMJ+8MJpOOXMQtnA/8hQjxWjM1ZJckbgfS6lo8Qf0fZlvgv11W6fV6KWxJdUSO+XqGWWyQpSQVz3zJyh9o7jNPx63wOq3EKcqKwDvlvMtzE9jIF833rj2B8PSGSjIlsly7LHh37BcQsypIcq2F+PUdVJU70rdeBoZWJjhHDzbkeUftHBHczIMVlF7LCMOYEPPcFZsiy+T99Vo5NwlJjnuSvNSeUoOdyfsGp9o0RI7KuyU+bugsY2fp0RzrTPKvOBc0eJN3J4MEWpMxU3GLlZiCFMuL5FJlxSTgUCIUbDGm4nz6BvsMTsZbaurtk0Rt80810ENa+Uaymj+0AVPKPH3z/cw898bYX7LAKv3ZSrmx4LN7x2uXwTSqYyGbm8kBxhgpylOU54LFALiRm3CPKPS5Xym/bLFJvLzBkD9YUQHxMT56x3DK3cFYB/eqGj2ZoxlqC2k/rGpcfuBVZrM6Q0t/iVDDDV2k0mMO2ZRdlyQP6zMrR2L85AxLR8AJoYJUNcvwzovIunOJUR+01PmlXr6H5khtU7YpdFILEWCy36ZgSH0S0f3/jy4Pr249NL/oqxnMq0h8+uM1dWpHElMy/Q5zShRev7PMp5zASBXP/Tbxo7J+7dO45QOU51QiIEHVN4nVHTHOpBFznPPYQGO7c= 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)(38070700005)(8936002)(76116006)(316002)(5660300002)(54906003)(110136005)(6506007)(53546011)(122000001)(7696005)(66476007)(83380400001)(38100700002)(9686003)(19627235002)(33656002)(82960400001)(66946007)(186003)(966005)(8676002)(4326008)(52536014)(66446008)(55016002)(71200400001)(26005)(66556008)(64756008)(508600001)(86362001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?f3QNCeDhE8NpuZIGpI2bsTPIz3g04ydRfGxot79rGlPfsqvujTTKCQfYeAnK?= =?us-ascii?Q?7CO9nmCOacgJUGSE6eppUoymCQK12QQ21yhpi/g7GFMDJC9SrWtromX1DXE6?= =?us-ascii?Q?H0zLmOP735u88xaOYnVftA1FJ3pdgeTZivFYE+gignOIv//hhKqBIwSyt1or?= =?us-ascii?Q?dQzBBW/ewWB167JKjIL3UkO7ZbgRbDPdkG6Cj2MIdQqINBAfsE6D/2O6N/sX?= =?us-ascii?Q?jSodly4TjWHzSfYVCDT8BFiRuWQqqXGDlho6c2pGm61hpvMZSrW0tb5IMkPI?= =?us-ascii?Q?mhy/4117D1npwt/iUQ7RkEbr5coITwL1oIdWXUv8Fy9vBOsA7ewPGYLWRbvS?= =?us-ascii?Q?frTesWxRB4VDqTbm+EoCovqUcNlj/t7V5nweHK6bH9QaHLjuIc+Bpg0qON80?= =?us-ascii?Q?5Gv6+C2/k2FBzXtT3LQiSdAXCurs68r100n0UbPyhenoGlph22qomgx/yL/F?= =?us-ascii?Q?VntacCtZt4pRLEgvz+YEG1Zegcb7Z1uhvDBNX6wrIAfEpvrfTq24pZB4+nr2?= =?us-ascii?Q?x6TznkHaibjwhQroJ7w+ZN6Ilm0VrsQMzh4ZlJhyJMxbebxcisP9vfaFIjR+?= =?us-ascii?Q?0BbNSYkO4IcVaQHpzmd9vcOmBwNNdd9e4YccpHFONCiZBLqftDmmuZ/cBhm3?= =?us-ascii?Q?2qI1RPoXMer5ozeqexoZTnZQBFfGm3GEAPHhMwVnb1W23GSKLe6hv4wqubdQ?= =?us-ascii?Q?a+GLJ1EYPjeuExhCAuaZpfX/DDYthxp/Iyr+dhWp6AP/NE2vhQRXk+kCzGLd?= =?us-ascii?Q?GoFE6yBnzEV+27hfL3fqFrzfryXAijDDJbz+2b6Apn1Q6WVNmTIRVQufw6tl?= =?us-ascii?Q?PpQWIH4KWzWjyxbzN7+nJGOx5O0mnzZgTpn0O25pMdqIy2fNWazhz2nT1meV?= =?us-ascii?Q?yCHQdrVuG9nJ08G+AgCjmiU/u5CXCk4VVeIn1ngeUp4Pp7kOLxyVw0yG7NRP?= =?us-ascii?Q?OPTdVkX5aiLZcI3t97gMPW0a4N5VHk3CA+bQgRHqaG9phfK6gXl+tCCPDE60?= =?us-ascii?Q?NsdyslwDO/PywXPQoAx//lxGQWo2czpOtzfqQSqcqTeHkNZlpI+nVjpqlrvz?= =?us-ascii?Q?WyYSGCq7YjzXIIbt5wH416iZHCNibbxz8+Oqlw7p3OUc1qufXWTKt163A43x?= =?us-ascii?Q?kNmk9YFTGUKbtPD7QG75auvfdS3af3sNnPcomapnPLJF4+lDZZPYApV2LU7i?= =?us-ascii?Q?+6EF7nDtQZopoXTOSD6pxZ+ppZPgOeN8rCDs990AgDdxNyn7dHAoocy1kTq6?= =?us-ascii?Q?vuBGQCpJoUsTxv41ywNAjvEd9iiXxwcdG9EF55cCiBIHwYi+m3WoNIhuZ/Ts?= =?us-ascii?Q?LieimD1sQDQP2HiQqWGU+++85OWHkzy/5Wq/HnWsi+V7YT2yLgtKQz/vLkDf?= =?us-ascii?Q?eyF6MJdbLlRV93MGEC1YE05VBf6H9xIxUr2/q4Ku9MRmYm6xYKQa0S6Zbx2Q?= =?us-ascii?Q?vh2a1jktHcNMK+DwOxL77cSeF0adbkCriblLAHKqzU6mJigrMqYu52YwjAYL?= =?us-ascii?Q?sX8NIKlymR3Xu5oCmTgPlgCEuMGg56oYcFNzmgS0u1T4sFkTbajqAsF3XsgG?= =?us-ascii?Q?358W7HqsY9Qfk8NGeY6Ueo5rsvzSE2drBsm1F+uaIL9cxySwaS4LC2FdvWWq?= =?us-ascii?Q?oXztbz6quMFpF1CwCJVcYoA=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: 9161548a-c81c-430f-9e2f-08d9a00af58b X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Nov 2021 03:18:37.8335 (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: Qj7s7DCAZFCPuXOCN7sgboTQu8YBS8LDWlkKBoWkdADaTKsVdwT7rQbphj5YbpPJQhnYKnn6XNtBgCGF022cZw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR11MB4855 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: Ard Biesheuvel ; Yao, Jiewen > ; Justen, Jordan L ; Ger= d > Hoffmann ; Michael Kubacki > > Subject: [Patch V2 7/7] OvmfPkg: Reproduce builds across source format > changes >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3688 >=20 > Use DEBUG_LINE_NUMBER instead of __LINE__. >=20 > Cc: Ard Biesheuvel > Cc: Jiewen Yao > Cc: Jordan Justen > Cc: Gerd Hoffmann > Cc: Michael Kubacki > Signed-off-by: Michael D Kinney > --- > 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(-) >=20 > diff --git a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c > b/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c > index 746b366448e6..350cf3dd0b3a 100644 > --- a/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c > +++ b/OvmfPkg/Csm/LegacyBiosDxe/LegacyPci.c > @@ -2321,7 +2321,7 @@ LegacyBiosInstallRom ( > ); >=20 > if (EFI_ERROR (Status)) { > - DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): > EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__)); > + DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): > EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", > DEBUG_LINE_NUMBER)); > // > // Report Status Code to indicate that there is no enough space fo= r OpROM > // > @@ -2337,7 +2337,7 @@ LegacyBiosInstallRom ( > // > RuntimeAddress =3D Private->OptionRom; > if (RuntimeAddress + *RuntimeImageLength > MaxRomAddr) { > - DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): > EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", __LINE__)); > + DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): > EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", > DEBUG_LINE_NUMBER)); > gBS->FreePages (PhysicalAddress, EFI_SIZE_TO_PAGES (ImageSize)); > // > // Report Status Code to indicate that there is no enough space fo= r 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_RESOURCES (no more space for OpROM)\n", __LINE__)); > + DEBUG ((DEBUG_ERROR, "return LegacyBiosInstallRom(%d): > EFI_OUT_OF_RESOURCES (no more space for OpROM)\n", > DEBUG_LINE_NUMBER)); > // > // Report Status Code to indicate that there is no enough space fo= r OpROM > // > diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > index 9b21ba2bd699..186401296ae2 100644 > --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > @@ -624,7 +624,7 @@ PrepareLpcBridgeDevicePath ( > DEBUG(( > DEBUG_INFO, > "BdsPlatform.c+%d: COM%d DevPath: %s\n", > - __LINE__, > + DEBUG_LINE_NUMBER, > gPnp16550ComPortDeviceNode.UID + 1, > DevPathStr > )); > @@ -656,7 +656,7 @@ PrepareLpcBridgeDevicePath ( > DEBUG(( > DEBUG_INFO, > "BdsPlatform.c+%d: COM%d DevPath: %s\n", > - __LINE__, > + DEBUG_LINE_NUMBER, > gPnp16550ComPortDeviceNode.UID + 1, > DevPathStr > )); > diff --git a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c > b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c > index 513d2f00a747..e767c3b172ba 100644 > --- a/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c > +++ b/OvmfPkg/Library/PlatformBootManagerLibBhyve/BdsPlatform.c > @@ -586,7 +586,7 @@ PrepareLpcBridgeDevicePath ( > DEBUG(( > DEBUG_INFO, > "BdsPlatform.c+%d: COM%d DevPath: %s\n", > - __LINE__, > + DEBUG_LINE_NUMBER, > gPnp16550ComPortDeviceNode.UID + 1, > DevPathStr > )); > diff --git a/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c > b/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c > index 1c5405f620e7..fd8057735549 100644 > --- a/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c > +++ b/OvmfPkg/Library/PlatformBootManagerLibGrub/BdsPlatform.c > @@ -556,7 +556,7 @@ PrepareLpcBridgeDevicePath ( > DEBUG(( > DEBUG_INFO, > "BdsPlatform.c+%d: COM%d DevPath: %s\n", > - __LINE__, > + DEBUG_LINE_NUMBER, > gPnp16550ComPortDeviceNode.UID + 1, > DevPathStr > )); > @@ -588,7 +588,7 @@ PrepareLpcBridgeDevicePath ( > DEBUG(( > DEBUG_INFO, > "BdsPlatform.c+%d: COM%d DevPath: %s\n", > - __LINE__, > + DEBUG_LINE_NUMBER, > gPnp16550ComPortDeviceNode.UID + 1, > DevPathStr > )); > -- > 2.32.0.windows.1