Changeset 63150 in vbox for trunk/src/VBox

Timestamp:

Aug 8, 2016 11:34:01 AM (8 years ago)

Author:

vboxsync

Message:

Storage/VMDK: Several fixes:

1. Don't reject async I/O for VMDK images with more than one FLAT extent (ancient limitation not true anymore)
2. Fix calculation of the progress for static images with certain sizes if split into several extents. This fixes an error when creating such images with the split 2G option for certain sizes (8GB for example).
3. Don't flush the image in vmdkFreeImage if will be deleted later on anyway. Fixes debug assertion when creating an image fails

File:

• trunk/src/VBox/Storage/VMDK.cpp (modified) (3 diffs)

trunk/src/VBox/Storage/VMDK.cpp

@@ -3224 +3224 @@
             goto out;
 
-        /*
-         * We have to check for the asynchronous open flag. The
-         * extents are parsed and the type of all are known now.
-         * Check if every extent is either FLAT or ZERO.
-         */
-        if (uOpenFlags & VD_OPEN_FLAGS_ASYNC_IO)
-        {
-            unsigned cFlatExtents = 0;
-
-            for (unsigned i = 0; i < pImage->cExtents; i++)
-            {
-                pExtent = &pImage->pExtents[i];
-
-                if ((    pExtent->enmType != VMDKETYPE_FLAT
-                     &&  pExtent->enmType != VMDKETYPE_ZERO
-                     &&  pExtent->enmType != VMDKETYPE_VMFS)
-                    || ((pImage->pExtents[i].enmType == VMDKETYPE_FLAT) && (cFlatExtents > 0)))
-                {
-                    /*
-                     * Opened image contains at least one none flat or zero extent.
-                     * Return error but don't set error message as the caller
-                     * has the chance to open in non async I/O mode.
-                     */
-                    rc = VERR_NOT_SUPPORTED;
-                    goto out;
-                }
-                if (pExtent->enmType == VMDKETYPE_FLAT)
-                    cFlatExtents++;
-            }
-        }
-
         for (unsigned i = 0; i < pImage->cExtents; i++)
         {
@@ -3749 +3718 @@
         if (uImageFlags & VD_IMAGE_FLAGS_FIXED)
         {
+            unsigned uPercentEnd = uPercentStart + uPercentSpan;
             rc = vdIfIoIntFileSetAllocationSize(pImage->pIfIo, pExtent->pFile->pStorage, cbExtent,
-                                                0 /* fFlags */, pfnProgress, pvUser, uPercentStart + cbOffset * uPercentSpan / cbSize, uPercentSpan / cExtents);
+                                                0 /* fFlags */, pfnProgress, pvUser, uPercentStart + cbOffset * uPercentSpan / cbSize,
+                                                cbExtent * uPercentSpan / cbSize);
             if (RT_FAILURE(rc))
                 return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not set size of new file '%s'"), pExtent->pszFullname);
@@ -4358 +4329 @@
             }
         }
-        else
+        else if (!fDelete)
             vmdkFlushImage(pImage, NULL);