From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web10.2489.1680854132383835318 for ; Fri, 07 Apr 2023 00:55:32 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=CqsCxHzd; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: james.lu@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680854132; x=1712390132; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=NkiX7bmzDZSHBPny1iGccq7/k9ilPBVgVHsvlqUdXw0=; b=CqsCxHzdal2B4kN2GZjZoPZuqMfjnT3w+idEjcRDKZ6O1FxfPixRbxNO YwIvLsQep4R517ABwMmmOlWRZMYZBsmXZStEDgDDI7ysFOqJBN1iUoTzc 0rbJQhOBdgh8ZJKap5dQdbcGbIRgb+85u7iMLplQBEzVFdZXC3K9a6XHi QeVRMZN9gEcl3/a4IK8peNXGx2ITeVJBEzTmrA7mGGUTwY4RfMATIHK+n 1DvFGnSuwN2VM998qrRr9Obsm3ePDozD8StBmOaKVrj9Ki6MXo0LRgM2a DABnFB5lZtVTKvDCzHoZkM1WuUUu57N8lEbK0oxACoi6N5DlbBy+WyUk3 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10672"; a="323315443" X-IronPort-AV: E=Sophos;i="5.98,326,1673942400"; d="scan'208";a="323315443" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Apr 2023 00:55:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10672"; a="811314096" X-IronPort-AV: E=Sophos;i="5.98,326,1673942400"; d="scan'208";a="811314096" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by orsmga004.jf.intel.com with ESMTP; 07 Apr 2023 00:55:30 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) 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.2507.21; Fri, 7 Apr 2023 00:55:28 -0700 Received: from fmsedg601.ED.cps.intel.com (10.1.192.135) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.21 via Frontend Transport; Fri, 7 Apr 2023 00:55:28 -0700 Received: from NAM10-MW2-obe.outbound.protection.outlook.com (104.47.55.106) by edgegateway.intel.com (192.55.55.70) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.21; Fri, 7 Apr 2023 00:55:28 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eWsnrnyzrxcliK3MZ85VtIJkS3WnfMk/u1W3X/PV/FUHqtKHIKJbru5+wrn+ZVZyNOelZzQRuuCO0hvAWU10LavPTHIPQxE9vEetLy78o13z28suAPKRGtsC6GTyHel4em5l8+wSTsDoPWBvIaD8EQfHtcuS97GYv+7AyPuvrlbsuGKYzgsULS181UdlI1bDvtSIJ+sI1hYwSGYkL4o4/ceR67qAjmKZuoS6i18bRsueRWSS3k33uJZ5hbTJ8Z4/3XgdbJwPxQQbWE5q2BL9a6n7mj7nVzoHwxEQEe//V2EmzYN5L0Q3ArzYVmI15IDjkmHfHniuPvz8ZlP2HmQ0gg== 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=GQmRK6mf4rec3fAH9BZidruK6p2hCbGq1JsReJ9an6Y=; b=ggRtPbL+oSZWjbzkTUQ8JUr97pNZoj1Ef6+qk6mEO9Ul8WpPcQx0O6dj22N65R5ffto87inVFFsyZ4FpkIOyOD1hWdSJULReBNJ1lDq4WRDy6khSVy9PabmlwKA8QttO9xPGyZhP5FWtarrJSF2TmsdBq00n4z4EDXU9Lzo0XEPMDvCRa0mQpd5Npy6aRzRDnS1GSKs6SKEYuDJdDawTClpjo8GhOnpV+5sO9KsvCjQ5EvPz0md2zHxa06JZ2WxIi9L156nfZEwy1eYAZQF16krayihtdFbQ2Mftkhj5O2pbGwkXN1IzOkl/VLwTBhkvO0NGyqEQbBQINYlOb5uvtw== 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 Received: from CH3PR11MB7819.namprd11.prod.outlook.com (2603:10b6:610:125::20) by DM6PR11MB4564.namprd11.prod.outlook.com (2603:10b6:5:2a0::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.28; Fri, 7 Apr 2023 07:55:17 +0000 Received: from CH3PR11MB7819.namprd11.prod.outlook.com ([fe80::91af:f569:5de7:7380]) by CH3PR11MB7819.namprd11.prod.outlook.com ([fe80::91af:f569:5de7:7380%4]) with mapi id 15.20.6254.034; Fri, 7 Apr 2023 07:55:17 +0000 From: "Lu, James" To: Rebecca Cran , "devel@edk2.groups.io" , "Gao, Liming" , "Kinney, Michael D" , "Jiang, Guomin" , "Xu, Wei6" , "Dong, Guo" , "Ni, Ray" , "Rhodes, Sean" , "Guo, Gua" , Andrew Fish , "Wu, Hao A" , Maciej Rabeda , Siyuan Fu , "Yao, Jiewen" , "Wang, Jian J" , "Lu, Xiaoyu1" , Ard Biesheuvel , Sami Mujawar , Supreeth Venkatesh , Michael Kubacki , "Desimone, Nathaniel L" , Sean Brogan CC: Leif Lindholm , Abner Chang , Nickle Wang , Igor Kulchytskyy , Daniel Schaefer , "Xu, Min M" , "Justen, Jordan L" , "Gerd Hoffmann" , Peter Grehan , "Aktas, Erdem" , James Bottomley , "Tom Lendacky" , Michael Roth , Sunil V L , "Warkentin, Andrei" Subject: Re: [PATCH 17/18] UefiPayloadPkg: Update code to be more C11 compliant by using __func__ Thread-Topic: [PATCH 17/18] UefiPayloadPkg: Update code to be more C11 compliant by using __func__ Thread-Index: AQHZaNauXpW62kI8mEim1U2o9vzthq8fesDw Date: Fri, 7 Apr 2023 07:55:16 +0000 Message-ID: References: <20230406222319.2281263-1-rebecca@bsdio.com> <20230406222319.2281263-18-rebecca@bsdio.com> In-Reply-To: <20230406222319.2281263-18-rebecca@bsdio.com> Accept-Language: en-001, en-US, zh-TW X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: CH3PR11MB7819:EE_|DM6PR11MB4564:EE_ x-ms-office365-filtering-correlation-id: 006d41f9-4b4c-4b26-8bb0-08db373d6d2e x-ld-processed: 46c98d88-e344-4ed4-8496-4ed7712e255d,ExtAddr x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: hMoJ7OuOEjH4kCxWnep7DenkL9PqnTBgP6AOxOC1Tn3CGVNwew3rGKNmTti0rxrixEzEBCTCrhcPzD77xo5qGRc4K4WRgZeNtRzbWo0vWoweEuP+4UYdk8pCK+ljkY0iUJ+jq+7xcMA+n1vwxhEEVf/Yqu5GnzSWgLcKUkT092f1cOdEMG7zgSkDNq5l0MhvGTLCkERoSFGIQ2OoYAKOWhua3q//MIpGKk6szPdMj6rMjT1m6lK2MMq+zcORbHAc5+WFwSo/fH44NKgJiCj8POgk2ATpIGVcU2pgwIBOtqyPgPzJUHjMks9Ca2FGVTfGfkIpJxlABYtHR8YVCbmmGqNkIl+b1JjYCc9p4LZaqRZHEhplbEin1cjsBKb2eXaNroYa647vlEzT1htHR13nES7fafVwB4kw2IrWEHSD/SImgiqSxDu6ZyaiGV5FE43Tabth8sBxJIJ671pRhn6R6ORPwSXNO6+QKGLZpEIQriryWzt9E2sVF5v7a8UCCC3vCTYuTIfAhoZS6q67GVIwogFqJq8+dD4VSV8B3RPiFs58IKA35uw5hlOw5bEI8ra6cNGiL3+CkDUpFJh+BdYZ0WAOww0InOa/cHQlZVn3jNIVlM0JJ9FwACPnpPH+tdo7pP1TpF/oj1nIPg3sj8fqeA== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CH3PR11MB7819.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(136003)(346002)(396003)(39860400002)(366004)(451199021)(54906003)(55016003)(7696005)(478600001)(71200400001)(38070700005)(2906002)(26005)(6506007)(316002)(83380400001)(186003)(9686003)(19627235002)(110136005)(53546011)(66946007)(66476007)(5660300002)(122000001)(41300700001)(82960400001)(7416002)(38100700002)(64756008)(8676002)(66556008)(8936002)(4326008)(66446008)(52536014)(76116006)(15650500001)(921005)(33656002)(86362001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?lwCjKj4Q+z8zZStCgVKWyMcWRVBp2gunanTsRs0inmN2IIG3JVMGaEFUb/0I?= =?us-ascii?Q?1Vu3pwh5czYI+vHkg0JjAB9p9xfOjYZwPmFswnSzkm6s2kse6RFgwkqkaDc3?= =?us-ascii?Q?oDYQenZJ6Pncl/B7udQEV+j0aNvO5QnXmBPUlzV+3hqIEI9NAUj7dUZyV0aN?= =?us-ascii?Q?HSqnIV4mL+coPMovPHigBd2nvfQkoa8+LUJSMur8l64lPTWnQlpjGTCOmFh9?= =?us-ascii?Q?0S5ahrRAmm3BjIMTlltQlMQqKHnV6ZoWSPLvDE7aJD6XPFQ02LeQKUnDdEMZ?= =?us-ascii?Q?1fr4cWTYgvPpii98zbTLwn8zX6+D+QcEH+Lb7VThxOz/XhqWEMga7y4ur5YL?= =?us-ascii?Q?y71nSlzIsvlhBuWekXdkqvqk3zl8576EVLl8S+UQVfSk+DB3Y86NTU+hMFFH?= =?us-ascii?Q?p//1G+c7M6rjKVMmEwcT6jPklOidDe0gzU7om161BZxsJNp7pLUDHvcgbFmn?= =?us-ascii?Q?zhnzhqt89rVrtfgH4DkrB1DSTnKDGfWYM8n3l1HsdIvGBzApQWlBYo7FTATb?= =?us-ascii?Q?MH0rou3wGeylVqdjH7nOHvcpiF95GEapCvjj2q6Cyl9lZZL78e5ysLqXr3t2?= =?us-ascii?Q?hUNGw9RJZV+jpWQM0yGQLiXI53hWCvmk4oXuhtmFk76Ouzm7MM/LXrT1gsv4?= =?us-ascii?Q?LjjdOfP1KO/Z8CjigKaiGo9Ge9xlDU6uiGd7W+Z/25T2P/xPfpVUtJut9Dx6?= =?us-ascii?Q?IJUqbT2BKOn7VQX6FlGihbi9LYPchTQaGXsJ8ECozrVe48GU2lv0Z1gPoA4U?= =?us-ascii?Q?pmR4RafIpsaRN4sfxxBWThL7jezDnLQvant2KhbKB+fZ6ry/wlhaHozOMAez?= =?us-ascii?Q?P+UwPPEjaVK694M1RauoPxNUqpPFtFZh6dRmB3LVmebv8zZvCpP+Xdb9XM+1?= =?us-ascii?Q?gjOemqxrM7eryW3PIHIaHGtrLbkkPzJNeGni87R8N/JOXRPYGAjuYZss5JKQ?= =?us-ascii?Q?idjE3QHOMpVpiRdRi7GXTC6deV8UNV4Ef+UtBGgOSIRI8kFcSAQPRoF1soFY?= =?us-ascii?Q?szh1Ktf2nRrZrUlM4MIKYIoRFUEfZUspLa59SJHR7ptOmy9Ulvv+OSHbqdS9?= =?us-ascii?Q?wsPs35wm8kxiAqy3M+b3g1qVVAc0Hh+amhSA95D3SKzDNeYJZR/X9IpWNjqm?= =?us-ascii?Q?jwxhfcvZ4ARNMoaEpB3MU07bNLBl0j5AOb6pNbzlJgepmWl4U5df0rUhfFK6?= =?us-ascii?Q?4B3WSQ2wlaUJC/WNukSU/JlBJOVJ2scqgtCaXTlefdnBq9GNfBdQAsmRm69w?= =?us-ascii?Q?v5k13WYfuLHJbcxRkzGuZsQ00LLdYS7CNRSb4iZlF9PDSqvJbia7q3BqXomi?= =?us-ascii?Q?nfYuxx+ry7l2q1ATXbs4grLivyPd3/gIaXEAF5BryqLxlpo8cs8CIzJhvV04?= =?us-ascii?Q?nABVY+LIwuFXmAoAzttEmcegECa5+v1KIi8CDT0WouLkwwF+5ejPGiqMLqE+?= =?us-ascii?Q?llaqSqeGv9KVhoma35iVHdnHVK9epzbeHHhQC39uuBgKSeHm0zrAXEje6XkT?= =?us-ascii?Q?kqdL+SHQnvpCbVeRnCllPN979pFwm5nHjSYkhmNDycoJ/6dfyt01u2VGpP69?= =?us-ascii?Q?vBSrvYyRE/P+in8M6iw=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: CH3PR11MB7819.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 006d41f9-4b4c-4b26-8bb0-08db373d6d2e X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Apr 2023 07:55:16.7107 (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: SHA8lv2ql9ereXCi12KEYa2jNfH0yP1VfzWRs6IN1jpNh0/mrugt0NAOV00xAIhaXGgQFyoq9I+HCSKgvH0ScA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR11MB4564 Return-Path: james.lu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: James Lu Thanks, James -----Original Message----- From: Rebecca Cran =20 Sent: Friday, April 7, 2023 6:23 AM To: devel@edk2.groups.io; Gao, Liming ; Kinney, M= ichael D ; Jiang, Guomin ; Xu, Wei6 ; Dong, Guo ; Ni, Ray <= ray.ni@intel.com>; Rhodes, Sean ; Lu, James ; Guo, Gua ; Andrew Fish ; = Wu, Hao A ; Maciej Rabeda ; Siyuan Fu ; Yao, Jiewen ; Wa= ng, Jian J ; Lu, Xiaoyu1 ; Ard= Biesheuvel ; Sami Mujawar ; Supreeth Venkatesh ; Michael Kubacki ; Desimone, Nathaniel L ; Sean Brogan Cc: Rebecca Cran ; Leif Lindholm ; Abner Chang ; Nickle Wang ; = Igor Kulchytskyy ; Daniel Schaefer ; = Xu, Min M ; Justen, Jordan L ; Gerd Hoffmann ; Peter Grehan ; Ak= tas, Erdem ; James Bottomley ; T= om Lendacky ; Michael Roth ;= Sunil V L ; Warkentin, Andrei Subject: [PATCH 17/18] UefiPayloadPkg: Update code to be more C11 compliant= by using __func__ __FUNCTION__ is a pre-standard extension that gcc and Visual C++ among othe= rs support, while __func__ was standardized in C99. Since it's more standard, replace __FUNCTION__ with __func__ throughout Uef= iPayloadPkg. Visual Studio versions before VS 2015 don't support __func__ and so will fa= il to compile. A workaround is to define __func__ as __FUNCTION__ : #define __func__ __FUNCTION__ Signed-off-by: Rebecca Cran --- UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c | 4 ++-- UefiPayloadPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c b/U= efiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c index 790e6109c03e..57274754141d 100644 --- a/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c +++ b/UefiPayloadPkg/Library/PciHostBridgeLib/PciHostBridgeLib.c @@ -135,7 +135,7 @@ InitRootBridge ( &mRootBridgeDevicePathTemplate ); if (DevicePath =3D=3D NULL) { - DEBUG ((DEBUG_ERROR, "%a: %r\n", __FUNCTION__, EFI_OUT_OF_RESOURCES)); + DEBUG ((DEBUG_ERROR, "%a: %r\n", __func__, EFI_OUT_OF_RESOURCES)); return EFI_OUT_OF_RESOURCES; } =20 @@ -145,7 +145,7 @@ InitRootBridge ( DEBUG (( DEBUG_INFO, "%a: populated root bus %d, with room for %d subordinate bus(es)\n", - __FUNCTION__, + __func__, RootBusNumber, MaxSubBusNumber - RootBusNumber )); diff --git a/UefiPayloadPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c b/UefiPaylo= adPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c index c66e56aee15a..61a9f01ec9e7 100644 --- a/UefiPayloadPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c +++ b/UefiPayloadPkg/UefiPayloadEntry/Ia32/DxeLoadFunc.c @@ -355,7 +355,7 @@ HandOffToDxeCore ( DEBUG (( DEBUG_INFO, "%a() Stack Base: 0x%lx, Stack Size: 0x%x\n", - __FUNCTION__, + __func__, BaseOfStack, STACK_SIZE )); -- 2.34.1