Changeset 34340 in vbox for trunk

Timestamp:

Nov 24, 2010 8:11:53 PM (14 years ago)

Author:

vboxsync

Message:

PDMBlkCache: Bug fixes

File:

• trunk/src/VBox/VMM/PDMBlkCache.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/PDMBlkCache.cpp

@@ -608 +608 @@
     pIoXfer->cbXfer      = cbData;
     pIoXfer->enmXferDir  = enmXferDir;
-    RTSgBufClone(&pIoXfer->SgBuf, pSgBuf);
-    RTSgBufAdvance(pSgBuf, cbData);
+    if (pSgBuf)
+    {
+        RTSgBufClone(&pIoXfer->SgBuf, pSgBuf);
+        RTSgBufAdvance(pSgBuf, cbData);
+    }
 
     return pdmBlkCacheEnqueue(pBlkCache, offStart, pIoXfer);
@@ -1574 +1577 @@
         cbAligned = cb;
         cbInEntry = cb;
-#if 0
-        /*
-         * Align the size to a 4KB boundary.
-         * Memory size is aligned to a page boundary
-         * and memory is wasted if the size is rather small.
-         * (For example reads with a size of 512 bytes).
-         */
-        cbInEntry = cb;
-        cbAligned = RT_ALIGN_Z(cb + (off - offAligned), uAlignment);
-
-        /*
-         * Clip to file size if the original request doesn't
-         * exceed the file (not an appending write)
-         */
-        uint64_t cbReq = off + cb;
-        if (cbReq >= pEndpoint->cbFile)
-            cbAligned = cbReq - offAligned;
-        else
-            cbAligned = RT_MIN(pEndpoint->cbFile - offAligned, cbAligned);
-        if (pEntryAbove)
-        {
-            Assert(pEntryAbove->Core.Key >= off);
-            cbAligned = RT_MIN(cbAligned, pEntryAbove->Core.Key - offAligned);
-        }
-#endif
     }
 
@@ -2203 +2181 @@
 {
     int rc = VINF_SUCCESS;
+    PPDMBLKCACHEREQ pReq;
 
     LogFlowFunc((": pBlkCache=%#p{%s}\n", pBlkCache, pBlkCache->pszId));
@@ -2209 +2188 @@
     pdmBlkCacheCommit(pBlkCache);
 
+    /* Allocate new request structure. */
+    pReq = pdmBlkCacheReqAlloc(0, pvUser);
+    if (RT_UNLIKELY(!pReq))
+        return VERR_NO_MEMORY;
+
+    rc = pdmBlkCacheRequestPassthrough(pBlkCache, pReq, NULL, 0, 0,
+                                       PDMBLKCACHEXFERDIR_FLUSH);
+    AssertRC(rc);
+
     LogFlowFunc((": Leave rc=%Rrc\n", rc));
-    return rc;
+    return VINF_AIO_TASK_PENDING;
 }