When updating console page, the "ConsoleCheck" in BmmFakeNvData may maintain the old uncommitted data, we should not copy it to BmmOldFakeNVData. And in BootMaintRouteConfig function, when save data successfully, it will copy the BmmFakeNvData to the BmmOldFakeNVData. So we can delete the logic here.
Cc: Laszlo Ersek <ler...@redhat.com> Cc: Liming Gao <liming....@intel.com> Cc: Eric Dong <eric.d...@intel.com> Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Dandan Bi <dandan...@intel.com> --- .../Library/BootMaintenanceManagerUiLib/UpdatePage.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c index ee8ff5d..960d0b0 100644 --- a/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c +++ b/MdeModulePkg/Library/BootMaintenanceManagerUiLib/UpdatePage.c @@ -457,46 +457,36 @@ UpdateConsolePage ( BM_TERMINAL_CONTEXT *NewTerminalContext; UINT16 Index; UINT16 Index2; UINT8 CheckFlags; UINT8 *ConsoleCheck; - UINT8 *OldConsoleCheck; - UINTN ConsoleCheckSize; EFI_QUESTION_ID QuestionIdBase; UINT16 VariableOffsetBase; CallbackData->BmmAskSaveOrNot = TRUE; UpdatePageStart (CallbackData); ConsoleCheck = NULL; - OldConsoleCheck = NULL; QuestionIdBase = 0; VariableOffsetBase = 0; - ConsoleCheckSize = 0; switch (UpdatePageId) { case FORM_CON_IN_ID: ConsoleCheck = &CallbackData->BmmFakeNvData.ConsoleInCheck[0]; - OldConsoleCheck = &CallbackData->BmmOldFakeNVData.ConsoleInCheck[0]; - ConsoleCheckSize = sizeof (CallbackData->BmmFakeNvData.ConsoleInCheck); QuestionIdBase = CON_IN_DEVICE_QUESTION_ID; VariableOffsetBase = CON_IN_DEVICE_VAR_OFFSET; break; case FORM_CON_OUT_ID: ConsoleCheck = &CallbackData->BmmFakeNvData.ConsoleOutCheck[0]; - OldConsoleCheck = &CallbackData->BmmOldFakeNVData.ConsoleOutCheck[0]; - ConsoleCheckSize = sizeof (CallbackData->BmmFakeNvData.ConsoleOutCheck); QuestionIdBase = CON_OUT_DEVICE_QUESTION_ID; VariableOffsetBase = CON_OUT_DEVICE_VAR_OFFSET; break; case FORM_CON_ERR_ID: ConsoleCheck = &CallbackData->BmmFakeNvData.ConsoleErrCheck[0]; - OldConsoleCheck = &CallbackData->BmmOldFakeNVData.ConsoleErrCheck[0]; - ConsoleCheckSize = sizeof (CallbackData->BmmFakeNvData.ConsoleErrCheck); QuestionIdBase = CON_ERR_DEVICE_QUESTION_ID; VariableOffsetBase = CON_ERR_DEVICE_VAR_OFFSET; break; } ASSERT (ConsoleCheck != NULL); @@ -554,12 +544,10 @@ UpdateConsolePage ( ); Index++; } - CopyMem (OldConsoleCheck, ConsoleCheck, ConsoleCheckSize); - UpdatePageEnd (CallbackData); } /** Update the page's NV Map if user has changed the order -- 1.9.5.msysgit.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel