From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=hao.a.wu@intel.com; receiver=edk2-devel@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id E1A28211B5A25 for ; Tue, 15 Jan 2019 23:28:43 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Jan 2019 23:28:42 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,485,1539673200"; d="scan'208";a="291924466" Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205]) by orsmga005.jf.intel.com with ESMTP; 15 Jan 2019 23:28:42 -0800 Received: from fmsmsx112.amr.corp.intel.com (10.18.116.6) by fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 15 Jan 2019 23:28:42 -0800 Received: from shsmsx108.ccr.corp.intel.com (10.239.4.97) by FMSMSX112.amr.corp.intel.com (10.18.116.6) with Microsoft SMTP Server (TLS) id 14.3.408.0; Tue, 15 Jan 2019 23:28:41 -0800 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.196]) by SHSMSX108.ccr.corp.intel.com ([169.254.8.85]) with mapi id 14.03.0415.000; Wed, 16 Jan 2019 15:28:39 +0800 From: "Wu, Hao A" To: "Zeng, Star" , "edk2-devel@lists.01.org" Thread-Topic: [PATCH V3 03/17] MdeModulePkg Variable: Move "extern XXX" to Variable.h Thread-Index: AQHUrL1BzXvNmo5db0ux63SBv3IP1aWxCSqQ Date: Wed, 16 Jan 2019 07:28:38 +0000 Message-ID: References: <1547548179-42552-1-git-send-email-star.zeng@intel.com> <1547548179-42552-4-git-send-email-star.zeng@intel.com> In-Reply-To: <1547548179-42552-4-git-send-email-star.zeng@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH V3 03/17] MdeModulePkg Variable: Move "extern XXX" to Variable.h X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Jan 2019 07:28:44 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Hao Wu 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 >=20 > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1323 > Merge EmuVariable and Real variable driver. >=20 > Move "extern XXX" to Variable.h from VariableDxe.c/VariableSmm.c. >=20 > This patch prepares for adding emulated variable NV mode > support in VariableRuntimeDxe. >=20 > Cc: Jian J Wang > Cc: Hao Wu > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Star Zeng > --- > 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(-) >=20 > 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 > ); >=20 > -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; >=20 > /** > 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. >=20 > #include "Variable.h" >=20 > -extern VARIABLE_STORE_HEADER *mNvVariableCache; > -extern EFI_FIRMWARE_VOLUME_HEADER *mNvFvHeaderCache; > -extern VARIABLE_INFO_ENTRY *gVariableInfo; > EFI_HANDLE mHandle =3D NULL; > EFI_EVENT mVirtualAddressChangeEvent =3D NULL; > EFI_EVENT mFtwRegistration =3D NULL; > -extern BOOLEAN mEndOfDxe; > VOID ***mVarCheckAddressPointer =3D NULL; > UINTN mVarCheckAddressPointerCount =3D 0; > EDKII_VARIABLE_LOCK_PROTOCOL mVariableLock =3D > { 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 > #include "Variable.h" >=20 > -extern VARIABLE_INFO_ENTRY *gVariableInfo; > EFI_HANDLE mSmmVariableHandle = =3D NULL; > EFI_HANDLE mVariableHandle = =3D NULL; > BOOLEAN mAtRuntime = =3D FALSE; > UINT8 *mVariableBufferPay= load =3D NULL; > UINTN mVariableBufferPayl= oadSize; > -extern BOOLEAN mEndOfDxe; > -extern VAR_CHECK_REQUEST_SOURCE mRequestSource; >=20 > /** > SecureBoot Hook for SetVariable. > -- > 2.7.0.windows.1