Changeset 90067 in vbox for trunk/src/VBox/Runtime/common

Timestamp:

Jul 6, 2021 1:36:02 PM (4 years ago)

Author:

vboxsync

Message:

Runtime/RTEfi*: Start of a VFS module to access a EFI variable store stored in the NVRAM file to allow changing the firmware config without having the VM running, bugref:9580 [build fix]

File:

• trunk/src/VBox/Runtime/common/efi/efivarstorevfs.cpp (modified) (3 diffs)

trunk/src/VBox/Runtime/common/efi/efivarstorevfs.cpp

@@ -1611 +1611 @@
     uint32_t const cBlocks = (uint32_t)(cbStore / cbBlock);
 
+    EFI_GUID                   GuidVarStore = EFI_VARSTORE_FILESYSTEM_GUID;
+    EFI_GUID                   GuidVarAuth  = EFI_VARSTORE_HEADER_GUID_AUTHENTICATED_VARIABLE;
     EFI_FIRMWARE_VOLUME_HEADER FvHdr;       RT_ZERO(FvHdr);
     EFI_FW_BLOCK_MAP           BlockMap;    RT_ZERO(BlockMap);
@@ -1616 +1618 @@
 
     /* Firmware volume header. */
-    FvHdr.GuidFilesystem = EFI_VARSTORE_FILESYSTEM_GUID;
+    memcpy(&FvHdr.GuidFilesystem, &GuidVarStore, sizeof(GuidVarStore));
     FvHdr.cbFv           = RT_H2LE_U64(cbStore);
     FvHdr.u32Signature   = RT_H2LE_U32(EFI_FIRMWARE_VOLUME_HEADER_SIGNATURE);
@@ -1640 +1642 @@
 
     /* Variable store header. */
-    VarStoreHdr.GuidVarStore = EFI_VARSTORE_HEADER_GUID_AUTHENTICATED_VARIABLE;
+    memcpy(&VarStoreHdr.GuidVarStore, &GuidVarAuth, sizeof(GuidVarAuth));
     VarStoreHdr.cbVarStore   = cbStore - sizeof(FvHdr) - sizeof(BlockMap);
     VarStoreHdr.bFmt         = EFI_VARSTORE_HEADER_FMT_FORMATTED;