Report the setting variable failure to platform through the status code when core cannot handle the error.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com> Reviewed-by: Elvin Li <elvin.li@intel.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15386 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
@@ -1422,11 +1422,13 @@ TerminalUpdateConsoleDevVariable (
|
||||
)
|
||||
{
|
||||
EFI_STATUS Status;
|
||||
UINTN NameSize;
|
||||
UINTN VariableSize;
|
||||
UINT8 TerminalType;
|
||||
EFI_DEVICE_PATH_PROTOCOL *Variable;
|
||||
EFI_DEVICE_PATH_PROTOCOL *NewVariable;
|
||||
EFI_DEVICE_PATH_PROTOCOL *TempDevicePath;
|
||||
EDKII_SET_VARIABLE_STATUS *SetVariableStatus;
|
||||
|
||||
//
|
||||
// Get global variable and its size according to the name given.
|
||||
@@ -1462,6 +1464,33 @@ TerminalUpdateConsoleDevVariable (
|
||||
VariableSize,
|
||||
Variable
|
||||
);
|
||||
|
||||
if (EFI_ERROR (Status)) {
|
||||
NameSize = StrSize (VariableName);
|
||||
SetVariableStatus = AllocatePool (sizeof (EDKII_SET_VARIABLE_STATUS) + NameSize + VariableSize);
|
||||
if (SetVariableStatus != NULL) {
|
||||
CopyGuid (&SetVariableStatus->Guid, &gEfiGlobalVariableGuid);
|
||||
SetVariableStatus->NameSize = NameSize;
|
||||
SetVariableStatus->DataSize = VariableSize;
|
||||
SetVariableStatus->SetStatus = Status;
|
||||
SetVariableStatus->Attributes = EFI_VARIABLE_BOOTSERVICE_ACCESS | EFI_VARIABLE_RUNTIME_ACCESS;
|
||||
CopyMem (SetVariableStatus + 1, VariableName, NameSize);
|
||||
CopyMem (((UINT8 *) (SetVariableStatus + 1)) + NameSize, Variable, VariableSize);
|
||||
|
||||
REPORT_STATUS_CODE_EX (
|
||||
EFI_ERROR_CODE,
|
||||
PcdGet32 (PcdErrorCodeSetVariable),
|
||||
0,
|
||||
NULL,
|
||||
&gEdkiiStatusCodeDataTypeVariableGuid,
|
||||
SetVariableStatus,
|
||||
sizeof (EDKII_SET_VARIABLE_STATUS) + NameSize + VariableSize
|
||||
);
|
||||
|
||||
FreePool (SetVariableStatus);
|
||||
}
|
||||
}
|
||||
|
||||
FreePool (Variable);
|
||||
|
||||
return ;
|
||||
@@ -1569,6 +1598,10 @@ TerminalRemoveConsoleDevVariable (
|
||||
VariableSize,
|
||||
NewVariable
|
||||
);
|
||||
//
|
||||
// Shrinking variable with existing variable driver implementation shouldn't fail.
|
||||
//
|
||||
ASSERT_EFI_ERROR (Status);
|
||||
}
|
||||
|
||||
if (NewVariable != NULL) {
|
||||
|
Reference in New Issue
Block a user