Changeset 82508 in vbox for trunk/src/VBox

Timestamp:

Dec 9, 2019 12:10:54 PM (5 years ago)

Author:

vboxsync

Message:

EFI/Firmware/VBoxPkg: Add new GUID to retrieve the blessed file from HFS+ volumes through GetInfo()

Location:

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg

Files:

• Include/Guid (added)
• VBoxFsDxe/VBoxFswParam.h (modified) (1 diff)
• VBoxFsDxe/VBoxHfs.inf (modified) (1 diff)
• VBoxFsDxe/fsw_efi.c (modified) (2 diffs)
• VBoxPkg.dec (modified) (1 diff)

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxFswParam.h

@@ -54 +54 @@
 # include <Protocol/ComponentName.h>
 
+# include <Guid/VBoxFsBlessedFileInfo.h> /* For HFS blessed file support. */
+
 # define BS gBS
 # define PROTO_NAME(x) gEfi ## x ## Guid

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/VBoxHfs.inf

@@ -64 +64 @@
   gEfiFileSystemInfoGuid
   gEfiFileSystemVolumeLabelInfoIdGuid
+  gVBoxFsBlessedFileInfoGuid
 
 [Protocols]

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxFsDxe/fsw_efi.c

@@ -137 +137 @@
                                        OUT VOID *Buffer);
 
+#if defined(VBOX) && (FSTYPE == hfs)
+extern fsw_status_t fsw_hfs_get_blessed_file(void *vol, struct fsw_string *path);
+#endif
+
 /**
  * Interface structure for the EFI Driver Binding protocol.
@@ -983 +987 @@
         Status = EFI_SUCCESS;
 
+#ifdef VBOX
+    } else if (CompareGuid(InformationType, &gVBoxFsBlessedFileInfoGuid)) {
+
+# if FSTYPE == hfs
+        struct fsw_string StrBlessedFile;
+
+        fsw_status_t rc = fsw_hfs_get_blessed_file(Volume->vol, &StrBlessedFile);
+        if (!rc)
+        {
+            // check buffer size
+            RequiredSize = SIZE_OF_VBOX_FS_BLESSED_FILE + fsw_efi_strsize(&StrBlessedFile);
+            if (*BufferSize < RequiredSize) {
+                *BufferSize = RequiredSize;
+                return EFI_BUFFER_TOO_SMALL;
+            }
+
+            // copy volume label
+            fsw_efi_strcpy(((VBOX_FS_BLESSED_FILE *)Buffer)->BlessedFile, &StrBlessedFile);
+
+            // prepare for return
+            *BufferSize = RequiredSize;
+            Status = EFI_SUCCESS;
+        }
+        else
+# endif
+            Status = EFI_UNSUPPORTED;
+#endif
+
     } else {
         Status = EFI_UNSUPPORTED;

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxPkg.dec

@@ -39 +39 @@
 #        gEfiFlashMapHobGuid           = { 0xb091e7d2, 0x5a0, 0x4198, {0x94, 0xf0, 0x74, 0xb7, 0xb8, 0xc5, 0x54, 0x59 }}
         gVBoxVgaPkgTokenSpaceGuid = { 0xa3a8ce56, 0x4a07, 0x441f, {0xa3, 0xf5, 0x6f, 0x53, 0xdb, 0x9c, 0xb7, 0xd8}}
+        gVBoxFsBlessedFileInfoGuid = { 0xcc49fefd, 0x41b7, 0x473f, {0x98, 0x23, 0x0e, 0x8e, 0xbf, 0x35, 0x67, 0x7d } }
 
 #