Changeset 81604 in vbox

Timestamp:

Oct 31, 2019 9:42:09 AM (5 years ago)

Author:

vboxsync

Message:

EFI: Disabled APFS jumpstart for 32-bit as there's no use for it and it didn't build.

Location:

trunk/src/VBox/Devices/EFI/Firmware

Files:

• OvmfPkg/OvmfPkgIa32.dsc (modified) (1 diff)
• OvmfPkg/OvmfPkgIa32.fdf (modified) (1 diff)
• VBoxPkg/VBoxApfsJmpStartDxe/VBoxApfsJmpStartDxe.c (modified) (1 diff)

trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/OvmfPkgIa32.dsc

@@ -859 +859 @@
  VBoxPkg/VBoxSysTables/VBoxSysTables.inf
  VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf
- VBoxPkg/VBoxApfsJmpStartDxe/VBoxApfsJmpStartDxe.inf
+ # VBoxPkg/VBoxApfsJmpStartDxe/VBoxApfsJmpStartDxe.inf -- 64-bit only!
  MdeModulePkg/Universal/ReportStatusCodeRouter/RuntimeDxe/ReportStatusCodeRouterRuntimeDxe.inf
  MdeModulePkg/Universal/StatusCodeHandler/RuntimeDxe/StatusCodeHandlerRuntimeDxe.inf

trunk/src/VBox/Devices/EFI/Firmware/OvmfPkg/OvmfPkgIa32.fdf

@@ -279 +279 @@
 INF VBoxPkg/VBoxSysTables/VBoxSysTables.inf
 INF VBoxPkg/VBoxAppleSim/VBoxAppleSim.inf
-INF VBoxPkg/VBoxApfsJmpStartDxe/VBoxApfsJmpStartDxe.inf
+# INF VBoxPkg/VBoxApfsJmpStartDxe/VBoxApfsJmpStartDxe.inf -- 64-bit only!
 INF MdeModulePkg/Universal/Acpi/BootGraphicsResourceTableDxe/BootGraphicsResourceTableDxe.inf
 !endif

trunk/src/VBox/Devices/EFI/Firmware/VBoxPkg/VBoxApfsJmpStartDxe/VBoxApfsJmpStartDxe.c

@@ -128 +128 @@
         {
             PCAPFSPRANGE pRange = &pCtx->JmpStart.aExtents[i];
-            UINTN cbRead = RT_MIN(cbReadLeft, RT_LE2H_U64(pRange->cBlocks) * pCtx->cbBlock);
+            UINTN cbRead = RT_MIN(cbReadLeft, (UINTN)RT_LE2H_U64(pRange->cBlocks) * pCtx->cbBlock);
 
             rc = vboxApfsJmpStartRead(pCtx, RT_LE2H_U64(pRange->PAddrStart), pbBuf, cbRead);