| Message ID | 20161021212737.15974-5-lersek@redhat.com |
|---|---|
| State | Accepted |
| Commit | 6348eea63ea79935aeeb305d503e35716f1c1d24 |
| Headers | show |
On Fri, Oct 21, 2016 at 11:27:22PM +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: > not used in my setup, testing would be appreciated > > OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c | 12 +++++++++--- > 1 file changed, 9 insertions(+), 3 deletions(-) > > diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c > index 7a8beb3354b9..dec6d4af50df 100644 > --- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c > +++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c > @@ -803,6 +803,7 @@ FvbInitialize ( > BOOLEAN Initialize; > EFI_HANDLE Handle; > EFI_PHYSICAL_ADDRESS Address; > + RETURN_STATUS PcdStatus; > > DEBUG ((EFI_D_INFO, "EMU Variable FVB Started\n")); > > @@ -862,19 +863,24 @@ FvbInitialize ( > SetMem (Ptr, EMU_FVB_SIZE, ERASED_UINT8); > InitializeFvAndVariableStoreHeaders (Ptr); > } > - PcdSet64 (PcdFlashNvStorageVariableBase64, (UINT32)(UINTN) Ptr); > + PcdStatus = PcdSet64S (PcdFlashNvStorageVariableBase64, (UINT32)(UINTN) Ptr); > + ASSERT_RETURN_ERROR (PcdStatus); > > // > // Initialize the Fault Tolerant Write data area > // > SubPtr = (VOID*) ((UINT8*) Ptr + PcdGet32 (PcdVariableStoreSize)); > - PcdSet32 (PcdFlashNvStorageFtwWorkingBase, (UINT32)(UINTN) SubPtr); > + PcdStatus = PcdSet32S (PcdFlashNvStorageFtwWorkingBase, > + (UINT32)(UINTN) SubPtr); > + ASSERT_RETURN_ERROR (PcdStatus); > > // > // Initialize the Fault Tolerant Write spare block > // > SubPtr = (VOID*) ((UINT8*) Ptr + EMU_FVB_BLOCK_SIZE); > - PcdSet32 (PcdFlashNvStorageFtwSpareBase, (UINT32)(UINTN) SubPtr); > + PcdStatus = PcdSet32S (PcdFlashNvStorageFtwSpareBase, > + (UINT32)(UINTN) SubPtr); > + ASSERT_RETURN_ERROR (PcdStatus); > > // > // Setup FVB device path > -- > 2.9.2 > > > _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel
diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c index 7a8beb3354b9..dec6d4af50df 100644 --- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c +++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c @@ -803,6 +803,7 @@ FvbInitialize ( BOOLEAN Initialize; EFI_HANDLE Handle; EFI_PHYSICAL_ADDRESS Address; + RETURN_STATUS PcdStatus; DEBUG ((EFI_D_INFO, "EMU Variable FVB Started\n")); @@ -862,19 +863,24 @@ FvbInitialize ( SetMem (Ptr, EMU_FVB_SIZE, ERASED_UINT8); InitializeFvAndVariableStoreHeaders (Ptr); } - PcdSet64 (PcdFlashNvStorageVariableBase64, (UINT32)(UINTN) Ptr); + PcdStatus = PcdSet64S (PcdFlashNvStorageVariableBase64, (UINT32)(UINTN) Ptr); + ASSERT_RETURN_ERROR (PcdStatus); // // Initialize the Fault Tolerant Write data area // SubPtr = (VOID*) ((UINT8*) Ptr + PcdGet32 (PcdVariableStoreSize)); - PcdSet32 (PcdFlashNvStorageFtwWorkingBase, (UINT32)(UINTN) SubPtr); + PcdStatus = PcdSet32S (PcdFlashNvStorageFtwWorkingBase, + (UINT32)(UINTN) SubPtr); + ASSERT_RETURN_ERROR (PcdStatus); // // Initialize the Fault Tolerant Write spare block // SubPtr = (VOID*) ((UINT8*) Ptr + EMU_FVB_BLOCK_SIZE); - PcdSet32 (PcdFlashNvStorageFtwSpareBase, (UINT32)(UINTN) SubPtr); + PcdStatus = PcdSet32S (PcdFlashNvStorageFtwSpareBase, + (UINT32)(UINTN) SubPtr); + ASSERT_RETURN_ERROR (PcdStatus); // // Setup FVB device path
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: not used in my setup, testing would be appreciated OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) -- 2.9.2 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel