Re: [Qemu-devel] [edk2] [PATCH v2 3/8] MdeModulePkg: fix REGISITER -> REGISTER

[Zeng, Star]

I agree with Laszlo's suggestion.
And it is good observation.

Reviewed-by: Star Zeng <address@hidden>

Thanks,
Star
-----Original Message-----
From: Laszlo Ersek [mailto:address@hidden 
Sent: Thursday, March 8, 2018 7:59 PM
To: address@hidden; address@hidden
Cc: address@hidden; address@hidden; address@hidden; Yao, Jiewen 
<address@hidden>; Zeng, Star <address@hidden>; Dong, Eric <address@hidden>
Subject: Re: [edk2] [PATCH v2 3/8] MdeModulePkg: fix REGISITER -> REGISTER

On 03/07/18 16:57, address@hidden wrote:
> From: Marc-André Lureau <address@hidden>
> 
> Cc: Laszlo Ersek <address@hidden>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Marc-André Lureau <address@hidden>
> ---
>  MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c | 18 +++++++++---------
>  MdeModulePkg/Core/Pei/Image/Image.c           |  4 ++--
>  MdeModulePkg/Core/Pei/PeiMain.h               |  2 +-
>  MdeModulePkg/Core/Pei/PeiMain/PeiMain.c       |  2 +-
>  4 files changed, 13 insertions(+), 13 deletions(-)

CC'ing Star & Eric (see Maintainers.txt).


I suggest changing te subject like this:

  MdeModulePkg/Core/Pei: fix REGISITER -> REGISTER typo

And just so the commit message isn't empty, let's say there, "No functional 
changes.".


With those updates:

Reviewed-by: Laszlo Ersek <address@hidden>

Thanks
Laszlo



> diff --git a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c 
> b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
> index 79f2e5cebcbe..027176d872c7 100644
> --- a/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
> +++ b/MdeModulePkg/Core/Pei/Dispatcher/Dispatcher.c
> @@ -970,7 +970,7 @@ PeiDispatcher (
>    if ((Private->PeiMemoryInstalled) && 
> (Private->HobList.HandoffInformationTable->BootMode != BOOT_ON_S3_RESUME || 
> PcdGetBool (PcdShadowPeimOnS3Boot))) {
>      //
>      // Once real memory is available, shadow the RegisterForShadow modules. 
> And meanwhile
> -    // update the modules' status from PEIM_STATE_REGISITER_FOR_SHADOW to 
> PEIM_STATE_DONE.
> +    // update the modules' status from PEIM_STATE_REGISTER_FOR_SHADOW to 
> PEIM_STATE_DONE.
>      //
>      SaveCurrentPeimCount  = Private->CurrentPeimCount;
>      SaveCurrentFvCount    = Private->CurrentPeimFvCount;
> @@ -978,7 +978,7 @@ PeiDispatcher (
>  
>      for (Index1 = 0; Index1 <= SaveCurrentFvCount; Index1++) {
>        for (Index2 = 0; (Index2 < PcdGet32 (PcdPeiCoreMaxPeimPerFv)) && 
> (Private->Fv[Index1].FvFileHandles[Index2] != NULL); Index2++) {
> -        if (Private->Fv[Index1].PeimState[Index2] == 
> PEIM_STATE_REGISITER_FOR_SHADOW) {
> +        if (Private->Fv[Index1].PeimState[Index2] == 
> + PEIM_STATE_REGISTER_FOR_SHADOW) {
>            PeimFileHandle = Private->Fv[Index1].FvFileHandles[Index2];
>            Private->CurrentFileHandle   = PeimFileHandle;
>            Private->CurrentPeimFvCount  = Index1; @@ -986,13 +986,13 
> @@ PeiDispatcher (
>            Status = PeiLoadImage (
>                      (CONST EFI_PEI_SERVICES **) &Private->Ps,
>                      PeimFileHandle,
> -                    PEIM_STATE_REGISITER_FOR_SHADOW,
> +                    PEIM_STATE_REGISTER_FOR_SHADOW,
>                      &EntryPoint,
>                      &AuthenticationState
>                      );
>            if (Status == EFI_SUCCESS) {
>              //
> -            // PEIM_STATE_REGISITER_FOR_SHADOW move to PEIM_STATE_DONE
> +            // PEIM_STATE_REGISTER_FOR_SHADOW move to PEIM_STATE_DONE
>              //
>              Private->Fv[Index1].PeimState[Index2]++;
>              //
> @@ -1165,7 +1165,7 @@ PeiDispatcher (
>              //
>              PeiCheckAndSwitchStack (SecCoreData, Private);
>  
> -            if ((Private->PeiMemoryInstalled) && 
> (Private->Fv[FvCount].PeimState[PeimCount] == 
> PEIM_STATE_REGISITER_FOR_SHADOW) &&   \
> +            if ((Private->PeiMemoryInstalled) && 
> (Private->Fv[FvCount].PeimState[PeimCount] == PEIM_STATE_REGISTER_FOR_SHADOW) 
> &&   \
>                  (Private->HobList.HandoffInformationTable->BootMode != 
> BOOT_ON_S3_RESUME || PcdGetBool (PcdShadowPeimOnS3Boot))) {
>                //
>                // If memory is available we shadow images by default for 
> performance reasons.
> @@ -1179,7 +1179,7 @@ PeiDispatcher (
>                  Status = PeiLoadImage (
>                             PeiServices,
>                             PeimFileHandle,
> -                           PEIM_STATE_REGISITER_FOR_SHADOW,
> +                           PEIM_STATE_REGISTER_FOR_SHADOW,
>                             &EntryPoint,
>                             &AuthenticationState
>                             );
> @@ -1192,7 +1192,7 @@ PeiDispatcher (
>                //PERF_END (PeiServices, L"PEIM", PeimFileHandle, 0);
>  
>                //
> -              // PEIM_STATE_REGISITER_FOR_SHADOW move to PEIM_STATE_DONE
> +              // PEIM_STATE_REGISTER_FOR_SHADOW move to 
> + PEIM_STATE_DONE
>                //
>                Private->Fv[FvCount].PeimState[PeimCount]++;
>  
> @@ -1356,14 +1356,14 @@ PeiRegisterForShadow (
>      return EFI_NOT_FOUND;
>    }
>  
> -  if 
> (Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPe
> imCount] >= PEIM_STATE_REGISITER_FOR_SHADOW) {
> +  if 
> + (Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->Current
> + PeimCount] >= PEIM_STATE_REGISTER_FOR_SHADOW) {
>      //
>      // If the PEIM has already entered the PEIM_STATE_REGISTER_FOR_SHADOW or 
> PEIM_STATE_DONE then it's already been started
>      //
>      return EFI_ALREADY_STARTED;
>    }
>  
> -  
> Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPei
> mCount] = PEIM_STATE_REGISITER_FOR_SHADOW;
> +  
> + Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentP
> + eimCount] = PEIM_STATE_REGISTER_FOR_SHADOW;
>  
>    return EFI_SUCCESS;
>  }
> diff --git a/MdeModulePkg/Core/Pei/Image/Image.c 
> b/MdeModulePkg/Core/Pei/Image/Image.c
> index f41d3acac77e..f07f48823117 100644
> --- a/MdeModulePkg/Core/Pei/Image/Image.c
> +++ b/MdeModulePkg/Core/Pei/Image/Image.c
> @@ -387,7 +387,7 @@ LoadAndRelocatePeCoffImage (
>    }
>    IsRegisterForShadow = FALSE;
>    if ((Private->CurrentFileHandle == FileHandle) 
> -    && 
> (Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount]
>  == PEIM_STATE_REGISITER_FOR_SHADOW)) {
> +    && 
> + (Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->Current
> + PeimCount] == PEIM_STATE_REGISTER_FOR_SHADOW)) {
>      IsRegisterForShadow = TRUE;
>    }
>  
> @@ -876,7 +876,7 @@ PeiLoadImage (
>          //
>          // The shadowed PEIM must be relocatable.
>          //
> -        if (PeimState == PEIM_STATE_REGISITER_FOR_SHADOW) {
> +        if (PeimState == PEIM_STATE_REGISTER_FOR_SHADOW) {
>            IsStrip = RelocationIsStrip ((VOID *) (UINTN) ImageAddress);
>            ASSERT (!IsStrip);
>            if (IsStrip) {
> diff --git a/MdeModulePkg/Core/Pei/PeiMain.h 
> b/MdeModulePkg/Core/Pei/PeiMain.h index fef3753e4b3b..a1cdbc15d98a 
> 100644
> --- a/MdeModulePkg/Core/Pei/PeiMain.h
> +++ b/MdeModulePkg/Core/Pei/PeiMain.h
> @@ -104,7 +104,7 @@ typedef struct {
>  //
>  #define PEIM_STATE_NOT_DISPATCHED         0x00
>  #define PEIM_STATE_DISPATCHED             0x01
> -#define PEIM_STATE_REGISITER_FOR_SHADOW   0x02
> +#define PEIM_STATE_REGISTER_FOR_SHADOW    0x02
>  #define PEIM_STATE_DONE                   0x03
>  
>  typedef struct {
> diff --git a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c 
> b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
> index 3cd61906c3df..775bf18ce938 100644
> --- a/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
> +++ b/MdeModulePkg/Core/Pei/PeiMain/PeiMain.c
> @@ -104,7 +104,7 @@ ShadowPeiCore (
>    Status = PeiLoadImage (
>                GetPeiServicesTablePointer (),
>                *((EFI_PEI_FILE_HANDLE*)&PeiCoreFileHandle),
> -              PEIM_STATE_REGISITER_FOR_SHADOW,
> +              PEIM_STATE_REGISTER_FOR_SHADOW,
>                &EntryPoint,
>                &AuthenticationState
>                );
>