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

Timestamp:

Sep 26, 2016 6:53:10 PM (8 years ago)

Author:

vboxsync

Message:

Storage/DrvVD: Assertions + and honor the sync flag for I/O requests

File:

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

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

@@ -2613 +2613 @@
 
     Assert(pIoReq->enmType == PDMMEDIAEXIOREQTYPE_READ || pIoReq->enmType == PDMMEDIAEXIOREQTYPE_WRITE);
+    Assert(pIoReq->ReadWrite.cbIoBuf > 0);
 
     /* Make sure the buffer is reset. */
@@ -2849 +2850 @@
     {
         /* Adjust the remaining amount to transfer. */
+        Assert(pIoReq->ReadWrite.cbIoBuf > 0);
+
         size_t cbReqIo = RT_MIN(pIoReq->ReadWrite.cbReqLeft, pIoReq->ReadWrite.cbIoBuf);
         pIoReq->ReadWrite.offStart  += cbReqIo;
@@ -2887 +2890 @@
         rc = VINF_PDM_MEDIAEX_IOREQ_IN_PROGRESS;
     }
+    else
+        Assert(pIoReq->ReadWrite.cbIoBuf > 0);
 
     return rc;
@@ -2904 +2909 @@
     int rc = VINF_SUCCESS;
 
-    if (pThis->fAsyncIOSupported)
+    Assert(cbReqIo > 0);
+
+    if (   pThis->fAsyncIOSupported
+        && !(pIoReq->fFlags & PDMIMEDIAEX_F_SYNC))
     {
         if (pThis->pBlkCache)
@@ -2947 +2955 @@
     int rc = VINF_SUCCESS;
 
-    if (pThis->fAsyncIOSupported)
+    Assert(cbReqIo > 0);
+
+    if (   pThis->fAsyncIOSupported
+        && !(pIoReq->fFlags & PDMIMEDIAEX_F_SYNC))
     {
         if (pThis->pBlkCache)
@@ -2988 +2999 @@
     int rc = VINF_SUCCESS;
 
-    if (pThis->fAsyncIOSupported)
+    if (   pThis->fAsyncIOSupported
+        && !(pIoReq->fFlags & PDMIMEDIAEX_F_SYNC))
     {
         if (pThis->pBlkCache)
@@ -3022 +3034 @@
     int rc = VINF_SUCCESS;
 
-    if (pThis->fAsyncIOSupported)
+    if (   pThis->fAsyncIOSupported
+        && !(pIoReq->fFlags & PDMIMEDIAEX_F_SYNC))
     {
         if (pThis->pBlkCache)
@@ -3065 +3078 @@
            && rc == VINF_SUCCESS)
     {
+        Assert(pIoReq->ReadWrite.cbIoBuf > 0);
+
         size_t cbReqIo = RT_MIN(pIoReq->ReadWrite.cbReqLeft, pIoReq->ReadWrite.cbIoBuf);
 
@@ -3127 +3142 @@
                 if (rc == VINF_SUCCESS)
                 {
+                    Assert(pIoReq->ReadWrite.cbIoBuf > 0);
+
                     ASMAtomicDecU32(&pThis->cIoReqsWaiting);
                     RTListNodeRemove(&pIoReqCur->NdLstWait);