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>

1 files changed, 7 insertions, 11 deletions

diff --git a/OvmfPkg/Library/PeilessStartupLib/IntelTdx.c b/OvmfPkg/Library/PeilessStartupLib/IntelTdx.c
index 216c413caa..4e8dca3d77 100644
--- a/OvmfPkg/Library/PeilessStartupLib/IntelTdx.c
+++ b/OvmfPkg/Library/PeilessStartupLib/IntelTdx.c
@@ -11,6 +11,7 @@
 #include <IndustryStandard/UefiTcgPlatform.h>

 #include <Library/HobLib.h>

 #include <Library/PrintLib.h>

+#include <Library/TcgEventLogRecordLib.h>

 #include <Library/TpmMeasurementLib.h>

 

 #include "PeilessStartupInternal.h"

@@ -25,16 +26,11 @@ typedef struct {
   EFI_CONFIGURATION_TABLE    TableEntry[1];

 } TDX_HANDOFF_TABLE_POINTERS2;

 

-#define FV_HANDOFF_TABLE_DESC  "Fv(XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX)"

-typedef struct {

-  UINT8                   BlobDescriptionSize;

-  UINT8                   BlobDescription[sizeof (FV_HANDOFF_TABLE_DESC)];

-  EFI_PHYSICAL_ADDRESS    BlobBase;

-  UINT64                  BlobLength;

-} FV_HANDOFF_TABLE_POINTERS2;

-

 #pragma pack()

 

+#define FV_HANDOFF_TABLE_DESC  "Fv(XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX)"

+typedef PLATFORM_FIRMWARE_BLOB2_STRUCT CFV_HANDOFF_TABLE_POINTERS2;

+

 /**

   Measure the Hoblist passed from the VMM.

 

@@ -161,9 +157,9 @@ MeasureFvImage (
   IN UINT8                 PcrIndex

   )

 {

-  EFI_STATUS                  Status;

-  FV_HANDOFF_TABLE_POINTERS2  FvBlob2;

-  VOID                        *FvName;

+  EFI_STATUS                   Status;

+  CFV_HANDOFF_TABLE_POINTERS2  FvBlob2;

+  VOID                         *FvName;

 

   //

   // Init the log event for FV measurement