| Message ID | 20161021212737.15974-6-lersek@redhat.com |
|---|---|
| State | Accepted |
| Commit | 579afd6bb85e90a87a1aeb935796318569914579 |
| Headers | show |
On Fri, Oct 21, 2016 at 11:27:23PM +0200, Laszlo Ersek wrote: > These are deprecated / disabled under the > DISABLE_NEW_DEPRECATED_INTERFACES feature test macro. > > Introduce a variable called PcdStatus, and use it to assert the success of > these operations (there is no reason for them to fail here). > Reviewed-by: Gary Lin <glin@suse.com> and Tested-by: Gary Lin <glin@suse.com> > Cc: Anthony PERARD <anthony.perard@citrix.com> > Cc: Gary Lin <glin@suse.com> > Cc: Jordan Justen <jordan.l.justen@intel.com> > Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=166 > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Laszlo Ersek <lersek@redhat.com> > --- > > Notes: > the emulated variable part of the patch is un-exercised on my setup, > testing would be appreciated > > OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 14 ++++++++++---- > 1 file changed, 10 insertions(+), 4 deletions(-) > > diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > index bd1a4396f1d3..29ce21282595 100644 > --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c > @@ -353,8 +353,9 @@ Returns: > > --*/ > { > - EFI_HANDLE Handle; > - EFI_STATUS Status; > + EFI_HANDLE Handle; > + EFI_STATUS Status; > + RETURN_STATUS PcdStatus; > > DEBUG ((EFI_D_INFO, "PlatformBootManagerBeforeConsole\n")); > InstallDevicePathCallback (); > @@ -394,7 +395,9 @@ Returns: > ASSERT_EFI_ERROR (Status); > > PlatformInitializeConsole (gPlatformConsole); > - PcdSet16 (PcdPlatformBootTimeOut, GetFrontPageTimeoutFromQemu ()); > + PcdStatus = PcdSet16S (PcdPlatformBootTimeOut, > + GetFrontPageTimeoutFromQemu ()); > + ASSERT_RETURN_ERROR (PcdStatus); > > PlatformRegisterOptionsAndKeys (); > } > @@ -1281,6 +1284,7 @@ VisitingFileSystemInstance ( > { > EFI_STATUS Status; > STATIC BOOLEAN ConnectedToFileSystem = FALSE; > + RETURN_STATUS PcdStatus; > > if (ConnectedToFileSystem) { > return EFI_ALREADY_STARTED; > @@ -1300,7 +1304,9 @@ VisitingFileSystemInstance ( > NULL, > &mEmuVariableEventReg > ); > - PcdSet64 (PcdEmuVariableEvent, (UINT64)(UINTN) mEmuVariableEvent); > + PcdStatus = PcdSet64S (PcdEmuVariableEvent, > + (UINT64)(UINTN) mEmuVariableEvent); > + ASSERT_RETURN_ERROR (PcdStatus); > > return EFI_SUCCESS; > } > -- > 2.9.2 > > > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c index bd1a4396f1d3..29ce21282595 100644 --- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c +++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c @@ -353,8 +353,9 @@ Returns: --*/ { - EFI_HANDLE Handle; - EFI_STATUS Status; + EFI_HANDLE Handle; + EFI_STATUS Status; + RETURN_STATUS PcdStatus; DEBUG ((EFI_D_INFO, "PlatformBootManagerBeforeConsole\n")); InstallDevicePathCallback (); @@ -394,7 +395,9 @@ Returns: ASSERT_EFI_ERROR (Status); PlatformInitializeConsole (gPlatformConsole); - PcdSet16 (PcdPlatformBootTimeOut, GetFrontPageTimeoutFromQemu ()); + PcdStatus = PcdSet16S (PcdPlatformBootTimeOut, + GetFrontPageTimeoutFromQemu ()); + ASSERT_RETURN_ERROR (PcdStatus); PlatformRegisterOptionsAndKeys (); } @@ -1281,6 +1284,7 @@ VisitingFileSystemInstance ( { EFI_STATUS Status; STATIC BOOLEAN ConnectedToFileSystem = FALSE; + RETURN_STATUS PcdStatus; if (ConnectedToFileSystem) { return EFI_ALREADY_STARTED; @@ -1300,7 +1304,9 @@ VisitingFileSystemInstance ( NULL, &mEmuVariableEventReg ); - PcdSet64 (PcdEmuVariableEvent, (UINT64)(UINTN) mEmuVariableEvent); + PcdStatus = PcdSet64S (PcdEmuVariableEvent, + (UINT64)(UINTN) mEmuVariableEvent); + ASSERT_RETURN_ERROR (PcdStatus); return EFI_SUCCESS; }
These are deprecated / disabled under the DISABLE_NEW_DEPRECATED_INTERFACES feature test macro. Introduce a variable called PcdStatus, and use it to assert the success of these operations (there is no reason for them to fail here). Cc: Anthony PERARD <anthony.perard@citrix.com> Cc: Gary Lin <glin@suse.com> Cc: Jordan Justen <jordan.l.justen@intel.com> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=166 Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Laszlo Ersek <lersek@redhat.com> --- Notes: the emulated variable part of the patch is un-exercised on my setup, testing would be appreciated OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) -- 2.9.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel