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

Timestamp:

Mar 29, 2007 5:49:36 PM (18 years ago)

Author:

vboxsync

Message:

r=bird: Not entirely sure if inverting the destruction order is a good thing or not, but if it is, we should also invert the notification order for consistency. It would be better if drivers/devices didn't rely on order at all.

File:

• trunk/src/VBox/VMM/PDM.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/PDM.cpp

@@ -328 +328 @@
      * The attached drivers are processed first.
      * N.B. There is no need to mess around freeing memory allocated
-     *      from any MM heap since MM will do that in it's Term function.
+     *      from any MM heap since MM will do that in its Term function.
      */
     for (PPDMDEVINS pDevIns = pVM->pdm.s.pDevInstances; pDevIns; pDevIns = pDevIns->Internal.s.pNextHC)
@@ -334 +334 @@
         for (PPDMLUN pLun = pDevIns->Internal.s.pLunsHC; pLun; pLun = pLun->pNext)
         {
-            PPDMDRVINS pDrvIns;
-
-            /* Find the bottom driver */
-            for (pDrvIns = pLun->pTop; pDrvIns && pDrvIns->Internal.s.pDown; pDrvIns = pDrvIns->Internal.s.pDown)
-                ;
-
-            /* And destroy them one at a time from the bottom up */
+            /* Find the bottom driver. */
+            /** @todo Add pBottom to PDMLUN, this might not be the only place we will have to work it from the bottom up. */
+            PPDMDRVINS pDrvIns = pLun->pTop;
+            while (pDrvIns && pDrvIns->Internal.s.pDown)
+                pDrvIns = pDrvIns->Internal.s.pDown;
+
+            /* And destroy them one at a time from the bottom up. */
             while (pDrvIns)
             {
@@ -352 +352 @@
                     TMR3TimerDestroyDriver(pVM, pDrvIns);
                 }
+
                 pDrvIns = pDrvNext;
             }
@@ -600 +601 @@
     {
         for (PPDMLUN pLun = pDevIns->Internal.s.pLunsHC; pLun; pLun = pLun->pNext)
+            /** @todo Inverse the order here? */
             for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns; pDrvIns = pDrvIns->Internal.s.pDown)
                 if (pDrvIns->pDrvReg->pfnPowerOn)
@@ -646 +648 @@
     {
         for (PPDMLUN pLun = pDevIns->Internal.s.pLunsHC; pLun; pLun = pLun->pNext)
+            /** @todo Inverse the order here? */
             for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns; pDrvIns = pDrvIns->Internal.s.pDown)
                 if (pDrvIns->pDrvReg->pfnReset)
@@ -683 +686 @@
     {
         for (PPDMLUN pLun = pDevIns->Internal.s.pLunsHC; pLun; pLun = pLun->pNext)
+            /** @todo Inverse the order here? */
             for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns; pDrvIns = pDrvIns->Internal.s.pDown)
                 if (pDrvIns->pDrvReg->pfnSuspend)
@@ -720 +724 @@
     {
         for (PPDMLUN pLun = pDevIns->Internal.s.pLunsHC; pLun; pLun = pLun->pNext)
+            /** @todo Inverse the order here? */
             for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns; pDrvIns = pDrvIns->Internal.s.pDown)
                 if (pDrvIns->pDrvReg->pfnResume)
@@ -757 +762 @@
     {
         for (PPDMLUN pLun = pDevIns->Internal.s.pLunsHC; pLun; pLun = pLun->pNext)
+            /** @todo Inverse the order here? */
             for (PPDMDRVINS pDrvIns = pLun->pTop; pDrvIns; pDrvIns = pDrvIns->Internal.s.pDown)
                 if (pDrvIns->pDrvReg->pfnPowerOff)