Changeset 63740 in vbox

Timestamp:

Sep 6, 2016 2:20:14 PM (8 years ago)

Author:

vboxsync

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

110522

Message:

DrvVD: Don't use the async VD API in PDMIMEDIAEX when it is not supported

File:

• trunk/src/VBox/Devices/Storage/DrvVD.cpp (modified) (3 diffs)

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

@@ -3046 +3046 @@
 
         if (pIoReq->enmType == PDMMEDIAEXIOREQTYPE_READ)
-            rc = VDAsyncRead(pThis->pDisk, pIoReq->ReadWrite.offStart, cbReqIo, &pIoReq->ReadWrite.IoBuf.SgBuf,
-                             drvvdMediaExIoReqComplete, pThis, pIoReq);
+        {
+            if (pThis->fAsyncIOSupported)
+                rc = VDAsyncRead(pThis->pDisk, pIoReq->ReadWrite.offStart, cbReqIo, &pIoReq->ReadWrite.IoBuf.SgBuf,
+                                 drvvdMediaExIoReqComplete, pThis, pIoReq);
+            else
+            {
+                void *pvBuf = RTSgBufGetNextSegment(&pIoReq->ReadWrite.IoBuf.SgBuf, &cbReqIo);
+
+                Assert(cbReqIo > 0 && VALID_PTR(pvBuf));
+                rc = VDRead(pThis->pDisk, pIoReq->ReadWrite.offStart, pvBuf, cbReqIo);
+                if (RT_SUCCESS(rc))
+                    rc = VINF_VD_ASYNC_IO_FINISHED;
+            }
+        }
         else
         {
@@ -3054 +3066 @@
             if (RT_SUCCESS(rc))
             {
-                rc = VDAsyncWrite(pThis->pDisk, pIoReq->ReadWrite.offStart, cbReqIo,
-                                  &pIoReq->ReadWrite.IoBuf.SgBuf,
-                                  drvvdMediaExIoReqComplete, pThis, pIoReq);
+                if (pThis->fAsyncIOSupported)
+                    rc = VDAsyncWrite(pThis->pDisk, pIoReq->ReadWrite.offStart, cbReqIo,
+                                      &pIoReq->ReadWrite.IoBuf.SgBuf,
+                                      drvvdMediaExIoReqComplete, pThis, pIoReq);
+                else
+                {
+                    void *pvBuf = RTSgBufGetNextSegment(&pIoReq->ReadWrite.IoBuf.SgBuf, &cbReqIo);
+
+                    Assert(cbReqIo > 0 && VALID_PTR(pvBuf));
+                    rc = VDWrite(pThis->pDisk, pIoReq->ReadWrite.offStart, pvBuf, cbReqIo);
+                    if (RT_SUCCESS(rc))
+                        rc = VINF_VD_ASYNC_IO_FINISHED;
+                }
             }
         }
@@ -3453 +3475 @@
 
     ASMAtomicIncU32(&pThis->cIoReqsActive);
-    int rc = VDAsyncFlush(pThis->pDisk, drvvdMediaExIoReqComplete, pThis, pIoReq);
+    int rc = VINF_SUCCESS;
+    if (pThis->fAsyncIOSupported)
+        rc = VDAsyncFlush(pThis->pDisk, drvvdMediaExIoReqComplete, pThis, pIoReq);
+    else
+        rc = VDFlush(pThis->pDisk);
+
     if (rc == VERR_VD_ASYNC_IO_IN_PROGRESS)
         rc = VINF_PDM_MEDIAEX_IOREQ_IN_PROGRESS;