Changeset 40680 in vbox for trunk/src/VBox

Timestamp:

Mar 28, 2012 1:19:24 PM (13 years ago)

Author:

vboxsync

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

77131

Message:

Storage/VD: Fix more places to properly handle the ignore flush flag during opening and creating images

File:

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

trunk/src/VBox/Storage/VD.cpp

@@ -5426 +5426 @@
 
         pImage->uOpenFlags = uOpenFlags & (VD_OPEN_FLAGS_HONOR_SAME | VD_OPEN_FLAGS_DISCARD | VD_OPEN_FLAGS_IGNORE_FLUSH);
+        pImage->VDIo.fIgnoreFlush = (uOpenFlags & VD_OPEN_FLAGS_IGNORE_FLUSH) != 0;
         rc = pImage->Backend->pfnOpen(pImage->pszFilename,
                                       uOpenFlags & ~(VD_OPEN_FLAGS_HONOR_SAME | VD_OPEN_FLAGS_IGNORE_FLUSH),
@@ -5462 +5463 @@
 
         pImage->VDIo.pBackendData = pImage->pBackendData;
-        pImage->VDIo.fIgnoreFlush = (uOpenFlags & VD_OPEN_FLAGS_IGNORE_FLUSH) != 0;
 
         /* Check image type. As the image itself has only partial knowledge
@@ -6216 +6216 @@
 
         pImage->uOpenFlags = uOpenFlags & VD_OPEN_FLAGS_HONOR_SAME;
+        pImage->VDIo.fIgnoreFlush = (uOpenFlags & VD_OPEN_FLAGS_IGNORE_FLUSH) != 0;
         uImageFlags |= VD_IMAGE_FLAGS_DIFF;
         rc = pImage->Backend->pfnCreate(pImage->pszFilename, pDisk->cbSize,
@@ -6231 +6232 @@
         {
             pImage->VDIo.pBackendData = pImage->pBackendData;
-            pImage->VDIo.fIgnoreFlush = (uOpenFlags & VD_OPEN_FLAGS_IGNORE_FLUSH) != 0;
             pImage->uImageFlags = uImageFlags;
 
@@ -6465 +6465 @@
 
         pCache->uOpenFlags = uOpenFlags & VD_OPEN_FLAGS_HONOR_SAME;
+        pCache->VDIo.fIgnoreFlush = (uOpenFlags & VD_OPEN_FLAGS_IGNORE_FLUSH) != 0;
         rc = pCache->Backend->pfnCreate(pCache->pszFilename, cbSize,
                                         uImageFlags,
@@ -6483 +6484 @@
 
             pCache->VDIo.pBackendData = pCache->pBackendData;
-            pCache->VDIo.fIgnoreFlush = (uOpenFlags & VD_OPEN_FLAGS_IGNORE_FLUSH) != 0;
 
             /* Re-check state, as the lock wasn't held and another image