OvmfPkg/PeilessStartupLib: Update the define of FV_HANDOFF_TABLE_POINTERS2

BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=4243

FV_HANDOFF_TABLE_POINTERS2 once was defined in IntelTdx.c. Its structure
is same as PLATFORM_FIRMWARE_BLOB2_STRUCT which is defined in
Library/TcgEventLogRecordLib.h. So this patch reuse the define of
PLATFORM_FIRMWARE_BLOB2_STRUCT as FV_HANDOFF_TABLE_POINTERS2. Furthermore
FV_HANDOFF_TABLE_POINTERS2 is renamed as CFV_HANDOFF_TABLE_POINTERS2
so that the name is more meaningful.

Cc: Erdem Aktas <erdemaktas@google.com>
Cc: James Bottomley <jejb@linux.ibm.com>
Cc: Jiewen Yao <jiewen.yao@intel.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Tom Lendacky <thomas.lendacky@amd.com>
Cc: Michael Roth <michael.roth@amd.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Jiewen Yao <jiewen.yao@intel.com>
Signed-off-by: Min Xu <min.m.xu@intel.com>

diff --git a/OvmfPkg/Library/PeilessStartupLib/IntelTdx.c b/OvmfPkg/Library/PeilessStartupLib/IntelTdx.c
index 216c413caad5382fcd66423c1e4a4e6d36828547..4e8dca3d77125cdae64e95399818c51cf8918d45 100644 (file)
--- a/OvmfPkg/Library/PeilessStartupLib/IntelTdx.c
+++ b/OvmfPkg/Library/PeilessStartupLib/IntelTdx.c
@@ -11,6 +11,7 @@
 #include <IndustryStandard/UefiTcgPlatform.h>\r
 #include <Library/HobLib.h>\r
 #include <Library/PrintLib.h>\r
+#include <Library/TcgEventLogRecordLib.h>\r
 #include <Library/TpmMeasurementLib.h>\r
 \r
 #include "PeilessStartupInternal.h"\r
@@ -25,16 +26,11 @@ typedef struct {
   EFI_CONFIGURATION_TABLE    TableEntry[1];\r
 } TDX_HANDOFF_TABLE_POINTERS2;\r
 \r
-#define FV_HANDOFF_TABLE_DESC  "Fv(XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX)"\r
-typedef struct {\r
-  UINT8                   BlobDescriptionSize;\r
-  UINT8                   BlobDescription[sizeof (FV_HANDOFF_TABLE_DESC)];\r
-  EFI_PHYSICAL_ADDRESS    BlobBase;\r
-  UINT64                  BlobLength;\r
-} FV_HANDOFF_TABLE_POINTERS2;\r
-\r
 #pragma pack()\r
 \r
+#define FV_HANDOFF_TABLE_DESC  "Fv(XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX)"\r
+typedef PLATFORM_FIRMWARE_BLOB2_STRUCT CFV_HANDOFF_TABLE_POINTERS2;\r
+\r
 /**\r
   Measure the Hoblist passed from the VMM.\r
 \r
@@ -161,9 +157,9 @@ MeasureFvImage (
   IN UINT8                 PcrIndex\r
   )\r
 {\r
-  EFI_STATUS                  Status;\r
-  FV_HANDOFF_TABLE_POINTERS2  FvBlob2;\r
-  VOID                        *FvName;\r
+  EFI_STATUS                   Status;\r
+  CFV_HANDOFF_TABLE_POINTERS2  FvBlob2;\r
+  VOID                         *FvName;\r
 \r
   //\r
   // Init the log event for FV measurement\r