diff options
| author | Huajing Li <huajing.li@intel.com> | 2017-09-15 10:39:33 +0800 |
|---|---|---|
| committer | Ruiyu Ni <ruiyu.ni@intel.com> | 2017-09-22 10:32:23 +0800 |
| commit | 09e8678380aaaf0a5ef59179ff59e0a045d1b0bf (patch) | |
| tree | 49584f4f362ecf8897a33e82271c73aa50ac7be1 /ShellPkg | |
| parent | 89f7f2cdf0266619976cb53b45b5de1aba2f8fac (diff) | |
| download | edk2-09e8678380aaaf0a5ef59179ff59e0a045d1b0bf.tar.gz edk2-09e8678380aaaf0a5ef59179ff59e0a045d1b0bf.tar.bz2 edk2-09e8678380aaaf0a5ef59179ff59e0a045d1b0bf.zip | |
ShellPkg/dmpstore: Show name of known variable vendor GUID
Change "dmpstore" to show name of known variable vendor GUID.
The name is got from ShellProtocol.GetGuidName().
Cc: Jaben Carsey <jaben.carsey@intel.com>
Reviewed-by: Ruiyu Ni <ruiyu.ni@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Huajing Li <huajing.li@intel.com>
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
Diffstat (limited to 'ShellPkg')
| -rw-r--r-- | ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c | 17 | ||||
| -rw-r--r-- | ShellPkg/Library/UefiShellDebug1CommandsLib/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 = EFI_OUT_OF_RESOURCES;
}
} else {
- ShellPrintHiiEx (
- -1, -1, NULL, STRING_TOKEN (STR_DMPSTORE_HEADER_LINE), gShellDebug1HiiHandle,
- AttrString, &FoundVarGuid, FoundVarName, DataSize
- );
+ Status = 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/UefiShellDebug1CommandsLib.uni b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni index f733a67f0b..b6a133a454 100644 --- a/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.uni +++ b/ShellPkg/Library/UefiShellDebug1CommandsLib/UefiShellDebug1CommandsLib.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 = 0x%02x\r\n"
+#string STR_DMPSTORE_HEADER_LINE2 #language en-US "Variable %H%s%N '%H%s%N:%H%s%N' DataSize = 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"
|