From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=66.187.233.73; helo=mx1.redhat.com; envelope-from=lersek@redhat.com; receiver=edk2-devel@lists.01.org Received: from mx1.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) (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 99B4A224DCA35 for ; Thu, 8 Mar 2018 03:53:19 -0800 (PST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 81A5E40704B9; Thu, 8 Mar 2018 11:59:32 +0000 (UTC) Received: from lacos-laptop-7.usersys.redhat.com (ovpn-120-50.rdu2.redhat.com [10.10.120.50]) by smtp.corp.redhat.com (Postfix) with ESMTP id C741B215CDAA; Thu, 8 Mar 2018 11:59:28 +0000 (UTC) To: marcandre.lureau@redhat.com, edk2-devel@lists.01.org Cc: qemu-devel@nongnu.org, javierm@redhat.com, pjones@redhat.com, jiewen.yao@intel.com, Star Zeng , Eric Dong References: <20180307155746.18526-1-marcandre.lureau@redhat.com> <20180307155746.18526-4-marcandre.lureau@redhat.com> From: Laszlo Ersek Message-ID: <9abfc936-c7e0-7982-baed-88ec8047ae68@redhat.com> Date: Thu, 8 Mar 2018 12:59:27 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.6.0 MIME-Version: 1.0 In-Reply-To: <20180307155746.18526-4-marcandre.lureau@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Thu, 08 Mar 2018 11:59:35 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.7]); Thu, 08 Mar 2018 11:59:35 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'lersek@redhat.com' RCPT:'' Subject: Re: [PATCH v2 3/8] MdeModulePkg: fix REGISITER -> REGISTER X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Mar 2018 11:53:20 -0000 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit On 03/07/18 16:57, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau > > Cc: Laszlo Ersek > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Marc-André Lureau > --- > 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 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->CurrentPeimCount] >= PEIM_STATE_REGISITER_FOR_SHADOW) { > + if (Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] >= 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->CurrentPeimCount] = PEIM_STATE_REGISITER_FOR_SHADOW; > + Private->Fv[Private->CurrentPeimFvCount].PeimState[Private->CurrentPeimCount] = 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->CurrentPeimCount] == 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 > ); >