From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (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 27E3521D046BA for ; Wed, 20 Sep 2017 22:27:18 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP; 20 Sep 2017 22:30:24 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,423,1500966000"; d="scan'208";a="902451393" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by FMSMGA003.fm.intel.com with ESMTP; 20 Sep 2017 22:30:24 -0700 Received: from fmsmsx122.amr.corp.intel.com (10.18.125.37) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 20 Sep 2017 22:30:24 -0700 Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by fmsmsx122.amr.corp.intel.com (10.18.125.37) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 20 Sep 2017 22:30:23 -0700 Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.213]) by shsmsx102.ccr.corp.intel.com ([169.254.2.175]) with mapi id 14.03.0319.002; Thu, 21 Sep 2017 13:30:20 +0800 From: "Ni, Ruiyu" To: "Carsey, Jaben" , "edk2-devel@lists.01.org" CC: "Li, Huajing" Thread-Topic: [PATCH] ShellPkg/dmpstore: Show name of known variable vendor GUID Thread-Index: AQHTMJI30ua7NqLOJUq/1f3d+mvij6K+09fg Date: Thu, 21 Sep 2017 05:30:20 +0000 Message-ID: <734D49CCEBEEF84792F5B80ED585239D5BA64C28@SHSMSX103.ccr.corp.intel.com> References: <20170918064227.295020-1-ruiyu.ni@intel.com> In-Reply-To: Accept-Language: en-US, zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] 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 05:27:18 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable "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" HEADER_LINE dumps the GUID in hex format, using %g. HEADER_LINE2 dumps the GUID name, using %s. Thanks/Ray > -----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 >=20 > Whats the difference between HEADER_LINE and HEADER_LINE2? They look > the same to me... >=20 > > -----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 variabl= e > > '%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