From c64816c652a07f8cd78a35dc1941f43152d1784a Mon Sep 17 00:00:00 2001 From: Hao Wu Date: Tue, 7 Jul 2015 02:56:01 +0000 Subject: [PATCH] MdeModulePkg: Remove mZeroGuid definition in Universal/Variable/RuntimeDxe MdeModulePkg has defined gZeroGuid in 'Guid/ZeroGuid.h', therefore, the mZeroGuid defined in Universal/Variable/RuntimeDxe is redundant. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Liming Gao Reviewed-by: Jaben Carsey git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@17840 6f19259b-4bc3-4df7-8a09-765794883524 --- MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c | 4 ++-- MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c index 1cf288cb98..95b532b1fb 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c @@ -35,13 +35,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. #include #include +#include #include "Variable.h" extern VARIABLE_INFO_ENTRY *gVariableInfo; EFI_HANDLE mSmmVariableHandle = NULL; EFI_HANDLE mVariableHandle = NULL; BOOLEAN mAtRuntime = FALSE; -EFI_GUID mZeroGuid = {0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}}; UINT8 *mVariableBufferPayload = NULL; UINTN mVariableBufferPayloadSize; extern BOOLEAN mEndOfDxe; @@ -373,7 +373,7 @@ SmmVariableGetStatistics ( CopyGuid (&VendorGuid, &InfoEntry->VendorGuid); - if (CompareGuid (&VendorGuid, &mZeroGuid)) { + if (CompareGuid (&VendorGuid, &gZeroGuid)) { // // Return the first variable info // diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf index 47b7f3a2c2..861d7474f6 100644 --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.inf @@ -120,6 +120,7 @@ gEfiHardwareErrorVariableGuid ## SOMETIMES_CONSUMES ## Variable:L"HwErrRec####" gEdkiiFaultTolerantWriteGuid ## SOMETIMES_CONSUMES ## HOB gEdkiiVarErrorFlagGuid ## CONSUMES ## GUID + gZeroGuid ## SOMETIMES_CONSUMES ## GUID [Pcd] gEfiMdeModulePkgTokenSpaceGuid.PcdFlashNvStorageVariableSize ## CONSUMES -- 2.39.2