OvmfPkg EMU FVB: Add 2 functions to PlatformFvbLib

Add PlatformFvbDataRead and PlatformFvbBlocksErased functions.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11241 6f19259b-4bc3-4df7-8a09-765794883524

OvmfPkg/EmuVariableFvbRuntimeDxe/Fvb.c

@@ -377,6 +377,8 @@ FvbProtocolEraseBlocks (
       EraseSize,
       ERASED_UINT8
       );
+    VA_START (args, This);
+    PlatformFvbBlocksErased (This, args);
   }
 
   return EFI_SUCCESS;
@@ -557,6 +559,7 @@ FvbProtocolRead (
 
   if (*NumBytes > 0) {
     CopyMem (Buffer, FvbDataPtr, *NumBytes);
+    PlatformFvbDataRead (This, Lba, Offset, *NumBytes, Buffer);
   }
 
   return EFI_SUCCESS;

OvmfPkg/Include/Library/PlatformFvbLib.h

@@ -20,9 +20,33 @@
 
 /**
   This function will be called following a call to the
-  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL Write function.
+  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Read function.
 
-  @param[in] This     EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL instance.
+  @param[in] This     The EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL instance.
+  @param[in] Lba      The starting logical block index
+                      from which to read.
+  @param[in] Offset   Offset into the block at which to begin reading.
+  @param[in] NumBytes The number of bytes read.
+  @param[in] Buffer   Pointer to the buffer that was read, and will be
+                      returned to the caller.
+
+**/
+VOID
+EFIAPI
+PlatformFvbDataRead (
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,
+  IN        EFI_LBA                             Lba,
+  IN        UINTN                               Offset,
+  IN        UINTN                               NumBytes,
+  IN        UINT8                               *Buffer
+  );
+
+
+/**
+  This function will be called following a call to the
+  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Write function.
+
+  @param[in] This     EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL instance.
   @param[in] Lba      The starting logical block index to written to.
   @param[in] Offset   Offset into the block at which to begin writing.
   @param[in] NumBytes The number of bytes written.
@@ -39,5 +63,25 @@ PlatformFvbDataWritten (
   IN        UINT8                                *Buffer
   );
 
+
+/**
+  This function will be called following a call to the
+  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Erase function.
+
+  @param This   Indicates the EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL
+                instance.
+  @param List   The variable argument list as documented for
+                the EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Erase
+                function.
+
+**/
+VOID
+EFIAPI
+PlatformFvbBlocksErased (
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,
+  IN  VA_LIST       List
+  );
+
+
 #endif
 

OvmfPkg/Library/EmuVariableFvbLib/EmuVariableFvbLib.c

@@ -22,9 +22,35 @@
 
 /**
   This function will be called following a call to the
-  EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL Write function.
+  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Read function.
 
-  @param[in] This     EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL instance.
+  @param[in] This     The EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL instance.
+  @param[in] Lba      The starting logical block index
+                      from which to read.
+  @param[in] Offset   Offset into the block at which to begin reading.
+  @param[in] NumBytes The number of bytes read.
+  @param[in] Buffer   Pointer to the buffer that was read, and will be
+                      returned to the caller.
+
+**/
+VOID
+EFIAPI
+PlatformFvbDataRead (
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,
+  IN        EFI_LBA                             Lba,
+  IN        UINTN                               Offset,
+  IN        UINTN                               NumBytes,
+  IN        UINT8                               *Buffer
+  )
+{
+}
+
+
+/**
+  This function will be called following a call to the
+  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Write function.
+
+  @param[in] This     EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL instance.
   @param[in] Lba      The starting logical block index to written to.
   @param[in] Offset   Offset into the block at which to begin writing.
   @param[in] NumBytes The number of bytes written.
@@ -54,3 +80,24 @@ PlatformFvbDataWritten (
 }
 
 
+/**
+  This function will be called following a call to the
+  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Erase function.
+
+  @param This   Indicates the EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL
+                instance.
+  @param List   The variable argument list as documented for
+                the EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Erase
+                function.
+
+**/
+VOID
+EFIAPI
+PlatformFvbBlocksErased (
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,
+  IN  VA_LIST       List
+  )
+{
+}
+
+

OvmfPkg/Library/PlatformFvbLibNull/PlatformFvbLibNull.c

@@ -16,6 +16,32 @@
 #include <Library/PlatformFvbLib.h>
 
 
+/**
+  This function will be called following a call to the
+  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Read function.
+
+  @param[in] This     The EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL instance.
+  @param[in] Lba      The starting logical block index
+                      from which to read.
+  @param[in] Offset   Offset into the block at which to begin reading.
+  @param[in] NumBytes The number of bytes read.
+  @param[in] Buffer   Pointer to the buffer that was read, and will be
+                      returned to the caller.
+
+**/
+VOID
+EFIAPI
+PlatformFvbDataRead (
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,
+  IN        EFI_LBA                             Lba,
+  IN        UINTN                               Offset,
+  IN        UINTN                               NumBytes,
+  IN        UINT8                               *Buffer
+  )
+{
+}
+
+
 /**
   This function will be called following a call to the
   EFI_FIRMWARE_VOLUME_BLOCK_PROTOCOL Write function.
@@ -40,3 +66,24 @@ PlatformFvbDataWritten (
 }
 
 
+/**
+  This function will be called following a call to the
+  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Erase function.
+
+  @param This   Indicates the EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL
+                instance.
+  @param List   The variable argument list as documented for
+                the EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL Erase
+                function.
+
+**/
+VOID
+EFIAPI
+PlatformFvbBlocksErased (
+  IN CONST  EFI_FIRMWARE_VOLUME_BLOCK2_PROTOCOL *This,
+  IN  VA_LIST       List
+  )
+{
+}
+
+