From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0712.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe41::712]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 8AC681A1E56 for ; Wed, 31 Aug 2016 19:22:12 -0700 (PDT) Received: from CS1PR84MB0295.NAMPRD84.PROD.OUTLOOK.COM (10.162.190.26) by CS1PR84MB0294.NAMPRD84.PROD.OUTLOOK.COM (10.162.190.25) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.599.9; Thu, 1 Sep 2016 02:22:11 +0000 Received: from CS1PR84MB0295.NAMPRD84.PROD.OUTLOOK.COM ([10.162.190.26]) by CS1PR84MB0295.NAMPRD84.PROD.OUTLOOK.COM ([10.162.190.26]) with mapi id 15.01.0599.010; Thu, 1 Sep 2016 02:22:09 +0000 From: "Wang, Sunny (HPS SW)" To: "Gao, Liming" , "edk2-devel@lists.01.org" CC: "Ni, Ruiyu" , "Dong, Eric" , "Wang, Sunny (HPS SW)" Thread-Topic: [edk2] [Patch] MdeModulePkg UefiBootManagerLib: Ignore BootManagerMenuApp from LoadFile Thread-Index: AQHSA2BwvljuzY6cF0SpYJRKgJvBFaBj5V/wgAACqYCAAAA58A== Date: Thu, 1 Sep 2016 02:22:09 +0000 Message-ID: References: <1472631553-26232-1-git-send-email-liming.gao@intel.com> <4A89E2EF3DFEDB4C8BFDE51014F606A14B3E0FEB@shsmsx102.ccr.corp.intel.com> In-Reply-To: <4A89E2EF3DFEDB4C8BFDE51014F606A14B3E0FEB@shsmsx102.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=sunnywang@hpe.com; x-originating-ip: [15.211.131.5] x-ms-office365-filtering-correlation-id: 0823f203-42ad-411f-4a27-08d3d20ec6cc x-microsoft-exchange-diagnostics: 1; CS1PR84MB0294; 6:mzJgYIwwiZ6s20VK6htQWCZIKmOZXgT1v85+DpuugDtcWAQD9usGMrgunjVVySQ0zdfhz52wSP976Lc5CRqT2qrdjazqSKRVYJk3w+Rr/A8H8/MWyFnPTBcuCb0/qh/lj5rByJ/lmSmcB8Sg1ZryDEFDX5W0syPNR7h/hSYASjkRGT+W/6Wr2/QDavngIdKN+DvHl0NK/uJYFN5uGvnnn43+OW0oGlK/EvZjL7n6d516XZ10z+Heca3iofPi1DkX/NBFrK2zBY4Gx6B/cHuXaB8WNujtQFs7YdommdfdzAoSLLtb/ireyD7NSzf8xn+GZMyg565dLO3lOBgR6AX6mg==; 5:9I/Z6+uaBb80RmXtm2jMso3PXHq6lPw3MooW+HdGjgqO2kJin1dw/hv+ltwLoKjqbmRWjlRemld8vEJSxDONN+4+TNu3Ewr6ERH1g+eq3WZWrX0GE6FffwWYQJ0+p6iZbuReXeRcYH2p6Ah1WnTOKQ==; 24:aOWnB53Y5oa04he/ingWeObmLLcLX9tiE+oQGoPn7+GegLplz8VJTHSFXWB1ccKg3oYnVRk9fS8zHjcrTW4qCQc8S4EJvT6koF/h5jV+jPo=; 7:QzJxR8uQfyvBuzAtuFJJXxPz3j+zXQBAXbqauiK76zSGdBlwMfcjLsb6mUOSpW1iqki4+QAbOANhG/wNyRniFYZCFiZ6BzbXsGqwk6SkaFYvK183F0RlCF1jHsUUamjAt78sG6U93nHwj8pcgT8b0DdQo2mNpIN0nyrgYIXagrf/LDtFcTn/TeACM7cb5BhhFCf+MrmaFe3X8Hib1giIRkUhF93BO3bZr9RWcaiJ3vFp7+HV4tz6kzhHFxeho4OF x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CS1PR84MB0294; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(227479698468861)(162533806227266)(228905959029699); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:CS1PR84MB0294; BCL:0; PCL:0; RULEID:; SRVR:CS1PR84MB0294; x-forefront-prvs: 0052308DC6 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(6009001)(7916002)(377454003)(199003)(13464003)(189002)(5660300001)(305945005)(86362001)(3280700002)(15975445007)(2906002)(122556002)(33656002)(54356999)(10400500002)(3660700001)(97736004)(92566002)(586003)(102836003)(4326007)(68736007)(101416001)(6116002)(3846002)(50986999)(575784001)(2950100001)(105586002)(189998001)(87936001)(5001770100001)(7736002)(81166006)(99286002)(74316002)(2900100001)(2501003)(77096005)(8936002)(7696003)(19580405001)(66066001)(5002640100001)(9686002)(106116001)(8676002)(76176999)(81156014)(7846002)(19580395003)(106356001); DIR:OUT; SFP:1102; SCL:1; SRVR:CS1PR84MB0294; H:CS1PR84MB0295.NAMPRD84.PROD.OUTLOOK.COM; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; received-spf: None (protection.outlook.com: hpe.com does not designate permitted sender hosts) spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: hpe.com X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Sep 2016 02:22:09.3581 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 105b2061-b669-4b31-92ac-24d304d195dc X-MS-Exchange-Transport-CrossTenantHeadersStamped: CS1PR84MB0294 Subject: Re: [Patch] MdeModulePkg UefiBootManagerLib: Ignore BootManagerMenuApp from LoadFile X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 01 Sep 2016 02:22:13 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Got it. Thanks for confirming this and working on the replacement. Regards, Sunny Wang -----Original Message----- From: Gao, Liming [mailto:liming.gao@intel.com]=20 Sent: Thursday, September 01, 2016 10:20 AM To: Wang, Sunny (HPS SW) ; edk2-devel@lists.01.org Cc: Ni, Ruiyu ; Dong, Eric Subject: RE: [edk2] [Patch] MdeModulePkg UefiBootManagerLib: Ignore BootMan= agerMenuApp from LoadFile Importance: High Sunny: Yes. This is the replacement of Eric patch.=20 Thanks Liming > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of=20 > Wang, Sunny (HPS SW) > Sent: Thursday, September 01, 2016 10:18 AM > To: Gao, Liming ; edk2-devel@lists.01.org > Cc: Ni, Ruiyu ; Dong, Eric > Subject: Re: [edk2] [Patch] MdeModulePkg UefiBootManagerLib: Ignore=20 > BootManagerMenuApp from LoadFile >=20 > Hi Liming, > Except Ray's comment, others Look good to me. > Reviewed-by: Sunny Wang >=20 > Hi Ray and Eric, > It looks like this code change is used for replacing the one which we=20 > offline discussed to fix the duplicated Boot Manager menu issue, isn't it= ? > - [edk2] [Patch] MdeModulePkg UefiBootManagerLib: Add OptioalData for=20 > boot option. >=20 > Regards, > Sunny Wang >=20 > -----Original Message----- > From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of=20 > Liming Gao > Sent: Wednesday, August 31, 2016 4:19 PM > To: edk2-devel@lists.01.org > Cc: Ruiyu Ni ; Eric Dong > Subject: [edk2] [Patch] MdeModulePkg UefiBootManagerLib: Ignore=20 > BootManagerMenuApp from LoadFile >=20 > BootManagerMenuApp boot option is handled by=20 > EfiBootManagerGetBootManagerMenu. > Don't need to handle it again when parse LoadFile protocol. >=20 > Cc: Ruiyu Ni > Cc: Eric Dong > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Liming Gao > --- > MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c | 17 +++++++------- > --- > 1 file changed, 7 insertions(+), 10 deletions(-) >=20 > diff --git a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c > b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c > index ecd0ae3..f8a3988 100644 > --- a/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c > +++ b/MdeModulePkg/Library/UefiBootManagerLib/BmBoot.c > @@ -1940,7 +1940,6 @@ BmEnumerateBootOptions ( > UINTN Removable; > UINTN Index; > CHAR16 *Description; > - UINT32 BootAttributes; >=20 > ASSERT (BootOptionCount !=3D NULL); >=20 > @@ -2070,6 +2069,12 @@ BmEnumerateBootOptions ( > &Handles > ); > for (Index =3D 0; Index < HandleCount; Index++) { > + // > + // Ignore BootMenuApp. its boot option will be created by > BmRegisterBootManagerMenu(). > + // > + if (BmIsBootMenuAppFilePath (DevicePathFromHandle=20 > + (Handles[Index]))) > { > + continue; > + } >=20 > Description =3D BmGetBootDescription (Handles[Index]); > BootOptions =3D ReallocatePool ( > @@ -2079,19 +2084,11 @@ BmEnumerateBootOptions ( > ); > ASSERT (BootOptions !=3D NULL); >=20 > - // > - // If LoadFile includes BootMenuApp, its boot attribue will be set t= o APP > and HIDDEN. > - // > - BootAttributes =3D LOAD_OPTION_ACTIVE; > - if (BmIsBootMenuAppFilePath (DevicePathFromHandle (Handles[Index]))) > { > - BootAttributes =3D LOAD_OPTION_CATEGORY_APP | > LOAD_OPTION_ACTIVE | LOAD_OPTION_HIDDEN; > - } > - > Status =3D EfiBootManagerInitializeLoadOption ( > &BootOptions[(*BootOptionCount)++], > LoadOptionNumberUnassigned, > LoadOptionTypeBoot, > - BootAttributes, > + LOAD_OPTION_ACTIVE, > Description, > DevicePathFromHandle (Handles[Index]), > NULL, > -- > 2.8.0.windows.1 >=20 > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel