Changeset 46712 in vbox

Timestamp:

Jun 20, 2013 3:40:24 PM (11 years ago)

Author:

vboxsync

Message:

Storage: Don't set the modified flag when copying images with VDCopy, fixes non sequential access assertions when exporting to OVA

File:

• trunk/src/VBox/Storage/VD.cpp (modified) (12 diffs)

trunk/src/VBox/Storage/VD.cpp

@@ -430 +430 @@
 
 /** Default flags for an I/O context, i.e. unblocked and async. */
-#define VDIOCTX_FLAGS_DEFAULT                   (0)
+#define VDIOCTX_FLAGS_DEFAULT                         (0)
 /** Flag whether the context is blocked. */
-#define VDIOCTX_FLAGS_BLOCKED          RT_BIT_32(0)
+#define VDIOCTX_FLAGS_BLOCKED                RT_BIT_32(0)
 /** Flag whether the I/O context is using synchronous I/O. */
-#define VDIOCTX_FLAGS_SYNC             RT_BIT_32(1)
+#define VDIOCTX_FLAGS_SYNC                   RT_BIT_32(1)
 /** Flag whether the read should update the cache. */
-#define VDIOCTX_FLAGS_READ_UDATE_CACHE RT_BIT_32(2)
+#define VDIOCTX_FLAGS_READ_UPDATE_CACHE      RT_BIT_32(2)
 /** Flag whether free blocks should be zeroed.
  * If false and no image has data for sepcified
@@ -444 +444 @@
  * of the range.
  */
-#define VDIOCTX_FLAGS_ZERO_FREE_BLOCKS RT_BIT_32(3)
+#define VDIOCTX_FLAGS_ZERO_FREE_BLOCKS       RT_BIT_32(3)
 /** Don't free the I/O context when complete because
  * it was alloacted elsewhere (stack, ...). */
-#define VDIOCTX_FLAGS_DONT_FREE        RT_BIT_32(4)
+#define VDIOCTX_FLAGS_DONT_FREE              RT_BIT_32(4)
+/* Don't set the modified flag for this I/O context when writing. */
+#define VDIOCTX_FLAGS_DONT_SET_MODIFIED_FLAG RT_BIT_32(5)
 
 /** NIL I/O context pointer value. */
@@ -1776 +1778 @@
                 /* If the read was successful, write the data back into the cache. */
                 if (   RT_SUCCESS(rc)
-                    && pIoCtx->fFlags & VDIOCTX_FLAGS_READ_UDATE_CACHE)
+                    && pIoCtx->fFlags & VDIOCTX_FLAGS_READ_UPDATE_CACHE)
                 {
                     rc = vdCacheWriteHelper(pDisk->pCache, uOffset, cbThisRead,
@@ -1950 +1952 @@
         fFlags |= VDIOCTX_FLAGS_ZERO_FREE_BLOCKS;
     if (fUpdateCache)
-        fFlags |= VDIOCTX_FLAGS_READ_UDATE_CACHE;
+        fFlags |= VDIOCTX_FLAGS_READ_UPDATE_CACHE;
 
     Segment.pvSeg = pvBuf;
@@ -2032 +2034 @@
                            PVDIMAGE pImageParentOverride, uint64_t uOffset,
                            const void *pvBuf, size_t cbWrite,
-                           bool fUpdateCache, unsigned cImagesRead)
-{
-    uint32_t fFlags = VDIOCTX_FLAGS_SYNC | VDIOCTX_FLAGS_DONT_FREE;
+                           uint32_t fFlags, unsigned cImagesRead)
+{
     RTSGSEG Segment;
     RTSGBUF SgBuf;
     VDIOCTX IoCtx;
 
-    if (fUpdateCache)
-        fFlags |= VDIOCTX_FLAGS_READ_UDATE_CACHE;
+    fFlags |= VDIOCTX_FLAGS_SYNC | VDIOCTX_FLAGS_DONT_FREE;
 
     Segment.pvSeg = (void *)pvBuf;
@@ -2062 +2062 @@
  */
 static int vdWriteHelper(PVBOXHDD pDisk, PVDIMAGE pImage, uint64_t uOffset,
-                         const void *pvBuf, size_t cbWrite, bool fUpdateCache)
+                         const void *pvBuf, size_t cbWrite, uint32_t fFlags)
 {
     return vdWriteHelperEx(pDisk, pImage, NULL, uOffset, pvBuf, cbWrite,
-                           fUpdateCache, 0);
+                           fFlags, 0);
 }
 
@@ -2163 +2163 @@
             /* Only do collapsed I/O if we are copying the data blockwise. */
             rc = vdWriteHelperEx(pDiskTo, pDiskTo->pLast, NULL, uOffset, pvBuf,
-                                 cbThisRead, false /* fUpdateCache */,
+                                 cbThisRead, VDIOCTX_FLAGS_DONT_SET_MODIFIED_FLAG /* fFlags */,
                                  fBlockwiseCopy ? cImagesToRead : 0);
             if (RT_FAILURE(rc))
@@ -2618 +2618 @@
     size_t cbPreRead, cbPostRead;
 
-    rc = vdSetModifiedFlagAsync(pDisk, pIoCtx);
-    if (RT_FAILURE(rc)) /* Includes I/O in progress. */
-        return rc;
+    if (!(pIoCtx->fFlags & VDIOCTX_FLAGS_DONT_SET_MODIFIED_FLAG))
+    {
+        rc = vdSetModifiedFlagAsync(pDisk, pIoCtx);
+        if (RT_FAILURE(rc)) /* Includes I/O in progress. */
+            return rc;
+    }
 
     rc = vdDiscardSetRangeAllocated(pDisk, uOffset, cbWrite);
@@ -6786 +6789 @@
                         rc = vdWriteHelperEx(pDisk, pImageTo, pImageFrom->pPrev,
                                              uOffset, pvBuf, cbThisRead,
-                                             true /* fUpdateCache */, 0);
+                                             VDIOCTX_FLAGS_READ_UPDATE_CACHE, 0);
                         if (RT_FAILURE(rc))
                             break;
@@ -6910 +6913 @@
                         break;
                     rc = vdWriteHelper(pDisk, pImageTo, uOffset, pvBuf,
-                                       cbThisRead, true /* fUpdateCache */);
+                                       cbThisRead, VDIOCTX_FLAGS_READ_UPDATE_CACHE);
                     if (RT_FAILURE(rc))
                         break;
@@ -8042 +8045 @@
         vdSetModifiedFlag(pDisk);
         rc = vdWriteHelper(pDisk, pImage, uOffset, pvBuf, cbWrite,
-                           true /* fUpdateCache */);
+                           VDIOCTX_FLAGS_READ_UPDATE_CACHE);
         if (RT_FAILURE(rc))
             break;
@@ -8056 +8059 @@
         if (RT_UNLIKELY(pDisk->pImageRelay))
             rc = vdWriteHelper(pDisk, pDisk->pImageRelay, uOffset,
-                               pvBuf, cbWrite, false /* fUpdateCache */);
+                               pvBuf, cbWrite, VDIOCTX_FLAGS_DEFAULT);
     } while (0);