Changeset 81983 in vbox for trunk/src/VBox

Timestamp:

Nov 19, 2019 10:35:26 AM (5 years ago)

Author:

vboxsync

Message:

VMM: Switch the fixation of I/O port and MMIO registrations till after PDM has called the pfnInitComplete methods, so that DevPcArch can register MMIO handlers for reserved regions between 640KB and 1MB. bugref:9218

Location:

trunk/src/VBox/VMM/VMMR3

Files:

• IOM.cpp (modified) (1 diff)
• VM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/IOM.cpp

@@ -246 +246 @@
 {
 #ifdef VBOX_WITH_STATISTICS
-    if (enmWhat == VMINITCOMPLETED_RING3)
+    if (enmWhat == VMINITCOMPLETED_RING0)
     {
         /*

trunk/src/VBox/VMM/VMMR3/VM.cpp

@@ -1025 +1025 @@
     if (RT_SUCCESS(rc))
         rc = EMR3InitCompleted(pVM, enmWhat);
+    if (enmWhat == VMINITCOMPLETED_RING3)
+    {
+        if (RT_SUCCESS(rc))
+            rc = SSMR3RegisterStub(pVM, "rem", 1);
+    }
+    if (RT_SUCCESS(rc))
+        rc = PDMR3InitCompleted(pVM, enmWhat);
+
+    /* IOM *must* come after PDM, as device (DevPcArch) may register some final
+       handlers in their init completion method. */
     if (RT_SUCCESS(rc))
         rc = IOMR3InitCompleted(pVM, enmWhat);
-    if (enmWhat == VMINITCOMPLETED_RING3)
-    {
-        if (RT_SUCCESS(rc))
-            rc = SSMR3RegisterStub(pVM, "rem", 1);
-    }
-    if (RT_SUCCESS(rc))
-        rc = PDMR3InitCompleted(pVM, enmWhat);
     return rc;
 }