Re: [PATCH V3 03/17] MdeModulePkg Variable: Move "extern XXX" to Variable.h

["Wu, Hao A" <hao.a.wu@intel.com>]

Reviewed-by: Hao Wu <hao.a.wu@intel.com>

Best Regards,
Hao Wu


> -----Original Message-----
> From: Zeng, Star
> Sent: Tuesday, January 15, 2019 6:29 PM
> To: edk2-devel@lists.01.org
> Cc: Zeng, Star; Wang, Jian J; Wu, Hao A
> Subject: [PATCH V3 03/17] MdeModulePkg Variable: Move "extern XXX" to
> Variable.h
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1323
> Merge EmuVariable and Real variable driver.
> 
> Move "extern XXX" to Variable.h from VariableDxe.c/VariableSmm.c.
> 
> This patch prepares for adding emulated variable NV mode
> support in VariableRuntimeDxe.
> 
> Cc: Jian J Wang <jian.j.wang@intel.com>
> Cc: Hao Wu <hao.a.wu@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Star Zeng <star.zeng@intel.com>
> ---
>  MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h    | 11
> ++++++++---
>  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c |  4 ----
>  MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c |  3 ---
>  3 files changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
> b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
> index 938eb5de61fa..90507a8e64f6 100644
> --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
> +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/Variable.h
> @@ -792,9 +792,14 @@ InitializeVariableQuota (
>    VOID
>    );
> 
> -extern VARIABLE_MODULE_GLOBAL  *mVariableModuleGlobal;
> -
> -extern AUTH_VAR_LIB_CONTEXT_OUT mAuthContextOut;
> +extern VARIABLE_MODULE_GLOBAL       *mVariableModuleGlobal;
> +extern EFI_FIRMWARE_VOLUME_HEADER   *mNvFvHeaderCache;
> +extern VARIABLE_STORE_HEADER        *mNvVariableCache;
> +extern VARIABLE_INFO_ENTRY          *gVariableInfo;
> +extern BOOLEAN                      mEndOfDxe;
> +extern VAR_CHECK_REQUEST_SOURCE     mRequestSource;
> +
> +extern AUTH_VAR_LIB_CONTEXT_OUT     mAuthContextOut;
> 
>  /**
>    Finds variable in storage blocks of volatile and non-volatile storage areas.
> diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c
> b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c
> index f7185df3a7eb..f1304c9dbccc 100644
> --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c
> +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableDxe.c
> @@ -17,13 +17,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY
> KIND, EITHER EXPRESS OR IMPLIED.
> 
>  #include "Variable.h"
> 
> -extern VARIABLE_STORE_HEADER        *mNvVariableCache;
> -extern EFI_FIRMWARE_VOLUME_HEADER   *mNvFvHeaderCache;
> -extern VARIABLE_INFO_ENTRY          *gVariableInfo;
>  EFI_HANDLE                          mHandle                    = NULL;
>  EFI_EVENT                           mVirtualAddressChangeEvent = NULL;
>  EFI_EVENT                           mFtwRegistration           = NULL;
> -extern BOOLEAN                      mEndOfDxe;
>  VOID                                ***mVarCheckAddressPointer = NULL;
>  UINTN                               mVarCheckAddressPointerCount = 0;
>  EDKII_VARIABLE_LOCK_PROTOCOL        mVariableLock              =
> { VariableLockRequestToLock };
> diff --git a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
> b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
> index 8c53f84ff6e8..623badb0c755 100644
> --- a/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
> +++ b/MdeModulePkg/Universal/Variable/RuntimeDxe/VariableSmm.c
> @@ -37,14 +37,11 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF
> ANY KIND, EITHER EXPRESS OR IMPLIED.
>  #include <Guid/SmmVariableCommon.h>
>  #include "Variable.h"
> 
> -extern VARIABLE_INFO_ENTRY                           *gVariableInfo;
>  EFI_HANDLE                                           mSmmVariableHandle      = NULL;
>  EFI_HANDLE                                           mVariableHandle         = NULL;
>  BOOLEAN                                              mAtRuntime              = FALSE;
>  UINT8                                                *mVariableBufferPayload = NULL;
>  UINTN                                                mVariableBufferPayloadSize;
> -extern BOOLEAN                                       mEndOfDxe;
> -extern VAR_CHECK_REQUEST_SOURCE                      mRequestSource;
> 
>  /**
>    SecureBoot Hook for SetVariable.
> --
> 2.7.0.windows.1