Changeset 80722 in vbox for trunk/src/VBox/VMM

Timestamp:

Sep 11, 2019 9:21:47 AM (5 years ago)

Author:

vboxsync

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

133263

Message:

PDM,PCI: More PDMPCIDEV related refactoring work, mainly concerned with eliminating unnecessary pointers. bugref:9218

Location:

trunk/src/VBox/VMM

Files:

• VMMR0/PDMR0Device.cpp (modified) (1 diff)
• VMMR3/PDMDevHlp.cpp (modified) (10 diffs)

trunk/src/VBox/VMM/VMMR0/PDMR0Device.cpp

@@ -284 +284 @@
              pDevIns, pDevIns->iInstance, pPciDev, pPciDev->uDevFn, iIrq, iLevel));
     PGVM         pGVM    = pDevIns->Internal.s.pGVM;
-    PPDMPCIBUS   pPciBus = pPciDev->Int.s.pPdmBusR0;
+    size_t const idxBus  = pPciDev->Int.s.idxPdmBus;
+    AssertReturnVoid(idxBus < RT_ELEMENTS(pGVM->pdm.s.aPciBuses));
+    PPDMPCIBUS   pPciBus = &pGVM->pdm.s.aPciBuses[idxBus];
 
     pdmLock(pGVM);

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

@@ -1735 +1735 @@
         {
             uPciDevNo    = pPrevPciDev->uDevFn >> 3;
-            uDefPciBusNo = pPrevPciDev->Int.s.pPdmBusR3->iBus;
+            uDefPciBusNo = pPrevPciDev->Int.s.idxPdmBus;
         }
         else
@@ -1757 +1757 @@
                 pOtherPciDev = pOtherPciDev->Int.s.pNextR3;
             uPciDevNo    = pOtherPciDev->uDevFn >> 3;
-            uDefPciBusNo = pOtherPciDev->Int.s.pPdmBusR3->iBus;
+            uDefPciBusNo = pOtherPciDev->Int.s.idxPdmBus;
         }
     }
@@ -1780 +1780 @@
                            RT_ELEMENTS(pVM->pdm.s.aPciBuses), pDevIns->pReg->szName, pDevIns->iInstance),
                           VERR_PDM_NO_PCI_BUS);
-    PPDMPCIBUS pBus = pPciDev->Int.s.pPdmBusR3 = &pVM->pdm.s.aPciBuses[u8Bus];
+    pPciDev->Int.s.idxPdmBus = u8Bus;
+    PPDMPCIBUS pBus = &pVM->pdm.s.aPciBuses[u8Bus];
     if (pBus->pDevInsR3)
     {
@@ -1835 +1836 @@
         pPciDev->Int.s.fReassignableFunNo = uPciFunNo >= VBOX_PCI_MAX_FUNCTIONS;
         pPciDev->Int.s.pDevInsR3 = pDevIns;
-        pPciDev->Int.s.pPdmBusR3 = pBus;
-        if (pDevIns->pReg->fFlags & PDM_DEVREG_FLAGS_R0)
-        {
-            pPciDev->Int.s.pDevInsR0 = pDevIns->pDevInsR0RemoveMe;
-            pPciDev->Int.s.pPdmBusR0 = MMHyperR3ToR0(pVM, pBus);
-        }
-        else
-        {
-            pPciDev->Int.s.pDevInsR0 = NIL_RTR0PTR;
-            pPciDev->Int.s.pPdmBusR0 = NIL_RTR0PTR;
-        }
-
-        //if (pDevIns->pReg->fFlags & PDM_DEVREG_FLAGS_RC)
-        //{
-        //    pPciDev->Int.s.pDevInsRC = MMHyperR3ToRC(pVM, pDevIns);
-        //    pPciDev->Int.s.pPdmBusRC = MMHyperR3ToRC(pVM, pBus);
-        //}
-        //else
-        {
-            pPciDev->Int.s.pDevInsRC = NIL_RTRCPTR;
-            pPciDev->Int.s.pPdmBusRC = NIL_RTRCPTR;
-        }
+        pPciDev->Int.s.idxPdmBus = u8Bus;
 
         /* Set some of the public members too. */
@@ -1878 +1858 @@
                 pPrevPciDev->Int.s.pNextR3 = pPciDev;
                 pPrevPciDev->Int.s.pNextR0 = NIL_RTRCPTR;
-                pPrevPciDev->Int.s.pNextRC = NIL_RTRCPTR;
             }
             else
@@ -1933 +1912 @@
                           VERR_INVALID_FLAGS);
 
-    PPDMPCIBUS pBus = pPciDev->Int.s.pPdmBusR3; Assert(pBus);
-    PVM        pVM  = pDevIns->Internal.s.pVMR3;
+    PVM             pVM    = pDevIns->Internal.s.pVMR3;
+    size_t const    idxBus = pPciDev->Int.s.idxPdmBus;
+    AssertReturn(idxBus < RT_ELEMENTS(pVM->pdm.s.aPciBuses), VERR_WRONG_ORDER);
+    PPDMPCIBUS      pBus   = &pVM->pdm.s.aPciBuses[idxBus];
+
     pdmLock(pVM);
     int rc;
@@ -2037 +2019 @@
         cbRegion = cbRegionAligned * 2; /* round up */
 
-    PPDMPCIBUS pBus = pPciDev->Int.s.pPdmBusR3;
-    Assert(pBus);
+    size_t const    idxBus = pPciDev->Int.s.idxPdmBus;
+    AssertReturn(idxBus < RT_ELEMENTS(pVM->pdm.s.aPciBuses), VERR_WRONG_ORDER);
+    PPDMPCIBUS      pBus   = &pVM->pdm.s.aPciBuses[idxBus];
+
     pdmLock(pVM);
     int rc = pBus->pfnIORegionRegisterR3(pBus->pDevInsR3, pPciDev, iRegion, cbRegion, enmType, pfnCallback);
@@ -2070 +2054 @@
     AssertPtrNull(pPciDev);
 
-    PPDMPCIBUS pBus = pPciDev->Int.s.pPdmBusR3;
-    AssertRelease(pBus);
+    size_t const    idxBus = pPciDev->Int.s.idxPdmBus;
+    AssertReleaseReturnVoid(idxBus < RT_ELEMENTS(pVM->pdm.s.aPciBuses));
+    PPDMPCIBUS      pBus   = &pVM->pdm.s.aPciBuses[idxBus];
     AssertRelease(VMR3GetState(pVM) != VMSTATE_RUNNING);
 
@@ -2159 +2144 @@
      * Must have a PCI device registered!
      */
-    PPDMPCIBUS pBus = pPciDev->Int.s.pPdmBusR3;
-    Assert(pBus);
-    PVM pVM = pDevIns->Internal.s.pVMR3;
+    PVM             pVM    = pDevIns->Internal.s.pVMR3;
+    size_t const    idxBus = pPciDev->Int.s.idxPdmBus;
+    AssertReturnVoid(idxBus < RT_ELEMENTS(pVM->pdm.s.aPciBuses));
+    PPDMPCIBUS      pBus   = &pVM->pdm.s.aPciBuses[idxBus];
 
     pdmLock(pVM);
@@ -4883 +4869 @@
             if (pPciDev)
             {
-                PPDMPCIBUS pBus = pPciDev->Int.s.pPdmBusR3;
-                Assert(pBus);
+                size_t const    idxBus = pPciDev->Int.s.idxPdmBus;
+                AssertBreak(idxBus < RT_ELEMENTS(pVM->pdm.s.aPciBuses));
+                PPDMPCIBUS      pBus   = &pVM->pdm.s.aPciBuses[idxBus];
 
                 pdmLock(pVM);