From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by mx.groups.io with SMTP id smtpd.web10.1426.1680847076723234136 for ; Thu, 06 Apr 2023 22:57:57 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=Dy8McqQL; spf=pass (domain: intel.com, ip: 134.134.136.100, mailfrom: gua.guo@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680847076; x=1712383076; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=60SRT7SMQreNYTD22NVlOO7pnErUK/PAASAX6IoT/7E=; b=Dy8McqQLjO8cr1D/WPvS78Z9iCg9rLdsxUvkeSgGJnx/sgfZ85UHumrS 47N2uFAvGqfZYwsPrgzB4Kr5HH0+vkSs/vy+JCpxxECC7StL8Ld8QSyKe uTdu0BXh2NtKes8wrcj3daBYkjgphYvuW2IJCFuG5gGofW6K85bAFO00I rxgnAPm9WVEuYwhqzBVcnlMqJzHG1H4H22rp/zaoKQ1vbebTvoQ+ks9xg MQ6/2kqAMmDvWmI0/79atYIFAQXM+JScpD71I+PBIP7yiBZC6xBj0oqSF zEOpPyc+V0HvdfGA5RQ8QGqzF9sMdUNo7Of9jizyLHW8rXthZjNmLUmEp g==; X-IronPort-AV: E=McAfee;i="6600,9927,10672"; a="408057952" X-IronPort-AV: E=Sophos;i="5.98,326,1673942400"; d="scan'208";a="408057952" Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Apr 2023 22:57:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10672"; a="689961352" X-IronPort-AV: E=Sophos;i="5.98,326,1673942400"; d="scan'208";a="689961352" Received: from fmsmsx603.amr.corp.intel.com ([10.18.126.83]) by fmsmga007.fm.intel.com with ESMTP; 06 Apr 2023 22:57:52 -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; Thu, 6 Apr 2023 22:57:51 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) 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; Thu, 6 Apr 2023 22:57:51 -0700 Received: from fmsedg602.ED.cps.intel.com (10.1.192.136) 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; Thu, 6 Apr 2023 22:57:51 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.177) 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.2507.21; Thu, 6 Apr 2023 22:57:50 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=j1s/2uy1Qxoq80D+OP2nt9ON+UAT13A4vW02Gc4ukrgmen5Z26G+R0mUocSOfD6Gj0pCJtNQYRgU1qtNKPwQ6d2wHuV9QgeviDT/x4U9EoeD60xqzx54iWwZv14MUtahd+FEOR7jfrQ394CYbkuVxwmVooI9xY839GrqrovCWMegac8FgOoOzjO4pgy67av75na/GJmuHRvWQJjj4WQQ4xwLf5jmc0h3nGUMrNg+Aj5+Ax6zX2vBRSehHnXJAgqMu3Hcig504lsvJOd9i2LGi/cFpdF83TfuWuGyC4vDd3y7UAYPGrvWX4AfQ/MkWLFHJJRnpDdjmp40NkkAQ7jAdw== 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=HPQYaVqdQeJD0E0I2p2B9VBoDNu1jQuNqndG//MiMHQ=; b=izRKUdGvrS8qekbzRVEKs2v7mpWIxqHYBcyP4KpHnIP8L1btherO1zDFueVvFTA6p6F1P93ZXC346S6H6IzaOCuh3uBeKv8v5Qw1Y7F1N4WGzmTKnLZNdGrFNijFBtuyZjl5e5yDzbw1ikVx8CnAGQQV1qabUVilWSOXEi09VmaxJo/lFNghWabeHM9WTrNA+5zr857P+luTELd1AyRvHexWfoYFVVttevqfy2IkBgoSnDBNR3UFzDww2L3zMG8OBBwuoV/ayQyW9M/m/v5AHiO7JvG+FX3PTtGCOh6/JrFFm9uW0dBtigMogGT7d6C2pcahnz3fsapLfAR9zUcCZw== 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 BL1PR11MB5478.namprd11.prod.outlook.com (2603:10b6:208:31d::12) by IA0PR11MB7308.namprd11.prod.outlook.com (2603:10b6:208:436::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.33; Fri, 7 Apr 2023 05:57:37 +0000 Received: from BL1PR11MB5478.namprd11.prod.outlook.com ([fe80::c7e7:7b20:9a8b:aa59]) by BL1PR11MB5478.namprd11.prod.outlook.com ([fe80::c7e7:7b20:9a8b:aa59%4]) with mapi id 15.20.6277.030; Fri, 7 Apr 2023 05:57:37 +0000 From: "Guo, Gua" To: Rebecca Cran , "devel@edk2.groups.io" , "Gao, Liming" , "Kinney, Michael D" , "Jiang, Guomin" , "Xu, Wei6" , "Dong, Guo" , "Ni, Ray" , "Rhodes, Sean" , "Lu, James" , 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: AQHZaNavEm8rutbY1E6MhfVjhDJSFa8fWeew Date: Fri, 7 Apr 2023 05:57:36 +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-US 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: BL1PR11MB5478:EE_|IA0PR11MB7308:EE_ x-ms-office365-filtering-correlation-id: f0c75729-8fae-4964-af7c-08db372cfd24 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: EAlz6Qtixc2OD2PPukR+VkRaRwXCSA1hmcFR2D2IqF1IFIYdiQ+0xRJe0j/JgbVqfxVywk4OJtvHll1r5bF87pjlqP2DcGuv1sMftUThaRLzhCwtGqjB7Zwa+hBl1rp6LXY1otXfZsyUwxe3Bzuhbzuddr+YuQEgrGpHnk2jBB/orHjDr1Fg8hgSyBEusSGOWwqE/bHpuwvQ88Hz6kbxuI1K2roJfLdXsDbpnf+yqAl0KUEndVKbd1l5Fbq5oXlN2DrDJBl3ubAIj0Dp7kBauunGneHLMN361KosC8WPSDQeIKWgZF8DuTXg7SUeg35xrZVOE+WapmyLoP4VJehMTsH+pMoj9P18Ti4fOynAP0mBh5wHo/6CTejK2juBYa8sJPSoc1Y1FzOpmmyF3HNq5YL+yF9+5xSHZR7FFxw0bA+bt/ij3uBE6PuE8nUqacFX3oHDaefsbbhm8CM4aQpxHceKQTtbpS7TQRckpGe2HVV8nToie13hWRkbrdXlvBrmAy51C2M1TbN0hkKzUIaCJ89Sj632YDPkYT8mT81Gi2tYe5LIFVqOHxINUbHP9pUMiodReXLGISxr2eatAEqgPpIrC6Z7M0g878391Sq9DERlQFY+gIKsP6yaadMVoUxeckRJ5l61/+1+Ciug0kgOAQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BL1PR11MB5478.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(13230028)(376002)(39860400002)(136003)(396003)(366004)(346002)(451199021)(38070700005)(15650500001)(2906002)(38100700002)(5660300002)(7416002)(52536014)(8936002)(55016003)(83380400001)(86362001)(66446008)(54906003)(478600001)(19627235002)(110136005)(316002)(53546011)(71200400001)(7696005)(26005)(6506007)(9686003)(8676002)(66946007)(4326008)(66556008)(66476007)(64756008)(76116006)(41300700001)(122000001)(186003)(33656002)(82960400001)(921005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?HLfN6qFeSucjVHd9kC7KLBFezt1RezT1RpD5hRnN7q4vUgq8utrjsNoY3Zaj?= =?us-ascii?Q?byf8/Fw6Pt+6e4MCe0Q3zFHtmdwkOEAdUglr+m7gpSBDC9riVzjZZbDHKmix?= =?us-ascii?Q?8PPLEaPbFH00GRbaBYRNtVaR1lhNdzD4DrxaMfZve5+n76M69RI0MElbSKKx?= =?us-ascii?Q?OavH4wQHJALlX7gZXjCMe9Odi9WCQfveW22vXYu9OaNQuU+cpfRp9TZWzqTM?= =?us-ascii?Q?E0whlRnGIbtOy7ws95SvvKjLTvHzx2EKwPrUeufiHWbprHiLPWkaOV0M1E32?= =?us-ascii?Q?jJDXk/U+3PG95YfBR0QrBSwRJZPfTDvzpOpvHnTs1yD60RPycdtjoDghnfvb?= =?us-ascii?Q?Wop4LtFIkbw616/YC7QKtmK1FyOyeJbzo/35ijLm+wxcmLlWRv8H5qNWL2jO?= =?us-ascii?Q?iaSRpNv7p6CO5g5mkKACmTMTpppsx5ESEX31WO6k9FAcbfbJFBjfPhV4V/AA?= =?us-ascii?Q?pn4mSGJQ6TriJEGYaQvxyycw4QPHVpOKKB41GVgTF95ww0ryN/AxFiqcXyQN?= =?us-ascii?Q?GCKvCZRpN+UuR2CpYvcIsYNa8pXX/Z4I4sLweoVFgymdWHCw7MCXl/heQifS?= =?us-ascii?Q?pXiO4Hecf8KRpzP3blPc3ewN+sCPZ/2BgKkk2s3WBQp+CoyE06uY6+NZsVBc?= =?us-ascii?Q?8VMZh9fX6SjR9k+ZhkLACepo5EH2vfXbncR6+pPsrKf7SS7R7+ELseYeZOtP?= =?us-ascii?Q?jfjr3Dx9UKPmKPy77WK8krVYb3PADTFsxPn54qFT6klazrAm5x6CpweNofz5?= =?us-ascii?Q?7XOmEYHXs/i9YgoEF8DCBV0ybJokij3zuLyW9HlUGvkZb2b9kiJ1fuySHI/J?= =?us-ascii?Q?iO/KCyqkaULAuzTXTfTVrd2ZmgoXqKibRGljv+TU++aQO11dg04hyDfy8y+p?= =?us-ascii?Q?JespaMMxd6nVR9DEVEw3OGy1FCOIzWQdvCqkjfvjcMUFTlrt0diwqvJLnjQ5?= =?us-ascii?Q?IkZZ4T92Uu8AolVpa3EqF0hg+jUM1ZimF18Gj0CgA31u5SQEftyZKY6cbYAb?= =?us-ascii?Q?jnIaiWS36b1Kz3aw9b6dXrjPulPgzr4cdq9OMMsxpYEcYpFa3vivMrTvvqZV?= =?us-ascii?Q?T538Bp8kr1u22iWuv0jLpWjMVZtokNweLwcPyF4F9uLClMHLnadGYW8c0EYC?= =?us-ascii?Q?I6AFMpRok+YgFN0Mi6sCsqZKWGOgCK7WWdYiMmKnmMhVirnT1FcGDjITKVv+?= =?us-ascii?Q?hh1gukehyRGkTTNySUiny2laGmDGLt8xwY3qO+qPjDHeV/ZPRYVlxPhWF94k?= =?us-ascii?Q?Ni5c4qThAoL/Vi/JCuVrR9BcktaEueZKabRIntT1AXLA3w0CPz7IBTuUOK4t?= =?us-ascii?Q?wBBSLUAGCVNBYC6C3KkxeP9klgD0GazIG2tUxwJtsJb2mWQ2iqywMRhrUcZP?= =?us-ascii?Q?I1PHs4KMYtHV7BltLj+sqqopgFzJ2KMV3C4M0kFABMgSiWDPyJcLORUtwir0?= =?us-ascii?Q?srhXsIXS5jvcCRX8YAN5V/ObdASkAM14OxqKQToYRk1aRmxEeD1hrxltoP5w?= =?us-ascii?Q?635fTRrLrYYaivdR/qJtYdlPSDp8pkBTjQnrrla/QT0u/gB3iloYCKICw5xJ?= =?us-ascii?Q?uJIbqGId2X4WEUHEVMg=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BL1PR11MB5478.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f0c75729-8fae-4964-af7c-08db372cfd24 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 Apr 2023 05:57:36.8112 (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: OiLzADYj/yQ31jKJLUJzoC4UWGgBDos7eifIHjjVAo5yPnEhFc3qfzWn2EZqLhIN9LScAnbYCFiGe6DNIvoHIw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR11MB7308 Return-Path: gua.guo@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Gua Guo -----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