From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mx.groups.io with SMTP id smtpd.web08.4405.1634786385336983392 for ; Wed, 20 Oct 2021 20:19:45 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.onmicrosoft.com header.s=selector2-intel-onmicrosoft-com header.b=r0vhkLDD; spf=pass (domain: intel.com, ip: 192.55.52.115, mailfrom: wei6.xu@intel.com) X-IronPort-AV: E=McAfee;i="6200,9189,10143"; a="229204307" X-IronPort-AV: E=Sophos;i="5.87,168,1631602800"; d="scan'208";a="229204307" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Oct 2021 20:19:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,168,1631602800"; d="scan'208";a="721082560" Received: from fmsmsx601.amr.corp.intel.com ([10.18.126.81]) by fmsmga005.fm.intel.com with ESMTP; 20 Oct 2021 20:19:43 -0700 Received: from fmsmsx610.amr.corp.intel.com (10.18.126.90) by fmsmsx601.amr.corp.intel.com (10.18.126.81) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Wed, 20 Oct 2021 20:19:43 -0700 Received: from fmsmsx604.amr.corp.intel.com (10.18.126.84) by fmsmsx610.amr.corp.intel.com (10.18.126.90) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Wed, 20 Oct 2021 20:19:42 -0700 Received: from FMSEDG603.ED.cps.intel.com (10.1.192.133) by fmsmsx604.amr.corp.intel.com (10.18.126.84) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Wed, 20 Oct 2021 20:19:42 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.177) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Wed, 20 Oct 2021 20:19:41 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LngzwFjU8dPjIObNbD0zKpl2Q9xvXs1Il604SqzXmipvIwaGijBQibkBBwXRvfwCMoWrR8voiY9AhEm6zmuCrLtLZgCQNlTvxHUZ9Rvf2w3rHPK/5UVrhnCVkotGY9P4vLy1Y4r11Mnwu+e/3O8S86HKbLUOdD3QQdFrb4LxS2FhEJlRf+oc22y0maZ/LEoDTsDD4dTyR7u16pEvZBUBTch4p6gZVw9pLWCECl/vdMWYeeQea69pwhnL5iIo6hvQEEGE4XGt7ewcHcLzx3vZpxh4w5XYTSPMBoXL9w/ulA5A8TPZh+2leStxmtmcnJJcF9yoaiv/C/gmwx6X5OWYCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Q9i0kqdqIsBr24j3xYLaH7Wdn3H3cmyTizBaFMShRHI=; b=muOlp4e3Zyzc7ZInnz436+5x94ZQheFan+uXyVOqcSphAIKVlCCgPqc1jzB56FEPbUJ9dHHxgdoCcJXnAGoJ3f6ZXp4qoIKrYi0bN96vSRlZ9YXAvYmfRo79Gm45mTZlrTS7LLzpS6zlik04sKoNzNEAxJEr5jsqnLDzRQ3Wf7spQAFxnMGU/jQyD5wHltDWLYP8BnBH4hSUc0iQJbL0lWU/x70jniFwJq+ZgQbvsaqFwmYDVbRIaTMhFhMSyOjFLkT6cdAzbP3YlWpIFfLHFKppcyn9iwZ8tLwSLA23DYORH78ubrk2hb15ciASmCv7w9VcrPwtC+VDnsFCGiVlMA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Q9i0kqdqIsBr24j3xYLaH7Wdn3H3cmyTizBaFMShRHI=; b=r0vhkLDDnoQgtKmitYdRj0eCSc6kDhbrMGYNomkMxFdffcSiv8Y4tVBjci9i0bHRAOr10jKTapQWpDJCjzTAD0FNmVo316I9b3I8fqE1iHiEGo8KD7Kckx7AKMxFGFPUqKEljDYw8NS4DjFiH9wSLr6y++1vZM6UV5B5vqUC7JU= Received: from BN7PR11MB2770.namprd11.prod.outlook.com (2603:10b6:406:b4::20) by BN6PR1101MB2161.namprd11.prod.outlook.com (2603:10b6:405:52::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17; Thu, 21 Oct 2021 03:19:34 +0000 Received: from BN7PR11MB2770.namprd11.prod.outlook.com ([fe80::d888:11c5:17a5:e417]) by BN7PR11MB2770.namprd11.prod.outlook.com ([fe80::d888:11c5:17a5:e417%7]) with mapi id 15.20.4608.018; Thu, 21 Oct 2021 03:19:33 +0000 From: "Xu, Wei6" To: "Yang, Jie" , "devel@edk2.groups.io" CC: "gaoliming@byosoft.com.cn" , "Kinney, Michael D" , "Jiang, Guomin" Subject: Re: [edk2-devel][PATCH v2] FmpDevicePkg/FmpDxe: Use new Variable Lock interface Thread-Topic: [edk2-devel][PATCH v2] FmpDevicePkg/FmpDxe: Use new Variable Lock interface Thread-Index: AQHXxJcNf6KjpuXzrUG0PrmF1l4j2qvcy4Cw Date: Thu, 21 Oct 2021 03:19:33 +0000 Message-ID: References: <20211019031104.3110-1-jie.yang@intel.com> In-Reply-To: <20211019031104.3110-1-jie.yang@intel.com> Accept-Language: en-GB, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 24d5f9f7-0783-4627-384f-08d994419aad x-ms-traffictypediagnostic: BN6PR1101MB2161: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:499; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: SaKTa5HRjRgJFLWkzz1fnU4hh5zS+G2fBXHj/WiUM1ID74Bn+QtadeU9kI6Bk4MwGyEukbD8ut28+yfUPA/bSVTnPldFE/4n2rBLruce9NY9ZNh+TuDfgEvD04YiWXcJEYuFBuwehNXm5Bs3sDOw5ElfivCI7wKOQ5tbvbjbNCfoGJDLA73ajZayoVYOg8rnMv1Y4h68eJHB9Zl4dq+ALnK0REBck9t9dr5umV8idYGdPUcpSvioTgaQAEqRzwIh37RXeKQi++ExJAVwvjhYjxOeldZxcStV11yhkDPOg7gK0k9MCMOIjG7mFtvT/623qzcFh+OeWNI3Nj3Uuj81e/st4TiZaP3zYMMIdE7NWLREwbO1tA8phQlWfsZXYkLOPElptz4Bam8ePoUEiusCnNhK3H/4oLy67rO6cSlCJ5CgtpIuZAU1KnuvVvdhJWbT6CqY7Ypdly9321RwUcvrEaVdtWn9Y+CK3dWXTgWGisiEb837YIpZgsns+6s+8pJOx+pmFlxZEA5B2smtXumyMofqZGYY0k/Kif8/8NM9IiNgGvmQT9OOcFGdBMHS+/VMnN+aNmixArF+ISxCj9cUtMC05ON+nLTUYiqfy0g6ZXtehoA1c1cjtxi9gTTD88kFaQcp6xVqSMNaQ3Bz7CBK/qEr02Tvfp5jAIkpzNfISkt7eEhFbtvFWgbFtq3QFdj8LAbd2olREuWieJwkJQC+xrSeh6kDqSqQqkW19CtVRNG8LsWMGPyG+kdoY92gRPXNY5kAGMPNV71usfjKf8RJ4Fz+aTko1V1pu1juNppXmBUcRNZgCKGqpPVj3M7M2Y9C x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BN7PR11MB2770.namprd11.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(38070700005)(508600001)(186003)(82960400001)(6506007)(71200400001)(122000001)(4326008)(8936002)(66446008)(76116006)(38100700002)(33656002)(64756008)(66556008)(86362001)(66476007)(2906002)(9686003)(107886003)(110136005)(54906003)(52536014)(55016002)(966005)(316002)(5660300002)(8676002)(66946007)(83380400001)(7696005)(26005)(45080400002)(53546011)(44824005);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?1WxhduiQYwdUESDtQihTbJclOYeH4BhK9HMDw8lN4IY+37HgtqD+JQl/RXD2?= =?us-ascii?Q?mbH039aFQ/clQi4svJYoUoWpysYnx4Y8pTpXbXVPzZAf/ZxgZ6shtWl2dqVP?= =?us-ascii?Q?sEusL8/rQldSZXI3GQ6dtBzojT+PSNigHOCnD8pMddT/S8yATwaXOm6Gfmgt?= =?us-ascii?Q?otIteTtgCDv6lzyZnBuSuODuDZCpAZKGIxjIHgoWsCK+lIeLoo68yVA/dNIg?= =?us-ascii?Q?NQiciWG1RlUcLAOT4V9+PMgkFuZoxaBIWg6pOIMUg9ao5r7SGB3h2FSBEakZ?= =?us-ascii?Q?sgIV2V7xrlHxMaKXnDrVK154wNs/qtAisb7a1SQCoPdNG83DvO4AoU1LxQpP?= =?us-ascii?Q?lDMbvC/GYYn8jCy9zk3ZfNKLgvxKQA+8O13HmwRcxKvihqcAQsEZIB18Tge1?= =?us-ascii?Q?HuHWyduaXJ85Iri7WXNWf+AA8BUMRBEJh6fb7rBeNLgcZ2WQnTmwsmNxddbw?= =?us-ascii?Q?GhV6AIyT2Rbz1AibDC/R9erhGXqH02E8j00yfuWnhQmjSSWoIO914J6pksAb?= =?us-ascii?Q?vAIX5tG7azRSOpsdvlU7Us1EAEK25EkfUanoxjbc8ypSHYZcWZ8Gz1gE5ODn?= =?us-ascii?Q?FUhZYP7FJLu4rEFttcF1nCXWEVI5wAKFUn7yaXxePK65edEgW/wYfKpqWHtb?= =?us-ascii?Q?o/SZP0iqOruVhVb+1THRNW/wn0FhlbRs4syRo1+oSVgxLDjNZ2cnudIfHhyj?= =?us-ascii?Q?LbnGtVyCzX5vOOHUVyTy+TjMcPaybuf42GLgSrkbRszHIDYCA9MRCw9k0cWJ?= =?us-ascii?Q?PsMaQkt6xlwyVDYdS0pI+1QLdXZw5HH17aEHpyZlaAKqZ97PO69THHZRpHaR?= =?us-ascii?Q?up60jLite2sTVWIKddh8s2cmUfdF7J24+SRRwQYS87r7Me5rxwyA7jbPdbJF?= =?us-ascii?Q?tfM8mXQNe/iMttD48Xic8Pq6HnA4LOTuyOtYQ5CPEzW4ECHoH+fR8adykYQo?= =?us-ascii?Q?HwFwEbJSyYw3E8rOqEceNSH+p+Wu9dOBx8UmpZY51RbycZvJhLB+P0th3UcY?= =?us-ascii?Q?wCIxgScvidPSsFzCz4OB8u9jRGABeBXqwDsM1PFJMK/gIeEQ+MaElucD40lp?= =?us-ascii?Q?b2u0K/NxhUNXna4HReaOVwL2qo/5XFUMncWYJwL5+bktHqTP97DVHmmg23Di?= =?us-ascii?Q?/9gFsvyRTX58GEIKpKAJWsWuR7cqX5HVrQN5jI9vItuhsjlUR/yBu2Qc0YYQ?= =?us-ascii?Q?KAGf3w0ucBYHtzqXhAYvYkYKGcM4ll4ilnSWeUX0pxiHcZjpO8xaBDqKHPo6?= =?us-ascii?Q?ftI+Sj1i9x5n1HXLxyG9c68LaGXO88/xkJXSuatJmsWZc4oltl7wXmnV3gG6?= =?us-ascii?Q?b8A=3D?= MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BN7PR11MB2770.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 24d5f9f7-0783-4627-384f-08d994419aad X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Oct 2021 03:19:33.7125 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: kA5KYqxaQfCq2IXSOkt6g8pVzh+eywvvJkVksEfwpYkxUBamB3VI/hTWvLiFHtVd6XL3QNHXGS5XR28dr4W9PQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR1101MB2161 Return-Path: wei6.xu@intel.com X-OriginatorOrg: intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Jie: Thanks for the update. Reviewed-by: Wei6 Xu BR, Wei -----Original Message----- From: Yang, Jie =20 Sent: Tuesday, October 19, 2021 11:11 AM To: devel@edk2.groups.io Cc: gaoliming@byosoft.com.cn; Kinney, Michael D ; Jiang, Guomin ; Xu, Wei6 ; Ya= ng, Jie Subject: [edk2-devel][PATCH v2] FmpDevicePkg/FmpDxe: Use new Variable Lock = interface REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3655 The code in FmpDevicePkg call the deprecated interface VariableLockRequestT= oLockc. So I changed the code in FmpDevicePkg using RegisterBasicVariablePo= licy, instead of the deprecated interface. Signed-off-by: Yang Jie Cc: Liming Gao Cc: Michael D Kinney Cc: Guomin Jiang Cc: Wei6 Xu --- FmpDevicePkg/FmpDevicePkg.dsc | 1 + FmpDevicePkg/FmpDxe/FmpDxe.h | 4 +- FmpDevicePkg/FmpDxe/FmpDxe.inf | 5 +- FmpDevicePkg/FmpDxe/VariableSupport.c | 69 +++++++++++++-------------- 4 files changed, 39 insertions(+), 40 deletions(-) diff --git a/FmpDevicePkg/FmpDevicePkg.dsc b/FmpDevicePkg/FmpDevicePkg.dsc = index b420f52a08..7b1af285dd 100644 --- a/FmpDevicePkg/FmpDevicePkg.dsc +++ b/FmpDevicePkg/FmpDevicePkg.dsc @@ -53,6 +53,7 @@ DebugLib|MdePkg/Library/UefiDebugLibStdErr/UefiDebugLibStdErr.inf Debu= gPrintErrorLevelLib|MdePkg/Library/BaseDebugPrintErrorLevelLib/BaseDebugPri= ntErrorLevelLib.inf PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.i= nf+ VariablePolicyHelperLib|MdeModulePkg/Library/VariablePolicyHelperLib/V= ariablePolicyHelperLib.inf !ifdef CONTINUOUS_INTEGRATION BaseCryptLib|Cry= ptoPkg/Library/BaseCryptLibNull/BaseCryptLibNull.inf !elsediff --git a/FmpD= evicePkg/FmpDxe/FmpDxe.h b/FmpDevicePkg/FmpDxe/FmpDxe.h index 1177b1828e..4d94a925b6 100644 --- a/FmpDevicePkg/FmpDxe/FmpDxe.h +++ b/FmpDevicePkg/FmpDxe/FmpDxe.h @@ -4,7 +4,7 @@ information provided through PCDs and libraries. Copyright (c) Micros= oft Corporation.
- Copyright (c) 2018 - 2019, Intel Corporation. All ri= ghts reserved.
+ Copyright (c) 2018 - 2021, Intel Corporation. All righ= ts reserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -33,11 = +33,11 @@ #include #include #include -#include #include #include #include #include +#include #define VERSION_STRING_NOT_= SUPPORTED L"VERSION STRING NOT SUPPORTED" #define VERSION_STRING_NOT_AVAIL= ABLE L"VERSION STRING NOT AVAILABLE"diff --git a/FmpDevicePkg/FmpDxe/FmpDx= e.inf b/FmpDevicePkg/FmpDxe/FmpDxe.inf index eeb904a091..1c296388b0 100644 --- a/FmpDevicePkg/FmpDxe/FmpDxe.inf +++ b/FmpDevicePkg/FmpDxe/FmpDxe.inf @@ -4,7 +4,7 @@ # information provided through PCDs and libraries. # # Copyright (c) 201= 6, Microsoft Corporation. All rights reserved.
-# Copyright (c) 2018 - = 2020, Intel Corporation. All rights reserved.
+# Copyright (c) 2018 - 2= 021, Intel Corporation. All rights reserved.
# # SPDX-License-Identifi= er: BSD-2-Clause-Patent ##@@ -55,14 +55,15 @@ FmpDependencyLib FmpDependencyCheckLib FmpDependencyDeviceLib+ Vari= ablePolicyHelperLib [Guids] gEfiEndOfDxeEventGroupGuid [Protocols]- gE= dkiiVariableLockProtocolGuid ## CONSUMES gEfiFirmwareManag= ementProtocolGuid ## PRODUCES gEdkiiFirmwareManagementProgress= ProtocolGuid ## PRODUCES+ gEdkiiVariablePolicyProtocolGuid #= # CONSUMES [Pcd] gFmpDevicePkgTokenSpaceGuid.PcdFmpDeviceStorageAccessEn= able ## CONSUMESdiff --git a/FmpDevicePkg/FmpDxe/VariableSuppo= rt.c b/FmpDevicePkg/FmpDxe/VariableSupport.c index 86dd5b203b..c4b72a2ff9 100644 --- a/FmpDevicePkg/FmpDxe/VariableSupport.c +++ b/FmpDevicePkg/FmpDxe/VariableSupport.c @@ -3,7 +3,7 @@ firmware updates. Copyright (c) 2016, Microsoft Corporation. All righ= ts reserved.
- Copyright (c) 2018 - 2019, Intel Corporation. All rights= reserved.
+ Copyright (c) 2018 - 2021, Intel Corporation. All rights r= eserved.
SPDX-License-Identifier: BSD-2-Clause-Patent @@ -729,29 +72= 9,30 @@ SetLastAttemptVersionInVariable ( static EFI_STATUS LockFmpVariable (- IN EFI_STATUS Pre= viousStatus,- IN EDKII_VARIABLE_LOCK_PROTOCOL *VariableLock,- IN CHAR16 = *VariableName+ IN EFI_STATUS P= reviousStatus,+ IN EDKII_VARIABLE_POLICY_PROTOCOL *VariablePolicy,+ IN C= HAR16 *VariableName ) { EFI_STATUS Status; - = Status =3D VariableLock->RequestToLock (- Variab= leLock,- VariableName,- = &gEfiCallerIdGuid- );- if (!EFI_ERROR (Status))= {- return PreviousStatus;+ // If success, go ahead and set the policie= s to protect the target variables.+ Status =3D RegisterBasicVariablePolicy= (VariablePolicy,+ &gEfiCallerIdGuid= ,+ VariableName,+ = VARIABLE_POLICY_NO_MIN_SIZE,+ = VARIABLE_POLICY_NO_MAX_SIZE,+ = VARIABLE_POLICY_NO_MUST_ATTR,+ = VARIABLE_POLICY_NO_CANT_ATTR,+ V= ARIABLE_POLICY_TYPE_LOCK_NOW);+ if (EFI_ERROR (Status)) {+ DEBUG ((DEBU= G_ERROR, "FmpDxe(%s): Failed to lock variable %g %s. Status =3D %r\n",+ = mImageIdName,+ &gEfiCallerIdGuid,+ VariableNa= me,+ Status+ )); }-- DEBUG ((DEBUG_ERROR, "FmpDxe(%= s): Failed to lock variable %g %s. Status =3D %r\n",- mImageIdName,- = &gEfiCallerIdGuid,- VariableName,- Status- ));- if (EFI_ERROR (= PreviousStatus)) { return PreviousStatus; }@@ -773,26 +774,22 @@ Lock= AllFmpVariables ( FIRMWARE_MANAGEMENT_PRIVATE_DATA *Private ) {- EFI_STATUS = Status;- EDKII_VARIABLE_LOCK_PROTOCOL *VariableLock;-- Variable= Lock =3D NULL;- Status =3D gBS->LocateProtocol (- &gEdkii= VariableLockProtocolGuid,- NULL,- (VOID *= *)&VariableLock- );- if (EFI_ERROR (Status) || VariableLo= ck =3D=3D NULL) {- DEBUG ((DEBUG_ERROR, "FmpDxe(%s): Failed to locate Va= riable Lock Protocol (%r).\n", mImageIdName, Status));- return EFI_UNSUP= PORTED;+ EFI_STATUS Status;+ EDKII_VARIABLE_POLICY= _PROTOCOL *VariablePolicy;++ // Locate the VariablePolicy protocol.+ S= tatus =3D gBS->LocateProtocol (&gEdkiiVariablePolicyProtocolGuid, NULL, (VO= ID**)&VariablePolicy );+ if (EFI_ERROR (Status)) {+ DEBUG ((DEBUG_ERROR= , "FmpDxe %a - Could not locate VariablePolicy protocol! %r\n", __FUNCTION_= _, Status));+ return Status; } Status =3D EFI_SUCCESS;- Status =3D= LockFmpVariable (Status, VariableLock, Private->VersionVariableName);- St= atus =3D LockFmpVariable (Status, VariableLock, Private->LsvVariableName);-= Status =3D LockFmpVariable (Status, VariableLock, Private->LastAttemptSta= tusVariableName);- Status =3D LockFmpVariable (Status, VariableLock, Priva= te->LastAttemptVersionVariableName);- Status =3D LockFmpVariable (Status, = VariableLock, Private->FmpStateVariableName);+ Status =3D LockFmpVariable = (Status, VariablePolicy, Private->VersionVariableName);+ Status =3D LockFm= pVariable (Status, VariablePolicy, Private->LsvVariableName);+ Status =3D = LockFmpVariable (Status, VariablePolicy, Private->LastAttemptStatusVariable= Name);+ Status =3D LockFmpVariable (Status, VariablePolicy, Private->LastA= ttemptVersionVariableName);+ Status =3D LockFmpVariable (Status, VariableP= olicy, Private->FmpStateVariableName); return Status; }--=20 2.26.2.windows.1