Changeset 67583 in vbox

Timestamp:

Jun 23, 2017 12:00:56 PM (8 years ago)

Author:

vboxsync

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

116338

Message:

PDM, DevPci, DevPciIch9: Need to trigger the FakePCIBIOS code later on reset (after the devices are reset), as otherwise the device reset can destroy the carefully set up PCI config space content. It's now run in a similar place as on VM start.

Location:

trunk/src/VBox

Files:

• Devices/Bus/DevPCI.cpp (modified) (2 diffs)
• Devices/Bus/DevPciIch9.cpp (modified) (1 diff)
• VMM/VMMR3/PDM.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Bus/DevPCI.cpp

@@ -1212 +1212 @@
 
 /**
- * @interface_method_impl{PDMDEVREG,pfnReset}
- */
-static DECLCALLBACK(void) pciR3Reset(PPDMDEVINS pDevIns)
-{
-    pciR3FakePCIBIOS(pDevIns);
-}
-
-
-/**
  * @interface_method_impl{PDMDEVREG,pfnConstruct}
  */
@@ -1437 +1428 @@
     NULL,
     /* pfnReset */
-    pciR3Reset,
+    NULL,
     /* pfnSuspend */
     NULL,

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -3269 +3269 @@
     /* Reset everything under the root bridge. */
     ich9pciResetBridge(pDevIns);
-
-    /* Do a fresh Fake PCI BIOS setup. */
-    ich9pciFakePCIBIOS(pDevIns);
 }
 

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

@@ -1645 +1645 @@
         }
 
+    /*
+     * Run Fake PCI BIOS after reset.
+     */
+    if (fAtReset && pVM->pdm.s.aPciBuses[0].pDevInsR3)
+    {
+        pdmLock(pVM);
+        int rc = pVM->pdm.s.aPciBuses[0].pfnFakePCIBIOSR3(pVM->pdm.s.aPciBuses[0].pDevInsR3);
+        pdmUnlock(pVM);
+        if (RT_FAILURE(rc))
+            AssertMsgFailed(("PCI BIOS fake failed rc=%Rrc\n", rc));
+    }
+
+
     LogFlow(("PDMR3MemSetup: returns void\n"));
 }