OvmfPkg/EmuVariableFvbRuntimeDxe: correct NumOfLba vararg type in EraseBlocks()

[mirror_edk2.git] / OvmfPkg / EmuVariableFvbRuntimeDxe / Fvb.c

diff --git a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
index dec6d4af50df8eee1b4424b542ffb3eb217f0d6c..9f9babc9cc33c68211f58fb29f67e8aa481f63f9 100644 (file)
--- a/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
+++ b/OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c
@@ -340,7 +340,7 @@ FvbProtocolEraseBlocks (
       break;\r
     }\r
 \r
-    NumOfLba = VA_ARG (args, UINT32);\r
+    NumOfLba = VA_ARG (args, UINTN);\r
 \r
     //\r
     // Check input parameters\r
@@ -625,75 +625,6 @@ InitializeFvAndVariableStoreHeaders (
   IN  VOID   *Ptr\r
   )\r
 {\r
-  //\r
-  // Templates for standard (non-authenticated) variable FV header\r
-  //\r
-  STATIC FVB_FV_HDR_AND_VARS_TEMPLATE FvAndVarTemplate = {\r
-    { // EFI_FIRMWARE_VOLUME_HEADER FvHdr;\r
-      // UINT8                     ZeroVector[16];\r
-      { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },\r
-\r
-      // EFI_GUID                  FileSystemGuid;\r
-      EFI_SYSTEM_NV_DATA_FV_GUID,\r
-\r
-      // UINT64                    FvLength;\r
-      EMU_FVB_SIZE,\r
-\r
-      // UINT32                    Signature;\r
-      EFI_FVH_SIGNATURE,\r
-\r
-      // EFI_FVB_ATTRIBUTES_2      Attributes;\r
-      0x4feff,\r
-\r
-      // UINT16                    HeaderLength;\r
-      EMU_FV_HEADER_LENGTH,\r
-\r
-      // UINT16                    Checksum;\r
-      0,\r
-\r
-      // UINT16                    ExtHeaderOffset;\r
-      0,\r
-\r
-      // UINT8                     Reserved[1];\r
-      {0},\r
-\r
-      // UINT8                     Revision;\r
-      EFI_FVH_REVISION,\r
-\r
-      // EFI_FV_BLOCK_MAP_ENTRY    BlockMap[1];\r
-      { \r
-        {\r
-          2, // UINT32 NumBlocks;\r
-          EMU_FVB_BLOCK_SIZE  // UINT32 Length;\r
-        }\r
-      }\r
-    },\r
-    // EFI_FV_BLOCK_MAP_ENTRY     EndBlockMap;\r
-    { 0, 0 }, // End of block map\r
-    { // VARIABLE_STORE_HEADER      VarHdr;\r
-      // EFI_GUID  Signature;\r
-      EFI_VARIABLE_GUID,\r
-\r
-      // UINT32  Size;\r
-      (\r
-        FixedPcdGet32 (PcdVariableStoreSize) -\r
-        OFFSET_OF (FVB_FV_HDR_AND_VARS_TEMPLATE, VarHdr)\r
-      ),\r
-\r
-      // UINT8   Format;\r
-      VARIABLE_STORE_FORMATTED,\r
-\r
-      // UINT8   State;\r
-      VARIABLE_STORE_HEALTHY,\r
-\r
-      // UINT16  Reserved;\r
-      0,\r
-\r
-      // UINT32  Reserved1;\r
-      0\r
-    }\r
-  };\r
-\r
   //\r
   // Templates for authenticated variable FV header\r
   //\r
@@ -768,11 +699,11 @@ InitializeFvAndVariableStoreHeaders (
   //\r
   // Copy the template structure into the location\r
   //\r
-  if (FeaturePcdGet (PcdSecureBootEnable) == FALSE) {\r
-    CopyMem (Ptr, (VOID*)&FvAndVarTemplate, sizeof (FvAndVarTemplate));\r
-  } else {\r
-    CopyMem (Ptr, (VOID*)&FvAndAuthenticatedVarTemplate, sizeof (FvAndAuthenticatedVarTemplate));\r
-  }\r
+  CopyMem (\r
+    Ptr,\r
+    &FvAndAuthenticatedVarTemplate,\r
+    sizeof FvAndAuthenticatedVarTemplate\r
+    );\r
 \r
   //\r
   // Update the checksum for the FV header\r