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

Timestamp:

Oct 27, 2009 12:15:45 AM (15 years ago)

Author:

vboxsync

Message:

DrvSCSI: Need to synchronize all pending requests before any driver below us gets the PowerOff or Suspend notification. DrvVD will change the image to read-only mode.

File:

• trunk/src/VBox/Devices/Storage/DrvSCSI.cpp (modified) (7 diffs)

trunk/src/VBox/Devices/Storage/DrvSCSI.cpp

@@ -803 +803 @@
 
 /**
- * @copydoc FNPDMDRVRESET
- */
-static DECLCALLBACK(void) drvscsiReset(PPDMDRVINS pDrvIns)
-{
-    PDRVSCSI pThis = PDMINS_2_DATA(pDrvIns, PDRVSCSI);
-    int rc;
-
+ * Worker for drvscsiReset, drvscsiSuspend and drvscsiPowerOff.
+ *
+ * @param   pThis               The instance data.
+ * @param   pszEvent            The notification event (for logging).
+ */
+static void drvscsiWaitForPendingRequests(PDRVSCSI pThis, const char *pszEvent)
+{
     /*
      * Try make sure any pending I/O has completed now.
@@ -817 +817 @@
         if (!drvscsiAsyncIOLoopNoPendingDummy(pThis, 20000 /*ms*/))
         {
-            LogRel(("drvscsiReset#%u: previous dummy request is still pending\n", pDrvIns->iInstance));
+            LogRel(("drvscsi%s#%u: previous dummy request is still pending\n", pszEvent, pThis->pDrvIns->iInstance));
             return;
         }
@@ -824 +824 @@
         {
             PRTREQ pReq;
-            rc = RTReqCall(pThis->pQueueRequests, &pReq, 20000 /*ms*/, (PFNRT)drvscsiAsyncIOLoopSyncCallback, 0);
+            int rc = RTReqCall(pThis->pQueueRequests, &pReq, 20000 /*ms*/, (PFNRT)drvscsiAsyncIOLoopSyncCallback, 0);
             if (RT_SUCCESS(rc))
                 RTReqFree(pReq);
@@ -830 +830 @@
             {
                 pThis->pPendingDummyReq = pReq;
-                LogRel(("drvscsiReset#%u: %Rrc pReq=%p\n", pDrvIns->iInstance, rc, pReq));
+                LogRel(("drvscsi%s#%u: %Rrc pReq=%p\n", pszEvent, pThis->pDrvIns->iInstance, rc, pReq));
             }
         }
@@ -847 +847 @@
  *        wee bit...
  */
+}
+
+/**
+ * @copydoc FNPDMDRVPOWEROFF
+ */
+static DECLCALLBACK(void) drvscsiPowerOff(PPDMDRVINS pDrvIns)
+{
+    PDRVSCSI pThis = PDMINS_2_DATA(pDrvIns, PDRVSCSI);
+    drvscsiWaitForPendingRequests(pThis, "PowerOff");
+}
+
+/**
+ * @copydoc FNPDMDRVSUSPEND
+ */
+static DECLCALLBACK(void) drvscsiSuspend(PPDMDRVINS pDrvIns)
+{
+    PDRVSCSI pThis = PDMINS_2_DATA(pDrvIns, PDRVSCSI);
+    drvscsiWaitForPendingRequests(pThis, "Suspend");
+}
+
+/**
+ * @copydoc FNPDMDRVRESET
+ */
+static DECLCALLBACK(void) drvscsiReset(PPDMDRVINS pDrvIns)
+{
+    PDRVSCSI pThis = PDMINS_2_DATA(pDrvIns, PDRVSCSI);
+    drvscsiWaitForPendingRequests(pThis, "Reset");
 }
 
@@ -990 +1017 @@
     drvscsiReset,
     /* pfnSuspend */
-    NULL,
+    drvscsiSuspend,
     /* pfnResume */
     NULL,
@@ -998 +1025 @@
     NULL,
     /* pfnPowerOff */
-    NULL,
+    drvscsiPowerOff,
     /* pfnSoftReset */
     NULL,