Changeset 100116 in vbox

Timestamp:

Jun 8, 2023 12:38:00 PM (21 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

157809

Message:

Devices/DevEFI-armv8.cpp: Move the FDT injection to the memory setup phase instead of after construction or reset because the memory gets zeroed _after_ the device was reset so the FDT got overwritten making UEFI fail to come up after a VM reset, bugref:10400

File:

• trunk/src/VBox/Devices/EFI/DevEFI-armv8.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/EFI/DevEFI-armv8.cpp

@@ -189 +189 @@
 
 /**
- * @interface_method_impl{PDMDEVREG,pfnReset}
- */
-static DECLCALLBACK(void) efiR3Reset(PPDMDEVINS pDevIns)
+ * @interface_method_impl{PDMDEVREG,pfnMemSetup}
+ */
+static DECLCALLBACK(void) efiR3MemSetup(PPDMDEVINS pDevIns, PDMDEVMEMSETUPCTX enmCtx)
 {
     PDEVEFIR3 pThisCC = PDMDEVINS_2_DATA_CC(pDevIns, PDEVEFIR3);
-    LogFlow(("efiR3Reset\n"));
-
+    LogFlow(("efiR3MemSetup\n"));
+
+    RT_NOREF(enmCtx);
     if (pThisCC->GCPhysFdtAddress != RTGCPHYS_MAX)
     {
@@ -406 +407 @@
         return PDMDevHlpVMSetError(pDevIns, rc, RT_SRC_POS, N_("Can't attach resource Storage driver"));
 
-    efiR3Reset(pDevIns);
     return VINF_SUCCESS;
 }
@@ -451 +451 @@
     /* .pfnDestruct = */            efiR3Destruct,
     /* .pfnRelocate = */            NULL,
-    /* .pfnMemSetup = */            NULL,
+    /* .pfnMemSetup = */            efiR3MemSetup,
     /* .pfnPowerOn = */             NULL,
-    /* .pfnReset = */               efiR3Reset,
+    /* .pfnReset = */               NULL,
     /* .pfnSuspend = */             NULL,
     /* .pfnResume = */              NULL,