Changeset 39798 in vbox for trunk/src/VBox

Timestamp:

Jan 18, 2012 4:55:06 PM (13 years ago)

Author:

vboxsync

Message:

VD: Add option to ignore flush requests

File:

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

trunk/src/VBox/Storage/VD.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2011 Oracle Corporation
+ * Copyright (C) 2006-2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -87 +87 @@
     /** Disk this image is part of */
     PVBOXHDD            pDisk;
+    /** Flag whether to ignore flush requests. */
+    bool                fIgnoreFlush;
 } VDIO, *PVDIO;
 
@@ -3944 +3946 @@
 static int vdIOIntFlushSync(void *pvUser, PVDIOSTORAGE pIoStorage)
 {
+    int rc = VINF_SUCCESS;
     PVDIO pVDIo = (PVDIO)pvUser;
-    return pVDIo->pInterfaceIo->pfnFlushSync(pVDIo->pInterfaceIo->Core.pvUser,
-                                             pIoStorage->pStorage);
+
+    if (!pVDIo->fIgnoreFlush)
+        rc = pVDIo->pInterfaceIo->pfnFlushSync(pVDIo->pInterfaceIo->Core.pvUser,
+                                               pIoStorage->pStorage);
+
+    return rc;
 }
 
@@ -4323 +4330 @@
     LogFlowFunc(("pvUser=%#p pIoStorage=%#p pIoCtx=%#p\n",
                  pvUser, pIoStorage, pIoCtx));
+
+    if (pVDIo->fIgnoreFlush)
+        return VINF_SUCCESS;
 
     /* Allocate a new meta transfer. */
@@ -5221 +5231 @@
         AssertRC(rc);
 
-        pImage->uOpenFlags = uOpenFlags & (VD_OPEN_FLAGS_HONOR_SAME | VD_OPEN_FLAGS_DISCARD);
+        pImage->uOpenFlags = uOpenFlags & (VD_OPEN_FLAGS_HONOR_SAME | VD_OPEN_FLAGS_DISCARD | VD_OPEN_FLAGS_IGNORE_FLUSH);
         rc = pImage->Backend->pfnOpen(pImage->pszFilename,
-                                      uOpenFlags & ~VD_OPEN_FLAGS_HONOR_SAME,
+                                      uOpenFlags & ~(VD_OPEN_FLAGS_HONOR_SAME | VD_OPEN_FLAGS_IGNORE_FLUSH),
                                       pDisk->pVDIfsDisk,
                                       pImage->pVDIfsImage,
@@ -5258 +5268 @@
 
         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
@@ -5749 +5760 @@
         {
             pImage->VDIo.pBackendData = pImage->pBackendData;
+            pImage->VDIo.fIgnoreFlush = (uOpenFlags & VD_OPEN_FLAGS_IGNORE_FLUSH) != 0;
             pImage->uImageFlags = uImageFlags;
 
@@ -6025 +6037 @@
         {
             pImage->VDIo.pBackendData = pImage->pBackendData;
+            pImage->VDIo.fIgnoreFlush = (uOpenFlags & VD_OPEN_FLAGS_IGNORE_FLUSH) != 0;
             pImage->uImageFlags = uImageFlags;
 
@@ -6276 +6289 @@
 
             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