From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) (using TLSv1 with cipher CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5B24C1A1E56 for ; Wed, 31 Aug 2016 19:12:50 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga102.fm.intel.com with ESMTP; 31 Aug 2016 19:12:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.30,264,1470726000"; d="scan'208";a="1023378176" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by orsmga001.jf.intel.com with ESMTP; 31 Aug 2016 19:12:48 -0700 Received: from fmsmsx156.amr.corp.intel.com (10.18.116.74) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 31 Aug 2016 19:12:48 -0700 Received: from shsmsx101.ccr.corp.intel.com (10.239.4.153) by fmsmsx156.amr.corp.intel.com (10.18.116.74) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 31 Aug 2016 19:12:47 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.109]) by SHSMSX101.ccr.corp.intel.com ([169.254.1.91]) with mapi id 14.03.0248.002; Thu, 1 Sep 2016 10:12:45 +0800 From: "Gao, Liming" To: "Ni, Ruiyu" , "edk2-devel@lists.01.org" CC: "Dong, Eric" Thread-Topic: [Patch] MdeModulePkg UefiBootManagerLib: Ignore BootManagerMenuApp from LoadFile Thread-Index: AQHSA/TjBZQaNETrFEeWbvexyLAyp6Bj5Fbw Date: Thu, 1 Sep 2016 02:12:44 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14B3E0FD1@shsmsx102.ccr.corp.intel.com> References: <1472631553-26232-1-git-send-email-liming.gao@intel.com> <734D49CCEBEEF84792F5B80ED585239D58D45B2A@SHSMSX103.ccr.corp.intel.com> In-Reply-To: <734D49CCEBEEF84792F5B80ED585239D58D45B2A@SHSMSX103.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 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:12:50 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Ok. Got your comments. This patch just ignores BootManagerMenu from LoadFil= e. Next patch will rename BootMenuApp to BootManagerMenu. I will update the= m.=20 Thanks Liming > -----Original Message----- > From: Ni, Ruiyu > Sent: Thursday, September 01, 2016 10:02 AM > To: Gao, Liming ; edk2-devel@lists.01.org > Cc: Dong, Eric > Subject: RE: [Patch] MdeModulePkg UefiBootManagerLib: Ignore > BootManagerMenuApp from LoadFile >=20 > Liming, > Please use the term "BootManagerMenu" instead of "BootMenuApp", to > avoid confusion when reading from future developers. >=20 > // Ignore BootMenuApp. its boot option will be created by > BmRegisterBootManagerMenu(). > --> > // Ignore BootManagerMenu, which will be auto-created by > EfiBootManagerGetBootManagerMenu(). >=20 > BmIsBootMenuAppFilePath > --> > BmIsBootManagerMenuFilePath >=20 > With the above two changes, > Reviewed-by: Ruiyu Ni >=20 > > -----Original Message----- > > From: Gao, Liming > > Sent: Wednesday, August 31, 2016 4:19 PM > > To: edk2-devel@lists.01.org > > Cc: Ni, Ruiyu ; Dong, Eric > > Subject: [Patch] MdeModulePkg UefiBootManagerLib: Ignore > > BootManagerMenuApp from LoadFile > > > > BootManagerMenuApp boot option is handled by > > EfiBootManagerGetBootManagerMenu. > > Don't need to handle it again when parse LoadFile protocol. > > > > 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(-) > > > > 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; > > > > ASSERT (BootOptionCount !=3D NULL); > > > > @@ -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 > (Handles[Index]))) > > { > > + continue; > > + } > > > > Description =3D BmGetBootDescription (Handles[Index]); > > BootOptions =3D ReallocatePool ( > > @@ -2079,19 +2084,11 @@ BmEnumerateBootOptions ( > > ); > > ASSERT (BootOptions !=3D NULL); > > > > - // > > - // If LoadFile includes BootMenuApp, its boot attribue will be set= to 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