public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [PATCH] ShellPkg/dmpstore: Show name of known variable vendor GUID
@ 2017-09-18  6:42 Ruiyu Ni
  2017-09-18 15:24 ` Carsey, Jaben
  2017-09-22  9:43 ` Laszlo Ersek
  0 siblings, 2 replies; 5+ messages in thread
From: Ruiyu Ni @ 2017-09-18  6:42 UTC (permalink / raw)
  To: edk2-devel; +Cc: Huajing Li, Jaben Carsey

From: Huajing Li <huajing.li@intel.com>

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>
---
 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 = 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"
-- 
2.12.2.windows.2



^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH] ShellPkg/dmpstore: Show name of known variable vendor GUID
  2017-09-18  6:42 [PATCH] ShellPkg/dmpstore: Show name of known variable vendor GUID Ruiyu Ni
@ 2017-09-18 15:24 ` Carsey, Jaben
  2017-09-21  5:30   ` Ni, Ruiyu
  2017-09-22  9:43 ` Laszlo Ersek
  1 sibling, 1 reply; 5+ messages in thread
From: Carsey, Jaben @ 2017-09-18 15:24 UTC (permalink / raw)
  To: Ni, Ruiyu, edk2-devel@lists.01.org; +Cc: Li, Huajing

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 <huajing.li@intel.com>; Carsey, Jaben
> <jaben.carsey@intel.com>
> Subject: [PATCH] ShellPkg/dmpstore: Show name of known variable vendor
> GUID
> Importance: High
> 
> From: Huajing Li <huajing.li@intel.com>
> 
> 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>
> ---
>  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 = 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/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 = 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"
> --
> 2.12.2.windows.2



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] ShellPkg/dmpstore: Show name of known variable vendor GUID
  2017-09-18 15:24 ` Carsey, Jaben
@ 2017-09-21  5:30   ` Ni, Ruiyu
  2017-09-21 13:11     ` Carsey, Jaben
  0 siblings, 1 reply; 5+ messages in thread
From: Ni, Ruiyu @ 2017-09-21  5:30 UTC (permalink / raw)
  To: Carsey, Jaben, edk2-devel@lists.01.org; +Cc: Li, Huajing

"Variable %H%s%N '%H%****g****%N:%H%s%N' DataSize = 0x%02x\r\n"
"Variable %H%s%N '%H%****s****%N:%H%s%N' DataSize = 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 <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> Cc: Li, Huajing <huajing.li@intel.com>
> 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 <huajing.li@intel.com>; Carsey, Jaben
> > <jaben.carsey@intel.com>
> > Subject: [PATCH] ShellPkg/dmpstore: Show name of known variable
> vendor
> > GUID
> > Importance: High
> >
> > From: Huajing Li <huajing.li@intel.com>
> >
> > 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>
> > ---
> >  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 = 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/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 = 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"
> > --
> > 2.12.2.windows.2



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] ShellPkg/dmpstore: Show name of known variable vendor GUID
  2017-09-21  5:30   ` Ni, Ruiyu
@ 2017-09-21 13:11     ` Carsey, Jaben
  0 siblings, 0 replies; 5+ messages in thread
From: Carsey, Jaben @ 2017-09-21 13:11 UTC (permalink / raw)
  To: Ni, Ruiyu, edk2-devel@lists.01.org; +Cc: Li, Huajing

Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

> -----Original Message-----
> From: Ni, Ruiyu
> Sent: Wednesday, September 20, 2017 10:30 PM
> To: Carsey, Jaben <jaben.carsey@intel.com>; edk2-devel@lists.01.org
> Cc: Li, Huajing <huajing.li@intel.com>
> Subject: RE: [PATCH] ShellPkg/dmpstore: Show name of known variable
> vendor GUID
> Importance: High
> 
> "Variable %H%s%N '%H%****g****%N:%H%s%N' DataSize = 0x%02x\r\n"
> "Variable %H%s%N '%H%****s****%N:%H%s%N' DataSize = 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 <ruiyu.ni@intel.com>; edk2-devel@lists.01.org
> > Cc: Li, Huajing <huajing.li@intel.com>
> > 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 <huajing.li@intel.com>; Carsey, Jaben
> > > <jaben.carsey@intel.com>
> > > Subject: [PATCH] ShellPkg/dmpstore: Show name of known variable
> > vendor
> > > GUID
> > > Importance: High
> > >
> > > From: Huajing Li <huajing.li@intel.com>
> > >
> > > 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>
> > > ---
> > >  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 = 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/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 = 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"
> > > --
> > > 2.12.2.windows.2



^ permalink raw reply	[flat|nested] 5+ messages in thread

* Re: [PATCH] ShellPkg/dmpstore: Show name of known variable vendor GUID
  2017-09-18  6:42 [PATCH] ShellPkg/dmpstore: Show name of known variable vendor GUID Ruiyu Ni
  2017-09-18 15:24 ` Carsey, Jaben
@ 2017-09-22  9:43 ` Laszlo Ersek
  1 sibling, 0 replies; 5+ messages in thread
From: Laszlo Ersek @ 2017-09-22  9:43 UTC (permalink / raw)
  To: Ruiyu Ni, edk2-devel; +Cc: Jaben Carsey, Huajing Li

Hi,

this patch breaks the GCC48 build:

On 09/18/17 08:42, Ruiyu Ni wrote:
> From: Huajing Li <huajing.li@intel.com>
> 
> 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>
> ---
>  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 = 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);

ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c:525:66: error: passing argument 2 of 'gEfiShellProtocol->GetGuidName' from incompatible pointer type [-Werror=incompatible-pointer-types]
           Status = gEfiShellProtocol->GetGuidName(&FoundVarGuid, &GuidName);
                                                                  ^
ShellPkg/Library/UefiShellDebug1CommandsLib/DmpStore.c:525:66: note: expected 'const CHAR16 ** {aka const short unsigned int **}' but argument is of type 'CHAR16 ** {aka short unsigned int **}'

It was reported by Gerd's Jenkins CI.

Thanks
Laszlo

> +          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"
> 



^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2017-09-22  9:39 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-18  6:42 [PATCH] ShellPkg/dmpstore: Show name of known variable vendor GUID Ruiyu Ni
2017-09-18 15:24 ` Carsey, Jaben
2017-09-21  5:30   ` Ni, Ruiyu
2017-09-21 13:11     ` Carsey, Jaben
2017-09-22  9:43 ` Laszlo Ersek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox