Changeset 65889 in vbox

Timestamp:

Feb 27, 2017 3:03:50 PM (8 years ago)

Author:

vboxsync

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

113677

Message:

DrvVD: Don't sync the last chunk to guest memory as it is done in the completion worker routine

File:

• trunk/src/VBox/Devices/Storage/DrvVD.cpp (modified) (1 diff)

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

@@ -3273 +3273 @@
         else if (rc == VINF_VD_ASYNC_IO_FINISHED)
         {
-            if (pIoReq->enmType == PDMMEDIAEXIOREQTYPE_READ)
-                rc = drvvdMediaExIoReqBufSync(pThis, pIoReq, false /* fToIoBuf */);
+            /*
+             * Don't sync the buffer or update the I/O state for the last chunk as it is done
+             * already in the completion worker called below.
+             */
+            if (cbReqIo < pIoReq->ReadWrite.cbReqLeft)
+            {
+                if (pIoReq->enmType == PDMMEDIAEXIOREQTYPE_READ)
+                    rc = drvvdMediaExIoReqBufSync(pThis, pIoReq, false /* fToIoBuf */);
+                else
+                    rc = VINF_SUCCESS;
+                pIoReq->ReadWrite.offStart  += cbReqIo;
+                pIoReq->ReadWrite.cbReqLeft -= cbReqIo;
+            }
             else
+            {
                 rc = VINF_SUCCESS;
-            pIoReq->ReadWrite.offStart  += cbReqIo;
-            pIoReq->ReadWrite.cbReqLeft -= cbReqIo;
+                break;
+            }
         }
     }
 
     if (rc != VINF_PDM_MEDIAEX_IOREQ_IN_PROGRESS)
-    {
-        Assert(!pIoReq->ReadWrite.cbReqLeft || RT_FAILURE(rc));
         rc = drvvdMediaExIoReqCompleteWorker(pThis, pIoReq, rc, fUpNotify);
-    }
 
     LogFlowFunc(("returns %Rrc\n", rc));