Changeset 33745 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Nov 3, 2010 6:31:53 PM (14 years ago)

Author:

vboxsync

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

67377

Message:

VCI: Updates

File:

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

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

@@ -188 +188 @@
     /** Bandwidth group the disk is assigned to. */
     char               *pszBwGroup;
+
+    /** I/O interface for a cache image. */
+    VDINTERFACE         VDIIOCache;
+    /** Interface list for the cache image. */
+    PVDINTERFACE        pVDIfsCache;
 } VBOXDISK, *PVBOXDISK;
 
@@ -1931 +1936 @@
     PVBOXDISK pThis = PDMINS_2_DATA(pDrvIns, PVBOXDISK);
     int rc = VINF_SUCCESS;
-    char *pszName = NULL;   /**< The path of the disk image file. */
-    char *pszFormat = NULL; /**< The format backed to use for this image. */
-    bool fReadOnly;         /**< True if the media is read-only. */
-    bool fMaybeReadOnly;    /**< True if the media may or may not be read-only. */
-    bool fHonorZeroWrites;  /**< True if zero blocks should be written. */
+    char *pszName = NULL;        /**< The path of the disk image file. */
+    char *pszFormat = NULL;      /**< The format backed to use for this image. */
+    char *pszCachePath = NULL;   /**< The path to the cache image. */
+    char *pszCacheFormat = NULL; /**< The format backend to use for the cache image. */
+    bool fReadOnly;              /**< True if the media is read-only. */
+    bool fMaybeReadOnly;         /**< True if the media may or may not be read-only. */
+    bool fHonorZeroWrites;       /**< True if zero blocks should be written. */
     PDMDRV_CHECK_VERSIONS_RETURN(pDrvIns);
 
@@ -2018 +2025 @@
                                           "ReadOnly\0MaybeReadOnly\0TempReadOnly\0Shareable\0HonorZeroWrites\0"
                                           "HostIPStack\0UseNewIo\0BootAcceleration\0BootAccelerationBuffer\0"
-                                          "SetupMerge\0MergeSource\0MergeTarget\0BwGroup\0Type\0");
+                                          "SetupMerge\0MergeSource\0MergeTarget\0BwGroup\0Type\0"
+                                          "CachePath\0CacheFormat\0");
         }
         else
@@ -2155 +2163 @@
             }
             MMR3HeapFree(psz); psz = NULL;
+
+            rc = CFGMR3QueryStringAlloc(pCurNode, "CachePath", &pszCachePath);
+            if (RT_FAILURE(rc) && rc != VERR_CFGM_VALUE_NOT_FOUND)
+            {
+                rc = PDMDRV_SET_ERROR(pDrvIns, rc,
+                                      N_("DrvVD: Configuration error: Querying \"CachePath\" as string failed"));
+                break;
+            }
+            else
+                rc = VINF_SUCCESS;
+
+            if (pszCachePath)
+            {
+                rc = CFGMR3QueryStringAlloc(pCurNode, "CacheFormat", &pszCacheFormat);
+                if (RT_FAILURE(rc))
+                {
+                    rc = PDMDRV_SET_ERROR(pDrvIns, rc,
+                                          N_("DrvVD: Configuration error: Querying \"CacheFormat\" as string failed"));
+                    break;
+                }
+            }
         }
 
@@ -2456 +2485 @@
         pCurNode = CFGMR3GetParent(pCurNode);
     }
+
+    /* Open the cache image if set. */
+    if (   RT_SUCCESS(rc)
+        && VALID_PTR(pszCachePath))
+    {
+        /* Insert the custom I/O interface only if we're told to use new IO.
+         * Since the I/O interface is per image we could make this more
+         * flexible in the future if we want to. */
+        if (fUseNewIo)
+        {
+            rc = VDInterfaceAdd(&pThis->VDIIOCache, "DrvVD_IO", VDINTERFACETYPE_IO,
+                                &pThis->VDIIOCallbacks, pThis,
+                                &pThis->pVDIfsCache);
+            AssertRC(rc);
+        }
+
+        rc = VDCacheOpen(pThis->pDisk, pszCacheFormat, pszCachePath, VD_OPEN_FLAGS_NORMAL, pThis->pVDIfsCache);
+        if (RT_FAILURE(rc))
+            rc = PDMDRV_SET_ERROR(pDrvIns, rc, N_("DrvVD: Could not open cache image"));
+    }
+
+    if (VALID_PTR(pszCachePath))
+        MMR3HeapFree(pszCachePath);
+    if (VALID_PTR(pszCacheFormat))
+        MMR3HeapFree(pszCacheFormat);
 
     if (   RT_SUCCESS(rc)