Changeset 8015 in vbox for trunk/src/VBox/Devices/Storage/VmdkHDDCore.cpp

Timestamp:

Apr 15, 2008 8:13:06 PM (17 years ago)

Author:

vboxsync

Message:

VMDK: Fix a really nasty and indirect bug when creating split sparse VMDK files. Triggered a crash later after the header inconsistency spread (though the image became never actually invalid). Also creating fixed non-split images is fixed now and fixed images are completely written to disk (no sparse file use, see VDI).

File:

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

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

@@ -1984 +1984 @@
     if (pExtent->pRGD)
     {
+        Assert(pExtent->uSectorRGD);
         Header.rgdOffset = RT_H2LE_U64(pExtent->uSectorRGD);
         Header.gdOffset = RT_H2LE_U64(pExtent->uSectorGD);
@@ -2776 +2777 @@
             RTStrFree(pszTmp);
             pExtent->pszBasename = pszBasename;
-            cbExtent = RT_MIN(cbRemaining, VMDK_2G_SPLIT_SIZE);
+            if (uImageFlags & VD_VMDK_IMAGE_FLAGS_SPLIT_2G)
+                cbExtent = RT_MIN(cbRemaining, VMDK_2G_SPLIT_SIZE);
         }
         char *pszBasedirectory = RTStrDup(pImage->pszFilename);
@@ -2798 +2800 @@
             if (VBOX_FAILURE(rc))
                 return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not set size of new file '%s'"), pExtent->pszFullname);
+
+            /* Fill image with zeroes. We do this for every fixed-size image since on some systems
+             * (for example Windows Vista), it takes ages to write a block near the end of a sparse
+             * file and the guest could complain about an ATA timeout. */
+
+            /** @todo Starting with Linux 2.6.23, there is an fallocate() system call.
+             *        Currently supported file systems are ext4 and ocfs2. */
+
+            /* Allocate a temporary zero-filled buffer. Use a bigger block size to optimize writing */
+            const size_t cbBuf = 128 * _1K;
+            void *pvBuf = RTMemTmpAllocZ(cbBuf);
+            if (!pvBuf)
+                return VERR_NO_MEMORY;
+
+            uint64_t uOff = 0;
+            /* Write data to all image blocks. */
+            while (uOff < cbExtent)
+            {
+                unsigned cbChunk = (unsigned)RT_MIN(cbExtent, cbBuf);
+
+                rc = RTFileWriteAt(pExtent->File, uOff, pvBuf, cbChunk, NULL);
+                if (VBOX_FAILURE(rc))
+                {
+                    RTMemFree(pvBuf);
+                    return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: writing block failed for '%s'"), pImage->pszFilename);
+                }
+
+                uOff += cbChunk;
+
+                if (pfnProgress)
+                {
+                    rc = pfnProgress(NULL /* WARNING! pVM=NULL  */,
+                                     uPercentStart + uOff * uPercentSpan / cbExtent,
+                                     pvUser);
+                    if (VBOX_FAILURE(rc))
+                    {
+                        RTMemFree(pvBuf);
+                        return rc;
+                    }
+                }
+            }
+            RTMemTmpFree(pvBuf);
         }
 
@@ -2834 +2878 @@
         {
             rc = vmdkCreateGrainDirectory(pExtent,
-                                            pExtent->uDescriptorSector
-                                          + pExtent->cDescriptorSectors,
+                                          RT_MAX(  pExtent->uDescriptorSector
+                                                 + pExtent->cDescriptorSectors,
+                                                 1),
                                           true);
             if (VBOX_FAILURE(rc))
@@ -3270 +3315 @@
         return VERR_OUT_OF_RANGE;
     uGTSector = pExtent->pGD[uGDIndex];
-    uRGTSector = pExtent->pRGD[uGDIndex];
+    if (pExtent->pRGD)
+        uRGTSector = pExtent->pRGD[uGDIndex];
     if (!uGTSector)
     {