OvmfPkg: Refactor MeaureFvImage

[mirror_edk2.git] / OvmfPkg / Library / PeilessStartupLib / PeilessStartup.c

diff --git a/OvmfPkg/Library/PeilessStartupLib/PeilessStartup.c b/OvmfPkg/Library/PeilessStartupLib/PeilessStartup.c
index 4efbc14d5921bb396f8ee0ea40df5326975e51de..79d3a178a65f2832256fa4f38fce6a8489ea629a 100644 (file)
--- a/OvmfPkg/Library/PeilessStartupLib/PeilessStartup.c
+++ b/OvmfPkg/Library/PeilessStartupLib/PeilessStartup.c
@@ -140,13 +140,11 @@ PeilessStartup (
   UINT32                      DxeCodeSize;\r
   TD_RETURN_DATA              TdReturnData;\r
   VOID                        *VmmHobList;\r
-  UINT8                       *CfvBase;\r
 \r
   Status      = EFI_SUCCESS;\r
   BootFv      = NULL;\r
   VmmHobList  = NULL;\r
   SecCoreData = (EFI_SEC_PEI_HAND_OFF *)Context;\r
-  CfvBase     = (UINT8 *)(UINTN)FixedPcdGet32 (PcdCfvBase);\r
 \r
   ZeroMem (&PlatformInfoHob, sizeof (PlatformInfoHob));\r
 \r
@@ -187,18 +185,18 @@ PeilessStartup (
     }\r
 \r
     //\r
-    // Build GuidHob for tdx measurement\r
+    // Measure Tdx CFV\r
     //\r
-    Status = TdxHelperBuildGuidHobForTdxMeasurement ();\r
+    Status = TdxHelperMeasureCfvImage ();\r
     if (EFI_ERROR (Status)) {\r
       ASSERT (FALSE);\r
       CpuDeadLoop ();\r
     }\r
 \r
     //\r
-    // Measure Tdx CFV\r
+    // Build GuidHob for tdx measurement\r
     //\r
-    Status = MeasureFvImage ((EFI_PHYSICAL_ADDRESS)(UINTN)CfvBase, FixedPcdGet32 (PcdCfvRawDataSize), 1);\r
+    Status = TdxHelperBuildGuidHobForTdxMeasurement ();\r
     if (EFI_ERROR (Status)) {\r
       ASSERT (FALSE);\r
       CpuDeadLoop ();\r