Changeset 82297 in vbox

Timestamp:

Nov 29, 2019 11:25:46 PM (5 years ago)

Author:

vboxsync

Message:

DevPci: There are no more old style I/O port or MMIOEx ranges anymore. bugref:9218

File:

• trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (1 diff)

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

@@ -2570 +2570 @@
              */
             if (pRegion->type & PCI_ADDRESS_SPACE_IO)
-            {
-                /* Port IO */
-                rc = PDMDevHlpIOPortDeregister(pDev->Int.s.pDevInsR3, pRegion->addr, pRegion->size);
-                AssertRC(rc);
-            }
+                AssertFailed();
             else
             {
                 PDEVPCIBUSCC pBusCC     = PDMINS_2_DATA_CC(pDevIns, PDEVPCIBUSCC);
                 RTGCPHYS     GCPhysBase = pRegion->addr;
-                if (pBusCC->pPciHlpR3->pfnIsMMIOExBase(pDevIns, pDev->Int.s.pDevInsR3, GCPhysBase))
-                {
-                    /* unmap it. */
-                    rc = pRegion->pfnMap(pDev->Int.s.pDevInsR3, pDev, iRegion,
-                                         NIL_RTGCPHYS, pRegion->size, (PCIADDRESSSPACE)(pRegion->type));
-                    AssertRC(rc);
-                    rc = PDMDevHlpMMIOExUnmap(pDev->Int.s.pDevInsR3, pDev, iRegion, GCPhysBase);
-                }
-                else
-                    rc = PDMDevHlpMMIODeregister(pDev->Int.s.pDevInsR3, GCPhysBase, pRegion->size);
+                Assert(!pBusCC->pPciHlpR3->pfnIsMMIOExBase(pDevIns, pDev->Int.s.pDevInsR3, GCPhysBase));
+                rc = PDMDevHlpMMIODeregister(pDev->Int.s.pDevInsR3, GCPhysBase, pRegion->size);
                 AssertRC(rc);
             }