Changeset 58459 in vbox for trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Variable/RuntimeDxe/Reclaim.c

Timestamp:

Oct 28, 2015 8:17:18 PM (9 years ago)

Author:

vboxsync

Message:

EFI/Firmware: 'svn merge ^{/vendor/edk2/UDK2010.SR1} /vendor/edk2/current .', reverting and removing files+dirs listed in ReadMe.vbox, resolving conflicts with help from ../UDK2014.SP1/. This is a raw untested merge.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• . (modified) (1 prop)
• MdeModulePkg/Universal/Variable/RuntimeDxe/Reclaim.c (modified) (7 diffs)

trunk/src/VBox/Devices/EFI/Firmware/MdeModulePkg/Universal/Variable/RuntimeDxe/Reclaim.c

@@ -4 +4 @@
   (Fault Tolerant Write) protocol.
 
-Copyright (c) 2006 - 2010, Intel Corporation. All rights reserved.<BR>
+Copyright (c) 2006 - 2014, Intel Corporation. All rights reserved.<BR>
 This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
@@ -48 +48 @@
   UINT32                              LbaIndex;
 
+  Fvb     = NULL;
   *Lba    = (EFI_LBA) (-1);
   *Offset = 0;
@@ -100 +101 @@
 
   @param  VariableBase   Base address of variable to write
-  @param  Buffer         Point to the data buffer.
-  @param  BufferSize     The number of bytes of the data Buffer.
+  @param  VariableBuffer Point to the variable data buffer.
 
   @retval EFI_SUCCESS    The function completed successfully.
@@ -111 +111 @@
 FtwVariableSpace (
   IN EFI_PHYSICAL_ADDRESS   VariableBase,
-  IN UINT8                  *Buffer,
-  IN UINTN                  BufferSize
+  IN VARIABLE_STORE_HEADER  *VariableBuffer
   )
 {
@@ -119 +118 @@
   EFI_LBA                            VarLba;
   UINTN                              VarOffset;
-  UINT8                              *FtwBuffer;
   UINTN                              FtwBufferSize;
   EFI_FAULT_TOLERANT_WRITE_PROTOCOL  *FtwProtocol;
@@ -144 +142 @@
     return EFI_ABORTED;
   }
-  //
-  // Prepare for the variable data.
-  //
+
   FtwBufferSize = ((VARIABLE_STORE_HEADER *) ((UINTN) VariableBase))->Size;
-  FtwBuffer     = AllocatePool (FtwBufferSize);
-  if (FtwBuffer == NULL) {
-    return EFI_OUT_OF_RESOURCES;
-  }
-
-  SetMem (FtwBuffer, FtwBufferSize, (UINT8) 0xff);
-  CopyMem (FtwBuffer, Buffer, BufferSize);
+  ASSERT (FtwBufferSize == VariableBuffer->Size);
 
   //
@@ -166 +156 @@
                           NULL,           // PrivateData NULL
                           FvbHandle,      // Fvb Handle
-                          FtwBuffer       // write buffer
+                          (VOID *) VariableBuffer // write buffer
                           );
 
-  FreePool (FtwBuffer);
   return Status;
 }