Changeset 32610 in vbox

Timestamp:

Sep 17, 2010 2:58:23 PM (14 years ago)

Author:

vboxsync

Message:

Storage/VMDK: some fixes to get the special streamOptimized header 100% right

File:

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

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

@@ -1419 +1419 @@
     }
     pExtent->pGD = pGD;
-    pRGD = (uint32_t *)RTMemAllocZ(cbGD);
-    if (!pRGD)
-    {
-        rc = VERR_NO_MEMORY;
-        goto out;
-    }
-    pExtent->pRGD = pRGD;
+    if (!(pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED))
+    {
+        pRGD = (uint32_t *)RTMemAllocZ(cbGD);
+        if (!pRGD)
+        {
+            rc = VERR_NO_MEMORY;
+            goto out;
+        }
+        pExtent->pRGD = pRGD;
+    }
+    else
+        pExtent->pRGD = NULL;
 
     if (uStartSector != VMDK_GD_AT_END)
     {
-        cbOverhead = RT_ALIGN_64(VMDK_SECTOR2BYTE(uStartSector) + 2 * (cbGDRounded + cbGTRounded), VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain));
-        /* For streamOptimized extents put the end-of-stream marker at the end. */
+        cbOverhead = VMDK_SECTOR2BYTE(uStartSector) + cbGDRounded + cbGTRounded;
+        /* For streamOptimized extents there is only one grain directory,
+         * and for all others take redundant grain directory into account. */
         if (pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
-            rc = vmdkFileSetSize(pImage, pExtent->pFile, cbOverhead + 512);
+        {
+            cbOverhead = RT_ALIGN_64(cbOverhead,
+                                     VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain));
+            if (pExtent->fFooter)
+                rc = vmdkFileSetSize(pImage, pExtent->pFile, cbOverhead);
+            else
+                rc = vmdkFileSetSize(pImage, pExtent->pFile, cbOverhead + 512);
+        }
         else
+        {
+            cbOverhead += cbGDRounded + cbGTRounded;
+            cbOverhead = RT_ALIGN_64(cbOverhead,
+                                     VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain));
             rc = vmdkFileSetSize(pImage, pExtent->pFile, cbOverhead);
+        }
         if (RT_FAILURE(rc))
             goto out;
@@ -1442 +1460 @@
     else
     {
-        cbOverhead =  VMDK_SECTOR2BYTE(uStartSector);
-        pExtent->uSectorRGD = uStartSector;
+        cbOverhead = 512 + pImage->cbDescAlloc;
         pExtent->uSectorGD = uStartSector;
     }
@@ -4072 +4089 @@
     rc = vmdkFileGetSize(pImage, pExtent->pFile, &uFileOffset);
     AssertRC(rc);
+    /* Align to sector, as the previous write could have been any size. */
     uFileOffset = RT_ALIGN_64(uFileOffset, 512);
 
@@ -4331 +4349 @@
 
     pExtent->enmAccess = VMDKACCESS_READONLY;
-    pExtent->fUncleanShutdown = true;
+    pExtent->fUncleanShutdown = false;
     pExtent->cNominalSectors = VMDK_BYTE2SECTOR(cbSize);
     pExtent->uSectorOffset = 0;
@@ -4445 +4463 @@
         pfnProgress(pvUser, uPercentStart + uPercentSpan * 50 / 100);
 
+    /* Now that all descriptor entries are complete, shrink it to the minimum
+     * size. It will never be changed afterwards anyway. */
+    pExtent->cDescriptorSectors = VMDK_BYTE2SECTOR(RT_ALIGN_64(  pImage->Descriptor.aLines[pImage->Descriptor.cLines]
+                                                               - pImage->Descriptor.aLines[0], 512));
     rc = vmdkWriteMetaSparseExtent(pImage, &pImage->pExtents[0], 0);
     if (RT_FAILURE(rc))
@@ -5637 +5659 @@
     /* Always return failure, to avoid opening other VMDK files via this
      * special VMDK streamOptimized format backend. */
-    rc = VERR_VD_VMDK_INVALID_HEADER;
+    rc = VERR_NOT_SUPPORTED;
 
 out:
@@ -5873 +5895 @@
     if (RT_FAILURE(rc))
         goto out;
-    if (uFileOffset % 512)
-    {
-        rc = VERR_INTERNAL_ERROR;
-        goto out;
-    }
+    /* Align to sector, as the previous write could have been any size. */
+    uFileOffset = RT_ALIGN_64(uFileOffset, 512);
 
     /* Paranoia check: extent type, grain table buffer presence and