Changeset 82073 in vbox for trunk/src/VBox/Devices

Timestamp:

Nov 21, 2019 10:57:54 AM (5 years ago)

Author:

vboxsync

Message:

DevPCI: Added a special return code to FNPCIIOREGIONMAP for telling the bus that the callback did the mapping and it should not use the registered handle to do so again. Needed for VGA (alternative was to reorder the callout order). bugref:9218

File:

• trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (2 diffs)

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

@@ -2738 +2738 @@
                 {
                     /* The callout is optional with new style devices: */
-                    if (pRegion->pfnMap)
+                    if (!pRegion->pfnMap)
+                        rc = VINF_SUCCESS;
+                    else
                     {
                         rc = pRegion->pfnMap(pPciDev->Int.s.pDevInsR3, pPciDev, iRegion,
@@ -2746 +2748 @@
 
                     /* We do the mapping for new-style devices: */
-                    if (pRegion->hHandle != UINT64_MAX)
+                    if (pRegion->hHandle != UINT64_MAX && rc != VINF_PCI_MAPPING_DONE)
                     {
                         switch (pRegion->fFlags & PDMPCIDEV_IORGN_F_HANDLE_MASK)