From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E9DDD21E1B77A for ; Thu, 21 Sep 2017 06:08:35 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Sep 2017 06:11:42 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,425,1500966000"; d="scan'208";a="154433256" Received: from fmsmsx105.amr.corp.intel.com ([10.18.124.203]) by fmsmga006.fm.intel.com with ESMTP; 21 Sep 2017 06:11:42 -0700 Received: from fmsmsx113.amr.corp.intel.com (10.18.116.7) by FMSMSX105.amr.corp.intel.com (10.18.124.203) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 21 Sep 2017 06:11:41 -0700 Received: from fmsmsx103.amr.corp.intel.com ([169.254.2.182]) by FMSMSX113.amr.corp.intel.com ([169.254.13.18]) with mapi id 14.03.0319.002; Thu, 21 Sep 2017 06:11:41 -0700 From: "Carsey, Jaben" To: "Ni, Ruiyu" , "edk2-devel@lists.01.org" CC: "Li, Huajing" Thread-Topic: [PATCH] ShellPkg/dmpstore: Show name of known variable vendor GUID Thread-Index: AQHTMEldxishgmqjEkuPPVc5YwWYy6K6w8BwgASGcwCAAAuIwA== Date: Thu, 21 Sep 2017 13:11:41 +0000 Message-ID: References: <20170918064227.295020-1-ruiyu.ni@intel.com> <734D49CCEBEEF84792F5B80ED585239D5BA64C28@SHSMSX103.ccr.corp.intel.com> In-Reply-To: <734D49CCEBEEF84792F5B80ED585239D5BA64C28@SHSMSX103.ccr.corp.intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiOTY0YjViYzYtOTY2Yy00YTEyLTg0ZWQtYmQ0NGE3ODIxY2RiIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE2LjUuOS4zIiwiVHJ1c3RlZExhYmVsSGFzaCI6IitocXE4XC9neUxMSUp6WTl5R0NzMTYxcHp1MUZpQ2lRR3I4aUlPWlV0UnlFPSJ9 x-ctpclassification: CTP_IC x-originating-ip: [10.1.200.106] MIME-Version: 1.0 Subject: Re: [PATCH] ShellPkg/dmpstore: Show name of known variable vendor GUID X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Sep 2017 13:08:36 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Jaben Carsey > -----Original Message----- > From: Ni, Ruiyu > Sent: Wednesday, September 20, 2017 10:30 PM > To: Carsey, Jaben ; edk2-devel@lists.01.org > Cc: Li, Huajing > Subject: RE: [PATCH] ShellPkg/dmpstore: Show name of known variable > vendor GUID > Importance: High >=20 > "Variable %H%s%N '%H%****g****%N:%H%s%N' DataSize =3D 0x%02x\r\n" > "Variable %H%s%N '%H%****s****%N:%H%s%N' DataSize =3D 0x%02x\r\n" >=20 > HEADER_LINE dumps the GUID in hex format, using %g. > HEADER_LINE2 dumps the GUID name, using %s. >=20 > Thanks/Ray >=20 > > -----Original Message----- > > From: Carsey, Jaben > > Sent: Monday, September 18, 2017 11:24 PM > > To: Ni, Ruiyu ; edk2-devel@lists.01.org > > Cc: Li, Huajing > > Subject: RE: [PATCH] ShellPkg/dmpstore: Show name of known variable > > vendor GUID > > > > Whats the difference between HEADER_LINE and HEADER_LINE2? They > look > > the same to me... > > > > > -----Original Message----- > > > From: Ni, Ruiyu > > > Sent: Sunday, September 17, 2017 11:42 PM > > > To: edk2-devel@lists.01.org > > > Cc: Li, Huajing ; Carsey, Jaben > > > > > > Subject: [PATCH] ShellPkg/dmpstore: Show name of known variable > > vendor > > > GUID > > > Importance: High > > > > > > From: Huajing Li > > > > > > Change "dmpstore" to show name of known variable vendor GUID. > > > The name is got from ShellProtocol.GetGuidName(). > > > > > > Cc: Jaben Carsey > > > Reviewed-by: Ruiyu Ni > > > Contributed-under: TianoCore Contribution Agreement 1.1 > > > Signed-off-by: Huajing Li > > > --- > > > ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c | 17 > > > +++++++++++++---- > > > .../UefiShellDebug1CommandsLib.uni | 1 + > > > 2 files changed, 14 insertions(+), 4 deletions(-) > > > > > > diff --git a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c > > > b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c > > > index aeffc89b19..062ab5dc3a 100644 > > > --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c > > > +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c > > > @@ -424,6 +424,7 @@ CascadeProcessVariables ( > > > CHAR16 *AttrString; > > > CHAR16 *HexString; > > > EFI_STATUS SetStatus; > > > + CHAR16 *GuidName; > > > > > > if (ShellGetExecutionBreakFlag()) { > > > return (SHELL_ABORTED); > > > @@ -521,10 +522,18 @@ CascadeProcessVariables ( > > > Status =3D EFI_OUT_OF_RESOURCES; > > > } > > > } else { > > > - ShellPrintHiiEx ( > > > - -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE), > > > gShellDebug1HiiHandle, > > > - AttrString, &FoundVarGuid, FoundVarName, DataSize > > > - ); > > > + Status =3D gEfiShellProtocol->GetGuidName(&FoundVarGuid, > > > &GuidName); > > > + if (EFI_ERROR (Status)) { > > > + ShellPrintHiiEx ( > > > + -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE), > > > gShellDebug1HiiHandle, > > > + AttrString, &FoundVarGuid, FoundVarName, DataSize > > > + ); > > > + } else { > > > + ShellPrintHiiEx ( > > > + -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE2)= , > > > gShellDebug1HiiHandle, > > > + AttrString, GuidName, FoundVarName, DataSize > > > + ); > > > + } > > > DumpHex (2, 0, DataSize, DataBuffer); > > > } > > > SHELL_FREE_NON_NULL (AttrString); diff --git > > > > > > a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman > > > dsLib.uni > > > > > > b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman > > > dsLib.uni > > > index f733a67f0b..b6a133a454 100644 > > > --- > > > > > > a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman > > > dsLib.uni > > > +++ > > > > > > b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1Comman > > > dsLib.uni > > > @@ -385,6 +385,7 @@ > > > #string STR_DMPSTORE_LOAD_GEN_FAIL #language en-US "%H%s%N: > > > Failed to set variable %H%s%N: %r.\r\n" > > > #string STR_DMPSTORE_LOAD_BAD_FILE #language en-US "%H%s%N: > > > Incorrect file format.\r\n" > > > #string STR_DMPSTORE_HEADER_LINE #language en-US "Variable > > > %H%s%N '%H%g%N:%H%s%N' DataSize =3D 0x%02x\r\n" > > > +#string STR_DMPSTORE_HEADER_LINE2 #language en-US "Variable > > > %H%s%N '%H%s%N:%H%s%N' DataSize =3D 0x%02x\r\n" > > > #string STR_DMPSTORE_DELETE_LINE #language en-US "Delete > variable > > > '%H%g%N:%H%s%N': %r\r\n" > > > #string STR_DMPSTORE_NO_VAR_FOUND #language en-US > "%H%s%N: > > > No matching variables found.\r\n" > > > #string STR_DMPSTORE_NO_VAR_FOUND_SFO #language en-US > > > "VariableInfo,\"\",\"\",\"\",\"\",\"\"\r\n" > > > -- > > > 2.12.2.windows.2