Changeset 97839 in vbox for trunk/src/VBox/Storage

Timestamp:

Dec 20, 2022 9:48:25 AM (2 years ago)

Author:

vboxsync

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

154925

Message:

undo. bugref:8707

Location:

trunk/src/VBox/Storage

Files:

• VMDK.cpp (modified) (470 diffs)
• testcase/tstVDIo.cpp (modified) (4 diffs)
• testcase/tstVDResize.vd (modified) (1 diff)

trunk/src/VBox/Storage/VMDK.cpp

@@ -3 +3 @@
  * VMDK disk image, core code.
  */
+
 /*
  * Copyright (C) 2006-2022 Oracle and/or its affiliates.
@@ -33 +34 @@
 #include <VBox/vd-plugin.h>
 #include <VBox/err.h>
+
 #include <iprt/assert.h>
 #include <iprt/alloc.h>
@@ -92 +94 @@
 # define DKIOCUNLOCKPHYSICALEXTENTS _IO(  'd', 83)
 #endif /* RT_OS_DARWIN */
+
 #include "VDBackends.h"
 
@@ -98 +101 @@
 *   Constants And Macros, Structures and Typedefs                                                                                *
 *********************************************************************************************************************************/
+
 /** Maximum encoded string size (including NUL) we allow for VMDK images.
  * Deliberately not set high to avoid running out of descriptor space. */
 #define VMDK_ENCODED_COMMENT_MAX 1024
+
 /** VMDK descriptor DDB entry for PCHS cylinders. */
 #define VMDK_DDB_GEO_PCHS_CYLINDERS "ddb.geometry.cylinders"
+
 /** VMDK descriptor DDB entry for PCHS heads. */
 #define VMDK_DDB_GEO_PCHS_HEADS "ddb.geometry.heads"
+
 /** VMDK descriptor DDB entry for PCHS sectors. */
 #define VMDK_DDB_GEO_PCHS_SECTORS "ddb.geometry.sectors"
+
 /** VMDK descriptor DDB entry for LCHS cylinders. */
 #define VMDK_DDB_GEO_LCHS_CYLINDERS "ddb.geometry.biosCylinders"
+
 /** VMDK descriptor DDB entry for LCHS heads. */
 #define VMDK_DDB_GEO_LCHS_HEADS "ddb.geometry.biosHeads"
+
 /** VMDK descriptor DDB entry for LCHS sectors. */
 #define VMDK_DDB_GEO_LCHS_SECTORS "ddb.geometry.biosSectors"
+
 /** VMDK descriptor DDB entry for image UUID. */
 #define VMDK_DDB_IMAGE_UUID "ddb.uuid.image"
+
 /** VMDK descriptor DDB entry for image modification UUID. */
 #define VMDK_DDB_MODIFICATION_UUID "ddb.uuid.modification"
+
 /** VMDK descriptor DDB entry for parent image UUID. */
 #define VMDK_DDB_PARENT_UUID "ddb.uuid.parent"
+
 /** VMDK descriptor DDB entry for parent image modification UUID. */
 #define VMDK_DDB_PARENT_MODIFICATION_UUID "ddb.uuid.parentmodification"
+
 /** No compression for streamOptimized files. */
 #define VMDK_COMPRESSION_NONE 0
+
 /** Deflate compression for streamOptimized files. */
 #define VMDK_COMPRESSION_DEFLATE 1
+
 /** Marker that the actual GD value is stored in the footer. */
 #define VMDK_GD_AT_END 0xffffffffffffffffULL
+
 /** Marker for end-of-stream in streamOptimized images. */
 #define VMDK_MARKER_EOS 0
+
 /** Marker for grain table block in streamOptimized images. */
 #define VMDK_MARKER_GT 1
+
 /** Marker for grain directory block in streamOptimized images. */
 #define VMDK_MARKER_GD 2
+
 /** Marker for footer in streamOptimized images. */
 #define VMDK_MARKER_FOOTER 3
+
 /** Marker for unknown purpose in streamOptimized images.
  * Shows up in very recent images created by vSphere, but only sporadically.
  * They "forgot" to document that one in the VMDK specification. */
 #define VMDK_MARKER_UNSPECIFIED 4
+
 /** Dummy marker for "don't check the marker value". */
 #define VMDK_MARKER_IGNORE 0xffffffffU
+
 /**
  * Magic number for hosted images created by VMware Workstation 4, VMware
@@ -146 +170 @@
  */
 #define VMDK_SPARSE_MAGICNUMBER 0x564d444b /* 'V' 'M' 'D' 'K' */
+
 /** VMDK sector size in bytes. */
 #define VMDK_SECTOR_SIZE 512
@@ -154 +179 @@
 /** Grain table size in bytes */
 #define VMDK_GRAIN_TABLE_SIZE 2048
+
 /**
  * VMDK hosted binary extent header. The "Sparse" is a total misnomer, as
@@ -181 +207 @@
 } SparseExtentHeader;
 #pragma pack()
+
 /** The maximum allowed descriptor size in the extent header in sectors. */
 #define VMDK_SPARSE_DESCRIPTOR_SIZE_MAX UINT64_C(20480) /* 10MB */
+
 /** VMDK capacity for a single chunk when 2G splitting is turned on. Should be
  * divisible by the default grain size (64K) */
 #define VMDK_2G_SPLIT_SIZE (2047 * 1024 * 1024)
+
 /** VMDK streamOptimized file format marker. The type field may or may not
  * be actually valid, but there's always data to read there. */
@@ -196 +225 @@
 } VMDKMARKER, *PVMDKMARKER;
 #pragma pack()
+
+
 /** Convert sector number/size to byte offset/size. */
 #define VMDK_SECTOR2BYTE(u) ((uint64_t)(u) << 9)
+
 /** Convert byte offset/size to sector number/size. */
 #define VMDK_BYTE2SECTOR(u) ((u) >> 9)
+
 /**
  * VMDK extent type.
@@ -214 +247 @@
     VMDKETYPE_VMFS
 } VMDKETYPE, *PVMDKETYPE;
+
 /**
  * VMDK access type for a extent.
@@ -226 +260 @@
     VMDKACCESS_READWRITE
 } VMDKACCESS, *PVMDKACCESS;
+
 /** Forward declaration for PVMDKIMAGE. */
 typedef struct VMDKIMAGE *PVMDKIMAGE;
+
 /**
  * Extents files entry. Used for opening a particular file only once.
@@ -252 +288 @@
     struct VMDKFILE *pPrev;
 } VMDKFILE, *PVMDKFILE;
+
 /**
  * VMDK extent data structure.
@@ -332 +369 @@
     struct VMDKIMAGE *pImage;
 } VMDKEXTENT, *PVMDKEXTENT;
+
 /**
  * Grain table cache size. Allocated per image.
  */
 #define VMDK_GT_CACHE_SIZE 256
+
 /**
  * Grain table block size. Smaller than an actual grain table block to allow
@@ -342 +381 @@
  */
 #define VMDK_GT_CACHELINE_SIZE 128
+
+
 /**
  * Maximum number of lines in a descriptor file. Not worth the effort of
@@ -349 +390 @@
  */
 #define VMDK_DESCRIPTOR_LINES_MAX   1100U
+
 /**
  * Parsed descriptor information. Allows easy access and update of the
@@ -372 +414 @@
     unsigned    aNextLines[VMDK_DESCRIPTOR_LINES_MAX];
 } VMDKDESCRIPTOR, *PVMDKDESCRIPTOR;
+
+
 /**
  * Cache entry for translating extent/sector to a sector number in that
@@ -385 +429 @@
     uint32_t    aGTData[VMDK_GT_CACHELINE_SIZE];
 } VMDKGTCACHEENTRY, *PVMDKGTCACHEENTRY;
+
 /**
  * Cache data structure for blocks of grain table entries. For now this is a
@@ -398 +443 @@
     unsigned            cEntries;
 } VMDKGTCACHE, *PVMDKGTCACHE;
+
 /**
  * Complete VMDK image data structure. Mainly a collection of extents and a few
@@ -408 +454 @@
     /** Descriptor file if applicable. */
     PVMDKFILE         pFile;
+
     /** Pointer to the per-disk VD interface list. */
     PVDINTERFACE      pVDIfsDisk;
     /** Pointer to the per-image VD interface list. */
     PVDINTERFACE      pVDIfsImage;
+
     /** Error interface. */
     PVDINTERFACEERROR pIfError;
     /** I/O interface. */
     PVDINTERFACEIOINT pIfIo;
+
+
     /** Pointer to the image extents. */
     PVMDKEXTENT     pExtents;
@@ -423 +473 @@
      * times only once (happens mainly with raw partition access). */
     PVMDKFILE       pFiles;
+
     /**
      * Pointer to an array of segment entries for async I/O.
@@ -432 +483 @@
     /** Entries available in the segments array. */
     unsigned        cSegments;
+
     /** Open flags passed by VBoxHD layer. */
     unsigned        uOpenFlags;
@@ -450 +502 @@
     /** Parent image modification UUID. */
     RTUUID          ParentModificationUuid;
+
     /** Pointer to grain table cache, if this image contains sparse extents. */
     PVMDKGTCACHE    pGTCache;
@@ -461 +514 @@
     VDREGIONLIST    RegionList;
 } VMDKIMAGE;
+
+
 /** State for the input/output callout of the inflate reader/deflate writer. */
 typedef struct VMDKCOMPRESSIO
@@ -473 +528 @@
     void *pvCompGrain;
 } VMDKCOMPRESSIO;
+
+
 /** Tracks async grain allocation. */
 typedef struct VMDKGRAINALLOCASYNC
@@ -494 +551 @@
     uint64_t    uRGTSector;
 } VMDKGRAINALLOCASYNC, *PVMDKGRAINALLOCASYNC;
+
 /**
  * State information for vmdkRename() and helpers.
@@ -536 +594 @@
 *   Static Variables                                                                                                             *
 *********************************************************************************************************************************/
+
 /** NULL-terminated array of supported file extensions. */
 static const VDFILEEXTENSION s_aVmdkFileExtensions[] =
@@ -542 +601 @@
     {NULL, VDTYPE_INVALID}
 };
+
 /** NULL-terminated array of configuration option. */
 static const VDCONFIGINFO s_aVmdkConfigInfo[] =
@@ -550 +610 @@
     { "BootSector",                     NULL,                             VDCFGVALUETYPE_BYTES,        0 },
     { "Relative",                       NULL,                             VDCFGVALUETYPE_INTEGER,      0 },
+
     /* End of options list */
     { NULL,                             NULL,                             VDCFGVALUETYPE_INTEGER,      0 }
@@ -558 +619 @@
 *   Internal Functions                                                                                                           *
 *********************************************************************************************************************************/
+
 static void vmdkFreeStreamBuffers(PVMDKEXTENT pExtent);
 static int vmdkFreeExtentData(PVMDKIMAGE pImage, PVMDKEXTENT pExtent,
                               bool fDelete);
+
 static int vmdkCreateExtents(PVMDKIMAGE pImage, unsigned cExtents);
 static int vmdkFlushImage(PVMDKIMAGE pImage, PVDIOCTX pIoCtx);
 static int vmdkSetImageComment(PVMDKIMAGE pImage, const char *pszComment);
 static int vmdkFreeImage(PVMDKIMAGE pImage, bool fDelete, bool fFlush);
+
 static DECLCALLBACK(int) vmdkAllocGrainComplete(void *pBackendData, PVDIOCTX pIoCtx,
                                                 void *pvUser, int rcReq);
+
 /**
  * Internal: open a file (using a file descriptor cache to ensure each file
@@ -576 +641 @@
     int rc = VINF_SUCCESS;
     PVMDKFILE pVmdkFile;
+
     for (pVmdkFile = pImage->pFiles;
          pVmdkFile != NULL;
@@ -584 +650 @@
             Assert(fOpen == pVmdkFile->fOpen);
             pVmdkFile->uReferences++;
+
             *ppVmdkFile = pVmdkFile;
+
             return rc;
         }
     }
+
     /* If we get here, there's no matching entry in the cache. */
     pVmdkFile = (PVMDKFILE)RTMemAllocZ(sizeof(VMDKFILE));
@@ -595 +664 @@
         return VERR_NO_MEMORY;
     }
+
     pVmdkFile->pszFilename = RTStrDup(pszFilename);
     if (!pVmdkFile->pszFilename)
@@ -602 +672 @@
         return VERR_NO_MEMORY;
     }
+
     if (pszBasename)
     {
@@ -613 +684 @@
         }
     }
+
     pVmdkFile->fOpen = fOpen;
+
     rc = vdIfIoIntFileOpen(pImage->pIfIo, pszFilename, fOpen,
                            &pVmdkFile->pStorage);
@@ -632 +705 @@
         *ppVmdkFile = NULL;
     }
+
     return rc;
 }
+
 /**
  * Internal: close a file, updating the file descriptor cache.
@@ -641 +716 @@
     int rc = VINF_SUCCESS;
     PVMDKFILE pVmdkFile = *ppVmdkFile;
+
     AssertPtr(pVmdkFile);
+
     pVmdkFile->fDelete |= fDelete;
     Assert(pVmdkFile->uReferences);
@@ -649 +726 @@
         PVMDKFILE pPrev;
         PVMDKFILE pNext;
+
         /* Unchain the element from the list. */
         pPrev = pVmdkFile->pPrev;
         pNext = pVmdkFile->pNext;
+
         if (pNext)
             pNext->pPrev = pPrev;
@@ -658 +737 @@
         else
             pImage->pFiles = pNext;
+
         rc = vdIfIoIntFileClose(pImage->pIfIo, pVmdkFile->pStorage);
+
         bool fFileDel = pVmdkFile->fDelete;
         if (   pVmdkFile->pszBasename
@@ -671 +752 @@
                 fFileDel = false;
         }
+
         if (fFileDel)
         {
@@ -684 +766 @@
         RTMemFree(pVmdkFile);
     }
+
     *ppVmdkFile = NULL;
     return rc;
 }
+
 /*#define VMDK_USE_BLOCK_DECOMP_API - test and enable */
 #ifndef VMDK_USE_BLOCK_DECOMP_API
@@ -693 +777 @@
     VMDKCOMPRESSIO *pInflateState = (VMDKCOMPRESSIO *)pvUser;
     size_t cbInjected = 0;
+
     Assert(cbBuf);
     if (pInflateState->iOffset < 0)
@@ -718 +803 @@
 }
 #endif
+
 /**
  * Internal: read from a file and inflate the compressed data,
@@ -733 +819 @@
     VMDKMARKER *pMarker = (VMDKMARKER *)pExtent->pvCompGrain;
     size_t cbCompSize, cbActuallyRead;
+
     if (!pcvMarker)
     {
@@ -747 +834 @@
         pMarker->cbSize = RT_H2LE_U32(pMarker->cbSize);
     }
+
     cbCompSize = RT_LE2H_U32(pMarker->cbSize);
     if (cbCompSize == 0)
@@ -753 +841 @@
         return VERR_VD_VMDK_INVALID_FORMAT;
     }
+
     /* Sanity check - the expansion ratio should be much less than 2. */
     Assert(cbCompSize < 2 * cbToRead);
     if (cbCompSize >= 2 * cbToRead)
         return VERR_VD_VMDK_INVALID_FORMAT;
+
     /* Compressed grain marker. Data follows immediately. */
     rc = vdIfIoIntFileReadSync(pImage->pIfIo, pExtent->pFile->pStorage,
@@ -766 +856 @@
                                           512)
                                - RT_UOFFSETOF(VMDKMARKER, uType));
+
     if (puLBA)
         *puLBA = RT_LE2H_U64(pMarker->uSector);
@@ -772 +863 @@
                                   + RT_UOFFSETOF(VMDKMARKER, uType),
                                   512);
+
 #ifdef VMDK_USE_BLOCK_DECOMP_API
     rc = RTZipBlockDecompress(RTZIPTYPE_ZLIB, 0 /*fFlags*/,
@@ -782 +874 @@
     InflateState.cbCompGrain = cbCompSize + RT_UOFFSETOF(VMDKMARKER, uType);
     InflateState.pvCompGrain = pExtent->pvCompGrain;
+
     rc = RTZipDecompCreate(&pZip, &InflateState, vmdkFileInflateHelper);
     if (RT_FAILURE(rc))
@@ -798 +891 @@
     return rc;
 }
+
 static DECLCALLBACK(int) vmdkFileDeflateHelper(void *pvUser, const void *pvBuf, size_t cbBuf)
 {
     VMDKCOMPRESSIO *pDeflateState = (VMDKCOMPRESSIO *)pvUser;
+
     Assert(cbBuf);
     if (pDeflateState->iOffset < 0)
@@ -817 +912 @@
     return VINF_SUCCESS;
 }
+
 /**
  * Internal: deflate the uncompressed data and write to a file,
@@ -829 +925 @@
     PRTZIPCOMP pZip = NULL;
     VMDKCOMPRESSIO DeflateState;
+
     DeflateState.pImage = pImage;
     DeflateState.iOffset = -1;
     DeflateState.cbCompGrain = pExtent->cbCompGrain;
     DeflateState.pvCompGrain = pExtent->pvCompGrain;
+
     rc = RTZipCompCreate(&pZip, &DeflateState, vmdkFileDeflateHelper,
                          RTZIPTYPE_ZLIB, RTZIPLEVEL_DEFAULT);
@@ -845 +943 @@
         Assert(   DeflateState.iOffset > 0
                && (size_t)DeflateState.iOffset <= DeflateState.cbCompGrain);
+
         /* pad with zeroes to get to a full sector size */
         uint32_t uSize = DeflateState.iOffset;
@@ -854 +953 @@
             uSize = uSizeAlign;
         }
+
         if (pcbMarkerData)
             *pcbMarkerData = uSize;
+
         /* Compressed grain marker. Data follows immediately. */
         VMDKMARKER *pMarker = (VMDKMARKER *)pExtent->pvCompGrain;
@@ -868 +969 @@
     return rc;
 }
+
+
 /**
  * Internal: check if all files are closed, prevent leaking resources.
@@ -875 +978 @@
     int rc = VINF_SUCCESS, rc2;
     PVMDKFILE pVmdkFile;
+
     Assert(pImage->pFiles == NULL);
     for (pVmdkFile = pImage->pFiles;
@@ -883 +987 @@
                 pVmdkFile->pszFilename));
         pImage->pFiles = pVmdkFile->pNext;
+
         rc2 = vmdkFileClose(pImage, &pVmdkFile, pVmdkFile->fDelete);
+
         if (RT_SUCCESS(rc))
             rc = rc2;
@@ -889 +995 @@
     return rc;
 }
+
 /**
  * Internal: truncate a string (at a UTF8 code point boundary) and encode the
@@ -897 +1004 @@
     char szEnc[VMDK_ENCODED_COMMENT_MAX + 3];
     char *pszDst = szEnc;
+
     AssertPtr(psz);
+
     for (; *psz; psz = RTStrNextCp(psz))
     {
@@ -928 +1037 @@
     return RTStrDup(szEnc);
 }
+
 /**
  * Internal: decode a string and store it into the specified string.
@@ -935 +1045 @@
     int rc = VINF_SUCCESS;
     char szBuf[4];
+
     if (!cb)
         return VERR_BUFFER_OVERFLOW;
+
     AssertPtr(psz);
+
     for (; *pszEncoded; pszEncoded = RTStrNextCp(pszEncoded))
     {
@@ -960 +1073 @@
         else
             pszDst = RTStrPutCp(pszDst, Cp);
+
         /* Need to leave space for terminating NUL. */
         if ((size_t)(pszDst - szBuf) + 1 >= cb)
@@ -972 +1086 @@
     return rc;
 }
+
 /**
  * Internal: free all buffers associated with grain directories.
@@ -988 +1103 @@
     }
 }
+
 /**
  * Internal: allocate the compressed/uncompressed buffers for streamOptimized
@@ -995 +1111 @@
 {
     int rc = VINF_SUCCESS;
+
     if (pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
     {
@@ -1013 +1130 @@
             rc = VERR_NO_MEMORY;
     }
+
     if (RT_FAILURE(rc))
         vmdkFreeStreamBuffers(pExtent);
     return rc;
 }
+
 /**
  * Internal: allocate all buffers associated with grain directories.
@@ -1025 +1144 @@
     int rc = VINF_SUCCESS;
     size_t cbGD = pExtent->cGDEntries * sizeof(uint32_t);
+
     pExtent->pGD = (uint32_t *)RTMemAllocZ(cbGD);
     if (RT_LIKELY(pExtent->pGD))
@@ -1037 +1157 @@
     else
         rc = VERR_NO_MEMORY;
+
     if (RT_FAILURE(rc))
         vmdkFreeGrainDirectory(pExtent);
     return rc;
 }
+
 /**
  * Converts the grain directory from little to host endianess.
@@ -1051 +1173 @@
 {
     uint32_t *pGDTmp = pGD;
+
     for (uint32_t i = 0; i < cGDEntries; i++, pGDTmp++)
         *pGDTmp = RT_LE2H_U32(*pGDTmp);
 }
+
 /**
  * Read the grain directory and allocated grain tables verifying them against
@@ -1066 +1190 @@
     int rc = VINF_SUCCESS;
     size_t cbGD = pExtent->cGDEntries * sizeof(uint32_t);
+
     AssertReturn((   pExtent->enmType == VMDKETYPE_HOSTED_SPARSE
                   && pExtent->uSectorGD != VMDK_GD_AT_END
                   && pExtent->uSectorRGD != VMDK_GD_AT_END), VERR_INTERNAL_ERROR);
+
     rc = vmdkAllocGrainDirectory(pImage, pExtent);
     if (RT_SUCCESS(rc))
@@ -1080 +1206 @@
         {
             vmdkGrainDirectoryConvToHost(pExtent->pGD, pExtent->cGDEntries);
+
             if (   pExtent->uSectorRGD
                 && !(pImage->uOpenFlags & VD_OPEN_FLAGS_SKIP_CONSISTENCY_CHECKS))
@@ -1091 +1218 @@
                 {
                     vmdkGrainDirectoryConvToHost(pExtent->pRGD, pExtent->cGDEntries);
+
                     /* Check grain table and redundant grain table for consistency. */
                     size_t cbGT = pExtent->cGTEntries * sizeof(uint32_t);
                     size_t cbGTBuffers = cbGT; /* Start with space for one GT. */
                     size_t cbGTBuffersMax = _1M;
+
                     uint32_t *pTmpGT1 = (uint32_t *)RTMemAlloc(cbGTBuffers);
                     uint32_t *pTmpGT2 = (uint32_t *)RTMemAlloc(cbGTBuffers);
+
                     if (   !pTmpGT1
                         || !pTmpGT2)
                         rc = VERR_NO_MEMORY;
+
                     size_t i = 0;
                     uint32_t *pGDTmp = pExtent->pGD;
                     uint32_t *pRGDTmp = pExtent->pRGD;
+
                     /* Loop through all entries. */
                     while (i < pExtent->cGDEntries)
@@ -1109 +1241 @@
                         uint32_t uRGTStart = *pRGDTmp;
                         size_t   cbGTRead = cbGT;
+
                         /* If no grain table is allocated skip the entry. */
                         if (*pGDTmp == 0 && *pRGDTmp == 0)
@@ -1115 +1248 @@
                             continue;
                         }
+
                         if (*pGDTmp == 0 || *pRGDTmp == 0 || *pGDTmp == *pRGDTmp)
                         {
@@ -1124 +1258 @@
                             break;
                         }
+
                         i++;
                         pGDTmp++;
                         pRGDTmp++;
+
                         /*
                          * Read a few tables at once if adjacent to decrease the number
@@ -1140 +1276 @@
                                 continue;
                             }
+
                             if (*pGDTmp == 0 || *pRGDTmp == 0 || *pGDTmp == *pRGDTmp)
                             {
@@ -1149 +1286 @@
                                 break;
                             }
+
                             /* Check that the start offsets are adjacent.*/
                             if (   VMDK_SECTOR2BYTE(uGTStart) + cbGTRead != VMDK_SECTOR2BYTE(*pGDTmp)
                                 || VMDK_SECTOR2BYTE(uRGTStart) + cbGTRead != VMDK_SECTOR2BYTE(*pRGDTmp))
                                 break;
+
                             i++;
                             pGDTmp++;
@@ -1158 +1297 @@
                             cbGTRead += cbGT;
                         }
+
                         /* Increase buffers if required. */
                         if (   RT_SUCCESS(rc)
@@ -1175 +1315 @@
                             else
                                 rc = VERR_NO_MEMORY;
+
                             if (rc == VERR_NO_MEMORY)
                             {
@@ -1181 +1322 @@
                                 i -= cbGTRead / cbGT;
                                 cbGTRead = cbGT;
+
                                 /* Don't try to increase the buffer again in the next run. */
                                 cbGTBuffersMax = cbGTBuffers;
                             }
                         }
+
                         if (RT_SUCCESS(rc))
                         {
@@ -1217 +1360 @@
                         }
                     } /* while (i < pExtent->cGDEntries) */
+
                     /** @todo figure out what to do for unclean VMDKs. */
                     if (pTmpGT1)
@@ -1232 +1376 @@
                            N_("VMDK: could not read grain directory in '%s': %Rrc"), pExtent->pszFullname, rc);
     }
+
     if (RT_FAILURE(rc))
         vmdkFreeGrainDirectory(pExtent);
     return rc;
 }
+
 /**
  * Creates a new grain directory for the given extent at the given start sector.
@@ -1254 +1400 @@
     size_t cbGTRounded;
     uint64_t cbOverhead;
+
     if (fPreAlloc)
     {
@@ -1267 +1414 @@
         cbOverhead = VMDK_SECTOR2BYTE(uStartSector) + cbGDRounded;
     }
+
     /* For streamOptimized extents there is only one grain directory,
      * and for all others take redundant grain directory into account. */
@@ -1281 +1429 @@
         rc = vdIfIoIntFileSetSize(pImage->pIfIo, pExtent->pFile->pStorage, cbOverhead);
     }
+
     if (RT_SUCCESS(rc))
     {
         pExtent->uAppendPosition = cbOverhead;
         pExtent->cOverheadSectors = VMDK_BYTE2SECTOR(cbOverhead);
+
         if (pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
         {
@@ -1295 +1445 @@
             pExtent->uSectorGD = uStartSector + VMDK_BYTE2SECTOR(cbGDRounded + cbGTRounded);
         }
+
         rc = vmdkAllocStreamBuffers(pImage, pExtent);
         if (RT_SUCCESS(rc))
@@ -1304 +1455 @@
                 uint32_t uGTSectorLE;
                 uint64_t uOffsetSectors;
+
                 if (pExtent->pRGD)
                 {
@@ -1323 +1475 @@
                     }
                 }
+
                 if (RT_SUCCESS(rc))
                 {
@@ -1345 +1498 @@
         }
     }
+
     if (RT_FAILURE(rc))
         vmdkFreeGrainDirectory(pExtent);
     return rc;
 }
+
 /**
  * Unquotes the given string returning the result in a separate buffer.
@@ -1366 +1521 @@
     char *pszQ;
     char *pszUnquoted;
+
     /* Skip over whitespace. */
     while (*pszStr == ' ' || *pszStr == '\t')
         pszStr++;
+
     if (*pszStr != '"')
     {
@@ -1383 +1540 @@
                              pImage->pszFilename, pszStart);
     }
+
     pszUnquoted = (char *)RTMemTmpAlloc(pszQ - pszStr + 1);
     if (!pszUnquoted)
@@ -1393 +1551 @@
     return VINF_SUCCESS;
 }
+
 static int vmdkDescInitStr(PVMDKIMAGE pImage, PVMDKDESCRIPTOR pDescriptor,
                            const char *pszLine)
@@ -1398 +1557 @@
     char *pEnd = pDescriptor->aLines[pDescriptor->cLines];
     ssize_t cbDiff = strlen(pszLine) + 1;
+
     if (    pDescriptor->cLines >= VMDK_DESCRIPTOR_LINES_MAX - 1
         &&  pEnd - pDescriptor->aLines[0] > (ptrdiff_t)pDescriptor->cbDescAlloc - cbDiff)
         return vdIfError(pImage->pIfError, VERR_BUFFER_OVERFLOW, RT_SRC_POS, N_("VMDK: descriptor too big in '%s'"), pImage->pszFilename);
+
     memcpy(pEnd, pszLine, cbDiff);
     pDescriptor->cLines++;
     pDescriptor->aLines[pDescriptor->cLines] = pEnd + cbDiff;
     pDescriptor->fDirty = true;
+
     return VINF_SUCCESS;
 }
+
 static bool vmdkDescGetStr(PVMDKDESCRIPTOR pDescriptor, unsigned uStart,
                            const char *pszKey, const char **ppszValue)
@@ -1412 +1575 @@
     size_t cbKey = strlen(pszKey);
     const char *pszValue;
+
     while (uStart != 0)
     {
@@ -1430 +1594 @@
     return !!uStart;
 }
+
 static int vmdkDescSetStr(PVMDKIMAGE pImage, PVMDKDESCRIPTOR pDescriptor,
                           unsigned uStart,
@@ -1437 +1602 @@
     size_t cbKey = strlen(pszKey);
     unsigned uLast = 0;
+
     while (uStart != 0)
     {
@@ -1471 +1637 @@
                 > (ptrdiff_t)pDescriptor->cbDescAlloc - cbDiff)
                 return vdIfError(pImage->pIfError, VERR_BUFFER_OVERFLOW, RT_SRC_POS, N_("VMDK: descriptor too big in '%s'"), pImage->pszFilename);
+
             memmove(pszTmp + cbNewVal, pszTmp + cbOldVal,
                     pDescriptor->aLines[pDescriptor->cLines] - pszTmp - cbOldVal);
@@ -1533 +1700 @@
         for (unsigned i = uStart + 1; i <= pDescriptor->cLines; i++)
             pDescriptor->aLines[i] += cbDiff;
+
         /* Adjust starting line numbers of following descriptor sections. */
         if (uStart <= pDescriptor->uFirstExtent)
@@ -1542 +1710 @@
     return VINF_SUCCESS;
 }
+
 static int vmdkDescBaseGetU32(PVMDKDESCRIPTOR pDescriptor, const char *pszKey,
                               uint32_t *puValue)
 {
     const char *pszValue;
+
     if (!vmdkDescGetStr(pDescriptor, pDescriptor->uFirstDesc, pszKey,
                         &pszValue))
@@ -1551 +1721 @@
     return RTStrToUInt32Ex(pszValue, NULL, 10, puValue);
 }
+
 /**
  * Returns the value of the given key as a string allocating the necessary memory.
@@ -1567 +1738 @@
     const char *pszValue;
     char *pszValueUnquoted;
+
     if (!vmdkDescGetStr(pDescriptor, pDescriptor->uFirstDesc, pszKey,
                         &pszValue))
@@ -1576 +1748 @@
     return rc;
 }
+
 static int vmdkDescBaseSetStr(PVMDKIMAGE pImage, PVMDKDESCRIPTOR pDescriptor,
                               const char *pszKey, const char *pszValue)
 {
     char *pszValueQuoted;
+
     RTStrAPrintf(&pszValueQuoted, "\"%s\"", pszValue);
     if (!pszValueQuoted)
@@ -1588 +1762 @@
     return rc;
 }
+
 static void vmdkDescExtRemoveDummy(PVMDKIMAGE pImage,
                                    PVMDKDESCRIPTOR pDescriptor)
@@ -1594 +1769 @@
     unsigned uEntry = pDescriptor->uFirstExtent;
     ssize_t cbDiff;
+
     if (!uEntry)
         return;
+
     cbDiff = strlen(pDescriptor->aLines[uEntry]) + 1;
     /* Move everything including \0 in the entry marking the end of buffer. */
@@ -1611 +1788 @@
     if (pDescriptor->uFirstDDB)
         pDescriptor->uFirstDDB--;
+
     return;
 }
-static void vmdkDescExtRemoveByLine(PVMDKIMAGE pImage,
-                                   PVMDKDESCRIPTOR pDescriptor, unsigned uLine)
-{
-    RT_NOREF1(pImage);
-    unsigned uEntry = uLine;
-    ssize_t cbDiff;
-    if (!uEntry)
-        return;
-    cbDiff = strlen(pDescriptor->aLines[uEntry]) + 1;
-    /* Move everything including \0 in the entry marking the end of buffer. */
-    memmove(pDescriptor->aLines[uEntry], pDescriptor->aLines[uEntry + 1],
-            pDescriptor->aLines[pDescriptor->cLines] - pDescriptor->aLines[uEntry + 1] + 1);
-    for (unsigned i = uEntry; i <= pDescriptor->cLines; i++)
-    {
-        if (i != uEntry)
-            pDescriptor->aLines[i - 1] = pDescriptor->aLines[i] - cbDiff;
-        if (pDescriptor->aNextLines[i])
-            pDescriptor->aNextLines[i - 1] = pDescriptor->aNextLines[i] - 1;
-        else
-            pDescriptor->aNextLines[i - 1] = 0;
-    }
-    pDescriptor->cLines--;
-    if (pDescriptor->uFirstDDB)
-        pDescriptor->uFirstDDB--;
-    return;
-}
+
 static int vmdkDescExtInsert(PVMDKIMAGE pImage, PVMDKDESCRIPTOR pDescriptor,
                              VMDKACCESS enmAccess, uint64_t cNominalSectors,
@@ -1650 +1803 @@
     char szExt[1024];
     ssize_t cbDiff;
+
     Assert((unsigned)enmAccess < RT_ELEMENTS(apszAccess));
     Assert((unsigned)enmType < RT_ELEMENTS(apszType));
+
     /* Find last entry in extent description. */
     while (uStart)
@@ -1659 +1814 @@
         uStart = pDescriptor->aNextLines[uStart];
     }
+
     if (enmType == VMDKETYPE_ZERO)
     {
@@ -1677 +1833 @@
     }
     cbDiff = strlen(szExt) + 1;
+
     /* Check for buffer overflow. */
     if (   (pDescriptor->cLines >= VMDK_DESCRIPTOR_LINES_MAX - 1)
         || (  pDescriptor->aLines[pDescriptor->cLines]
             - pDescriptor->aLines[0] > (ptrdiff_t)pDescriptor->cbDescAlloc - cbDiff))
-    {
-        if ((pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_SPLIT_2G)
-            && !(pDescriptor->cLines >= VMDK_DESCRIPTOR_LINES_MAX - 1))
-        {
-            pImage->cbDescAlloc *= 2;
-            pDescriptor->cbDescAlloc *= 2;
-        }
-        else
-            return vdIfError(pImage->pIfError, VERR_BUFFER_OVERFLOW, RT_SRC_POS, N_("VMDK: descriptor too big in '%s'"), pImage->pszFilename);
-    }
+        return vdIfError(pImage->pIfError, VERR_BUFFER_OVERFLOW, RT_SRC_POS, N_("VMDK: descriptor too big in '%s'"), pImage->pszFilename);
 
     for (unsigned i = pDescriptor->cLines + 1; i > uLast + 1; i--)
@@ -1710 +1858 @@
     for (unsigned i = uStart + 1; i <= pDescriptor->cLines; i++)
         pDescriptor->aLines[i] += cbDiff;
+
     /* Adjust starting line numbers of following descriptor sections. */
     if (uStart <= pDescriptor->uFirstDDB)
         pDescriptor->uFirstDDB++;
+
     pDescriptor->fDirty = true;
     return VINF_SUCCESS;
 }
+
 /**
  * Returns the value of the given key from the DDB as a string allocating
@@ -1733 +1884 @@
     const char *pszValue;
     char *pszValueUnquoted;
+
     if (!vmdkDescGetStr(pDescriptor, pDescriptor->uFirstDDB, pszKey,
                         &pszValue))
@@ -1742 +1894 @@
     return rc;
 }
+
 static int vmdkDescDDBGetU32(PVMDKIMAGE pImage, PVMDKDESCRIPTOR pDescriptor,
                              const char *pszKey, uint32_t *puValue)
@@ -1747 +1900 @@
     const char *pszValue;
     char *pszValueUnquoted;
+
     if (!vmdkDescGetStr(pDescriptor, pDescriptor->uFirstDDB, pszKey,
                         &pszValue))
@@ -1757 +1911 @@
     return rc;
 }
+
 static int vmdkDescDDBGetUuid(PVMDKIMAGE pImage, PVMDKDESCRIPTOR pDescriptor,
                               const char *pszKey, PRTUUID pUuid)
@@ -1762 +1917 @@
     const char *pszValue;
     char *pszValueUnquoted;
+
     if (!vmdkDescGetStr(pDescriptor, pDescriptor->uFirstDDB, pszKey,
                         &pszValue))
@@ -1772 +1928 @@
     return rc;
 }
+
 static int vmdkDescDDBSetStr(PVMDKIMAGE pImage, PVMDKDESCRIPTOR pDescriptor,
                              const char *pszKey, const char *pszVal)
@@ -1777 +1934 @@
     int rc;
     char *pszValQuoted;
+
     if (pszVal)
     {
@@ -1791 +1949 @@
     return rc;
 }
+
 static int vmdkDescDDBSetUuid(PVMDKIMAGE pImage, PVMDKDESCRIPTOR pDescriptor,
                               const char *pszKey, PCRTUUID pUuid)
 {
     char *pszUuid;
+
     RTStrAPrintf(&pszUuid, "\"%RTuuid\"", pUuid);
     if (!pszUuid)
@@ -1803 +1963 @@
     return rc;
 }
+
 static int vmdkDescDDBSetU32(PVMDKIMAGE pImage, PVMDKDESCRIPTOR pDescriptor,
                              const char *pszKey, uint32_t uValue)
 {
     char *pszValue;
+
     RTStrAPrintf(&pszValue, "\"%d\"", uValue);
     if (!pszValue)
@@ -1815 +1977 @@
     return rc;
 }
+
 /**
  * Splits the descriptor data into individual lines checking for correct line
@@ -1828 +1991 @@
     unsigned cLine = 0;
     int rc = VINF_SUCCESS;
+
     while (   RT_SUCCESS(rc)
            && *pszTmp != '\0')
@@ -1838 +2002 @@
             break;
         }
+
         while (*pszTmp != '\0' && *pszTmp != '\n')
         {
@@ -1855 +2020 @@
             pszTmp++;
         }
+
         if (RT_FAILURE(rc))
             break;
+
         /* Get rid of LF character. */
         if (*pszTmp == '\n')
@@ -1864 +2031 @@
         }
     }
+
     if (RT_SUCCESS(rc))
     {
@@ -1870 +2038 @@
         pDesc->aLines[cLine] = pszTmp;
     }
+
     return rc;
 }
+
 static int vmdkPreprocessDescriptor(PVMDKIMAGE pImage, char *pDescData,
                                     size_t cbDescData, PVMDKDESCRIPTOR pDescriptor)
@@ -1888 +2058 @@
         {
             unsigned uLastNonEmptyLine = 0;
+
             /* Initialize those, because we need to be able to reopen an image. */
             pDescriptor->uFirstDesc = 0;
@@ -1953 +2124 @@
         }
     }
+
     return rc;
 }
+
 static int vmdkDescSetPCHSGeometry(PVMDKIMAGE pImage,
                                    PCVDGEOMETRY pPCHSGeometry)
@@ -1973 +2146 @@
     return rc;
 }
+
 static int vmdkDescSetLCHSGeometry(PVMDKIMAGE pImage,
                                    PCVDGEOMETRY pLCHSGeometry)
@@ -1983 +2157 @@
     rc = vmdkDescDDBSetU32(pImage, &pImage->Descriptor,
                            VMDK_DDB_GEO_LCHS_HEADS,
+
                            pLCHSGeometry->cHeads);
     if (RT_FAILURE(rc))
@@ -1991 +2166 @@
     return rc;
 }
+
 static int vmdkCreateDescriptor(PVMDKIMAGE pImage, char *pDescData,
                                 size_t cbDescData, PVMDKDESCRIPTOR pDescriptor)
@@ -2002 +2178 @@
     pDescriptor->aLines[pDescriptor->cLines] = pDescData;
     memset(pDescriptor->aNextLines, '\0', sizeof(pDescriptor->aNextLines));
+
     int rc = vmdkDescInitStr(pImage, pDescriptor, "# Disk DescriptorFile");
     if (RT_SUCCESS(rc))
@@ -2033 +2210 @@
     {
         pDescriptor->uFirstDDB = pDescriptor->cLines - 1;
+
         /* Now that the framework is in place, use the normal functions to insert
          * the remaining keys. */
@@ -2045 +2223 @@
     if (RT_SUCCESS(rc))
         rc = vmdkDescDDBSetStr(pImage, pDescriptor, "ddb.adapterType", "ide");
+
     return rc;
 }
+
 static int vmdkParseDescriptor(PVMDKIMAGE pImage, char *pDescData, size_t cbDescData)
 {
@@ -2053 +2233 @@
     unsigned uLine;
     unsigned i;
+
     rc = vmdkPreprocessDescriptor(pImage, pDescData, cbDescData,
                                   &pImage->Descriptor);
     if (RT_FAILURE(rc))
         return rc;
+
     /* Check version, must be 1. */
     uint32_t uVersion;
@@ -2064 +2246 @@
     if (uVersion != 1)
         return vdIfError(pImage->pIfError, VERR_VD_VMDK_UNSUPPORTED_VERSION, RT_SRC_POS, N_("VMDK: unsupported format version in descriptor in '%s'"), pImage->pszFilename);
+
     /* Get image creation type and determine image flags. */
     char *pszCreateType = NULL;   /* initialized to make gcc shut up */
@@ -2081 +2264 @@
         pImage->uImageFlags |= VD_IMAGE_FLAGS_FIXED | VD_VMDK_IMAGE_FLAGS_ESX;
     RTMemTmpFree(pszCreateType);
+
     /* Count the number of extent config entries. */
     for (uLine = pImage->Descriptor.uFirstExtent, cExtents = 0;
@@ -2086 +2270 @@
          uLine = pImage->Descriptor.aNextLines[uLine], cExtents++)
         /* nothing */;
+
     if (!pImage->pDescData && cExtents != 1)
     {
@@ -2091 +2276 @@
         return vdIfError(pImage->pIfError, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS, N_("VMDK: monolithic image may only have one extent in '%s'"), pImage->pszFilename);
     }
+
     if (pImage->pDescData)
     {
@@ -2098 +2284 @@
             return rc;
     }
+
     for (i = 0, uLine = pImage->Descriptor.uFirstExtent;
          i < cExtents; i++, uLine = pImage->Descriptor.aNextLines[uLine])
     {
         char *pszLine = pImage->Descriptor.aLines[uLine];
+
         /* Access type of the extent. */
         if (!strncmp(pszLine, "RW", 2))
@@ -2122 +2310 @@
         if (*pszLine++ != ' ')
             return vdIfError(pImage->pIfError, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS, N_("VMDK: parse error in extent description in '%s'"), pImage->pszFilename);
+
         /* Nominal size of the extent. */
         rc = RTStrToUInt64Ex(pszLine, &pszLine, 10,
@@ -2129 +2318 @@
         if (*pszLine++ != ' ')
             return vdIfError(pImage->pIfError, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS, N_("VMDK: parse error in extent description in '%s'"), pImage->pszFilename);
+
         /* Type of the extent. */
         if (!strncmp(pszLine, "SPARSE", 6))
@@ -2152 +2342 @@
         else
             return vdIfError(pImage->pIfError, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS, N_("VMDK: parse error in extent description in '%s'"), pImage->pszFilename);
+
         if (pImage->pExtents[i].enmType == VMDKETYPE_ZERO)
         {
@@ -2166 +2357 @@
             if (*pszLine++ != ' ')
                 return vdIfError(pImage->pIfError, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS, N_("VMDK: parse error in extent description in '%s'"), pImage->pszFilename);
+
             /* Basename of the image. Surrounded by quotes. */
             char *pszBasename;
@@ -2184 +2376 @@
                 }
             }
+
             if (*pszLine != '\0')
                 return vdIfError(pImage->pIfError, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS, N_("VMDK: parse error in extent description in '%s'"), pImage->pszFilename);
         }
     }
+
     /* Determine PCHS geometry (autogenerate if necessary). */
     rc = vmdkDescDDBGetU32(pImage, &pImage->Descriptor,
@@ -2222 +2416 @@
         pImage->PCHSGeometry.cSectors = 63;
     }
+
     /* Determine LCHS geometry (set to 0 if not specified). */
     rc = vmdkDescDDBGetU32(pImage, &pImage->Descriptor,
@@ -2252 +2447 @@
         pImage->LCHSGeometry.cSectors = 0;
     }
+
     /* Get image UUID. */
     rc = vmdkDescDDBGetUuid(pImage, &pImage->Descriptor, VMDK_DDB_IMAGE_UUID,
@@ -2275 +2471 @@
     else if (RT_FAILURE(rc))
         return rc;
+
     /* Get image modification UUID. */
     rc = vmdkDescDDBGetUuid(pImage, &pImage->Descriptor,
@@ -2300 +2497 @@
     else if (RT_FAILURE(rc))
         return rc;
+
     /* Get UUID of parent image. */
     rc = vmdkDescDDBGetUuid(pImage, &pImage->Descriptor, VMDK_DDB_PARENT_UUID,
@@ -2323 +2521 @@
     else if (RT_FAILURE(rc))
         return rc;
+
     /* Get parent image modification UUID. */
     rc = vmdkDescDDBGetUuid(pImage, &pImage->Descriptor,
@@ -2346 +2545 @@
     else if (RT_FAILURE(rc))
         return rc;
+
     return VINF_SUCCESS;
 }
+
 /**
  * Internal : Prepares the descriptor to write to the image.
@@ -2355 +2556 @@
 {
     int rc = VINF_SUCCESS;
+
     /*
      * Allocate temporary descriptor buffer.
@@ -2363 +2565 @@
     char *pszDescriptor = (char *)RTMemAllocZ(cbDescriptor);
     size_t offDescriptor = 0;
+
     if (!pszDescriptor)
         return VERR_NO_MEMORY;
+
     for (unsigned i = 0; i < pImage->Descriptor.cLines; i++)
     {
         const char *psz = pImage->Descriptor.aLines[i];
         size_t cb = strlen(psz);
+
         /*
          * Increase the descriptor if there is no limit and
@@ -2384 +2589 @@
                 char *pszDescriptorNew = NULL;
                 LogFlow(("Increasing descriptor cache\n"));
+
                 pszDescriptorNew = (char *)RTMemRealloc(pszDescriptor, cbDescriptor + cb + 4 * _1K);
                 if (!pszDescriptorNew)
@@ -2394 +2600 @@
             }
         }
+
         if (cb > 0)
         {
@@ -2399 +2606 @@
             offDescriptor += cb;
         }
+
         memcpy(pszDescriptor + offDescriptor, "\n", 1);
         offDescriptor++;
     }
+
     if (RT_SUCCESS(rc))
     {
@@ -2409 +2618 @@
     else if (pszDescriptor)
         RTMemFree(pszDescriptor);
+
     return rc;
 }
+
 /**
  * Internal: write/update the descriptor part of the image.
@@ -2422 +2633 @@
     void *pvDescriptor = NULL;
     size_t cbDescriptor;
+
     if (pImage->pDescData)
     {
@@ -2439 +2651 @@
     if (pDescFile == NULL)
         return VERR_INVALID_PARAMETER;
+
     rc = vmdkDescriptorPrepare(pImage, cbLimit, &pvDescriptor, &cbDescriptor);
     if (RT_SUCCESS(rc))
@@ -2450 +2663 @@
             rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: error writing descriptor in '%s'"), pImage->pszFilename);
     }
+
     if (RT_SUCCESS(rc) && !cbLimit)
     {
@@ -2456 +2670 @@
             rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: error truncating descriptor in '%s'"), pImage->pszFilename);
     }
+
     if (RT_SUCCESS(rc))
         pImage->Descriptor.fDirty = false;
+
     if (pvDescriptor)
         RTMemFree(pvDescriptor);
     return rc;
-}
+
+}
+
 /**
  * Internal: validate the consistency check values in a binary header.
@@ -2495 +2713 @@
     return rc;
 }
+
 /**
  * Internal: read metadata belonging to an extent with binary header, i.e.
@@ -2504 +2723 @@
     SparseExtentHeader Header;
     int rc;
+
     if (!fMagicAlreadyRead)
         rc = vdIfIoIntFileReadSync(pImage->pIfIo, pExtent->pFile->pStorage, 0,
@@ -2516 +2736 @@
                                    - RT_UOFFSETOF(SparseExtentHeader, version));
     }
+
     if (RT_SUCCESS(rc))
     {
@@ -2522 +2743 @@
         {
             uint64_t cbFile = 0;
+
             if (    (RT_LE2H_U32(Header.flags) & RT_BIT(17))
                 &&  RT_LE2H_U64(Header.gdOffset) == VMDK_GD_AT_END)
                 pExtent->fFooter = true;
+
             if (   !(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
                 || (   pExtent->fFooter
@@ -2533 +2756 @@
                     rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: cannot get size of '%s'"), pExtent->pszFullname);
             }
+
             if (RT_SUCCESS(rc))
             {
                 if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY))
                     pExtent->uAppendPosition = RT_ALIGN_64(cbFile, 512);
+
                 if (   pExtent->fFooter
                     && (   !(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
@@ -2550 +2775 @@
                         rc = VERR_VD_VMDK_INVALID_HEADER;
                     }
+
                     if (RT_SUCCESS(rc))
                         rc = vmdkValidateHeader(pImage, pExtent, &Header);
@@ -2555 +2781 @@
                     pExtent->uAppendPosition = 0;
                 }
+
                 if (RT_SUCCESS(rc))
                 {
@@ -2577 +2804 @@
                         pExtent->uSectorRGD     = 0;
                     }
+
                     if (pExtent->uDescriptorSector && !pExtent->cDescriptorSectors)
                         rc = vdIfError(pImage->pIfError, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS,
                                        N_("VMDK: inconsistent embedded descriptor config in '%s'"), pExtent->pszFullname);
+
                     if (   RT_SUCCESS(rc)
                         && (   pExtent->uSectorGD == VMDK_GD_AT_END
@@ -2587 +2816 @@
                         rc = vdIfError(pImage->pIfError, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS,
                                        N_("VMDK: cannot resolve grain directory offset in '%s'"), pExtent->pszFullname);
+
                     if (RT_SUCCESS(rc))
                     {
@@ -2597 +2827 @@
                             pExtent->cSectorsPerGDE = cSectorsPerGDE;
                             pExtent->cGDEntries = (pExtent->cSectors + cSectorsPerGDE - 1) / cSectorsPerGDE;
+
                             /* Fix up the number of descriptor sectors, as some flat images have
                              * really just one, and this causes failures when inserting the UUID
@@ -2619 +2850 @@
         rc = VERR_VD_VMDK_INVALID_HEADER;
     }
+
     if (RT_FAILURE(rc))
         vmdkFreeExtentData(pImage, pExtent, false);
+
     return rc;
 }
+
 /**
  * Internal: read additional metadata belonging to an extent. For those
@@ -2630 +2864 @@
 {
     int rc = VINF_SUCCESS;
+
 /* disabled the check as there are too many truncated vmdk images out there */
 #ifdef VBOX_WITH_VMDK_STRICT_SIZE_CHECK
@@ -2669 +2904 @@
                     if (pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
                         pExtent->uAppendPosition = 0;
+
                     if (   !(pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
                         || !(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
@@ -2682 +2918 @@
         }
     }
+
     if (RT_FAILURE(rc))
         vmdkFreeExtentData(pImage, pExtent, false);
+
     return rc;
 }
+
 /**
  * Internal: write/update the metadata for a sparse extent.
@@ -2693 +2932 @@
 {
     SparseExtentHeader Header;
+
     memset(&Header, '\0', sizeof(Header));
     Header.magicNumber = RT_H2LE_U32(VMDK_SPARSE_MAGICNUMBER);
@@ -2735 +2975 @@
     Header.doubleEndLineChar2 = '\n';
     Header.compressAlgorithm = RT_H2LE_U16(pExtent->uCompression);
+
     int rc = vdIfIoIntFileWriteMeta(pImage->pIfIo, pExtent->pFile->pStorage,
                                     uOffset, &Header, sizeof(Header),
@@ -2742 +2983 @@
     return rc;
 }
+
 /**
  * Internal: free the buffers used for streamOptimized images.
@@ -2758 +3000 @@
     }
 }
+
 /**
  * Internal: free the memory used by the extent data structure, optionally
@@ -2771 +3014 @@
 {
     int rc = VINF_SUCCESS;
+
     vmdkFreeGrainDirectory(pExtent);
     if (pExtent->pDescData)
@@ -2797 +3041 @@
     }
     vmdkFreeStreamBuffers(pExtent);
+
     return rc;
 }
+
 /**
  * Internal: allocate grain table cache if necessary for this image.
@@ -2805 +3051 @@
 {
     PVMDKEXTENT pExtent;
+
     /* Allocate grain table cache if any sparse extent is present. */
     for (unsigned i = 0; i < pImage->cExtents; i++)
@@ -2824 +3071 @@
         }
     }
+
     return VINF_SUCCESS;
 }
+
 /**
  * Internal: allocate the given number of extents.
@@ -2853 +3102 @@
     else
         rc = VERR_NO_MEMORY;
+
     return rc;
 }
 
 /**
- * Internal: Create an additional file backed extent in split images.
- * Supports split sparse and flat images.
- *
- * @returns VBox status code.
- * @param   pImage              VMDK image instance.
- * @param   cbSize              Desiried size in bytes of new extent.
+ * Internal: allocate and describes an additional, file-backed extent
+ * for the given size. Preserves original extents.
  */
 static int vmdkAddFileBackedExtent(PVMDKIMAGE pImage, uint64_t cbSize)
 {
     int rc = VINF_SUCCESS;
-    unsigned uImageFlags = pImage->uImageFlags;
-
-    /* Check for unsupported image type. */
-    if ((uImageFlags & VD_VMDK_IMAGE_FLAGS_ESX)
-        || (uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
-        || (uImageFlags & VD_VMDK_IMAGE_FLAGS_RAWDISK))
-    {
-        return VERR_NOT_SUPPORTED;
-    }
-
-    /* Allocate array of extents and copy existing extents to it. */
     PVMDKEXTENT pNewExtents = (PVMDKEXTENT)RTMemAllocZ((pImage->cExtents + 1) * sizeof(VMDKEXTENT));
-    if (!pNewExtents)
-    {
-        return VERR_NO_MEMORY;
-    }
-
-    memcpy(pNewExtents, pImage->pExtents, pImage->cExtents * sizeof(VMDKEXTENT));
-    /** @todo r=jack - free old extent pointer */
-
-    /* Locate newly created extent and populate default metadata. */
-    PVMDKEXTENT pExtent = &pNewExtents[pImage->cExtents];
-
-    pExtent->pFile = NULL;
-    pExtent->pszBasename = NULL;
-    pExtent->pszFullname = NULL;
-    pExtent->pGD = NULL;
-    pExtent->pRGD = NULL;
-    pExtent->pDescData = NULL;
-    pExtent->uVersion = 1;
-    pExtent->uCompression = VMDK_COMPRESSION_NONE;
-    pExtent->uExtent = pImage->cExtents;
-    pExtent->pImage = pImage;
-    pExtent->cNominalSectors = VMDK_BYTE2SECTOR(cbSize);
-    pExtent->enmAccess = VMDKACCESS_READWRITE;
-    pExtent->uSectorOffset = 0;
-    pExtent->fMetaDirty = true;
-
-    /* Apply image type specific meta data. */
-    if (uImageFlags & VD_IMAGE_FLAGS_FIXED)
-    {
+    if (pNewExtents)
+    {
+        memcpy(pNewExtents, pImage->pExtents, pImage->cExtents * sizeof(VMDKEXTENT));
+        PVMDKEXTENT pExtent = &pNewExtents[pImage->cExtents];
+
+        pExtent->pFile = NULL;
+        pExtent->pszBasename = NULL;
+        pExtent->pszFullname = NULL;
+        pExtent->pGD = NULL;
+        pExtent->pRGD = NULL;
+        pExtent->pDescData = NULL;
+        pExtent->uVersion = 1;
+        pExtent->uCompression = VMDK_COMPRESSION_NONE;
+        pExtent->uExtent = pImage->cExtents;
+        pExtent->pImage = pImage;
+        pExtent->cNominalSectors = VMDK_BYTE2SECTOR(cbSize);
         pExtent->enmType = VMDKETYPE_FLAT;
-    }
-    else
-    {
-        uint64_t cSectorsPerGDE, cSectorsPerGD;
-        pExtent->enmType = VMDKETYPE_HOSTED_SPARSE;
-        pExtent->cSectors = VMDK_BYTE2SECTOR(RT_ALIGN_64(cbSize, _64K));
-        pExtent->cSectorsPerGrain = VMDK_BYTE2SECTOR(_64K);
-        pExtent->cGTEntries = 512;
-        cSectorsPerGDE = pExtent->cGTEntries * pExtent->cSectorsPerGrain;
-        pExtent->cSectorsPerGDE = cSectorsPerGDE;
-        pExtent->cGDEntries = (pExtent->cSectors + cSectorsPerGDE - 1) / cSectorsPerGDE;
-        cSectorsPerGD = (pExtent->cGDEntries + (512 / sizeof(uint32_t) - 1)) / (512 / sizeof(uint32_t));
-    }
-
-    /* Allocate and set file name for extent. */
-    char *pszBasenameSubstr = RTPathFilename(pImage->pszFilename);
-    AssertPtr(pszBasenameSubstr);
-
-    char *pszBasenameSuff = RTPathSuffix(pszBasenameSubstr);
-    char *pszBasenameBase = RTStrDup(pszBasenameSubstr);
-    RTPathStripSuffix(pszBasenameBase);
-    char *pszTmp;
-    size_t cbTmp;
-
-    if (pImage->uImageFlags & VD_IMAGE_FLAGS_FIXED)
-        RTStrAPrintf(&pszTmp, "%s-f%03d%s", pszBasenameBase,
-                        pExtent->uExtent + 1, pszBasenameSuff);
-    else
-        RTStrAPrintf(&pszTmp, "%s-s%03d%s", pszBasenameBase, pExtent->uExtent + 1,
-                        pszBasenameSuff);
-
-    RTStrFree(pszBasenameBase);
-    if (!pszTmp)
-        return VERR_NO_STR_MEMORY;
-    cbTmp = strlen(pszTmp) + 1;
-    char *pszBasename = (char *)RTMemTmpAlloc(cbTmp);
-    if (!pszBasename)
-    {
+        pExtent->enmAccess = VMDKACCESS_READWRITE;
+        pExtent->uSectorOffset = 0;
+
+        char *pszBasenameSubstr = RTPathFilename(pImage->pszFilename);
+        AssertPtr(pszBasenameSubstr);
+
+        char *pszBasenameSuff = RTPathSuffix(pszBasenameSubstr);
+        char *pszBasenameBase = RTStrDup(pszBasenameSubstr);
+        RTPathStripSuffix(pszBasenameBase);
+        char *pszTmp;
+        size_t cbTmp;
+
+        if (pImage->uImageFlags & VD_IMAGE_FLAGS_FIXED)
+            RTStrAPrintf(&pszTmp, "%s-f%03d%s", pszBasenameBase,
+                         pExtent->uExtent + 1, pszBasenameSuff);
+        else
+            RTStrAPrintf(&pszTmp, "%s-s%03d%s", pszBasenameBase, pExtent->uExtent + 1,
+                         pszBasenameSuff);
+
+        RTStrFree(pszBasenameBase);
+        if (!pszTmp)
+            return VERR_NO_STR_MEMORY;
+        cbTmp = strlen(pszTmp) + 1;
+        char *pszBasename = (char *)RTMemTmpAlloc(cbTmp);
+        if (!pszBasename)
+        {
+            RTStrFree(pszTmp);
+            return VERR_NO_MEMORY;
+        }
+
+        memcpy(pszBasename, pszTmp, cbTmp);
         RTStrFree(pszTmp);
-        return VERR_NO_MEMORY;
-    }
-
-    memcpy(pszBasename, pszTmp, cbTmp);
-    RTStrFree(pszTmp);
-
-    pExtent->pszBasename = pszBasename;
-
-    char *pszBasedirectory = RTStrDup(pImage->pszFilename);
-    if (!pszBasedirectory)
-        return VERR_NO_STR_MEMORY;
-    RTPathStripFilename(pszBasedirectory);
-    char *pszFullname = RTPathJoinA(pszBasedirectory, pExtent->pszBasename);
-    RTStrFree(pszBasedirectory);
-    if (!pszFullname)
-        return VERR_NO_STR_MEMORY;
-    pExtent->pszFullname = pszFullname;
-
-    /* Create file for extent. */
-    rc = vmdkFileOpen(pImage, &pExtent->pFile, pExtent->pszBasename, pExtent->pszFullname,
-                        VDOpenFlagsToFileOpenFlags(pImage->uOpenFlags,
-                                                    true /* fCreate */));
-    if (RT_FAILURE(rc))
-        return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not create new file '%s'"), pExtent->pszFullname);
-
-    if (uImageFlags & VD_IMAGE_FLAGS_FIXED)
-    {
-        /* For flat images: Pre allocate file space. */
+
+        pExtent->pszBasename = pszBasename;
+
+        char *pszBasedirectory = RTStrDup(pImage->pszFilename);
+        if (!pszBasedirectory)
+            return VERR_NO_STR_MEMORY;
+        RTPathStripFilename(pszBasedirectory);
+        char *pszFullname = RTPathJoinA(pszBasedirectory, pExtent->pszBasename);
+        RTStrFree(pszBasedirectory);
+        if (!pszFullname)
+            return VERR_NO_STR_MEMORY;
+        pExtent->pszFullname = pszFullname;
+
+        /* Create file for extent. */
+        rc = vmdkFileOpen(pImage, &pExtent->pFile, pExtent->pszBasename, pExtent->pszFullname,
+                          VDOpenFlagsToFileOpenFlags(pImage->uOpenFlags,
+                                                     true /* fCreate */));
+        if (RT_FAILURE(rc))
+            return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not create new file '%s'"), pExtent->pszFullname);
+
+        rc = vmdkDescExtInsert(pImage, &pImage->Descriptor, pExtent->enmAccess,
+                               pExtent->cNominalSectors, pExtent->enmType,
+                               pExtent->pszBasename, pExtent->uSectorOffset);
+        if (RT_FAILURE(rc))
+            return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not insert the extent list into descriptor in '%s'"), pImage->pszFilename);
+
         rc = vdIfIoIntFileSetAllocationSize(pImage->pIfIo, pExtent->pFile->pStorage, cbSize,
                                             0 /* fFlags */, NULL, 0, 0);
+
         if (RT_FAILURE(rc))
             return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not set size of new file '%s'"), pExtent->pszFullname);
+
+        pImage->pExtents = pNewExtents;
+        pImage->cExtents++;
     }
     else
-    {
-        /* For sparse images: Allocate new grain directories/tables. */
-        /* fPreAlloc should never be false because VMware can't use such images. */
-        rc = vmdkCreateGrainDirectory(pImage, pExtent,
-                                      RT_MAX( pExtent->uDescriptorSector
-                                              + pExtent->cDescriptorSectors,
-                                              1),
-                                      true /* fPreAlloc */);
-        if (RT_FAILURE(rc))
-            return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not create new grain directory in '%s'"), pExtent->pszFullname);
-    }
-
-    /* Insert new extent into descriptor file. */
-    rc = vmdkDescExtInsert(pImage, &pImage->Descriptor, pExtent->enmAccess,
-                           pExtent->cNominalSectors, pExtent->enmType,
-                           pExtent->pszBasename, pExtent->uSectorOffset);
-    if (RT_FAILURE(rc))
-        return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not insert the extent list into descriptor in '%s'"), pImage->pszFilename);
-
-    pImage->pExtents = pNewExtents;
-    pImage->cExtents++;
-
+        rc = VERR_NO_MEMORY;
     return rc;
 }
-
 /**
  * Reads and processes the descriptor embedded in sparse images.
@@ -3054 +3249 @@
                 {
                     uint64_t cDescriptorSectorsOld = pExtent->cDescriptorSectors;
+
                     pExtent->cDescriptorSectors = 4;
                     if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY))
@@ -3118 +3314 @@
             rc = VERR_NO_MEMORY;
     }
+
     return rc;
 }
+
 /**
  * Reads the descriptor from a pure text file.
@@ -3206 +3404 @@
                         else
                             pExtent->pszFullname = NULL;
+
                         unsigned uOpenFlags = pImage->uOpenFlags | ((pExtent->enmAccess == VMDKACCESS_READONLY) ? VD_OPEN_FLAGS_READONLY : 0);
                         switch (pExtent->enmType)
@@ -3226 +3425 @@
                                 if (RT_FAILURE(rc))
                                     break;
+
                                 /* Mark extent as unclean if opened in read-write mode. */
                                 if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY))
@@ -3262 +3462 @@
     else if (RT_SUCCESS(rc))
         rc = vdIfError(pImage->pIfError, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS, N_("VMDK: descriptor in '%s' is too short"), pImage->pszFilename);
+
     return rc;
 }
+
 /**
  * Read and process the descriptor based on the image type.
@@ -3274 +3476 @@
 {
     uint32_t u32Magic;
+
     /* Read magic (if present). */
     int rc = vdIfIoIntFileReadSync(pImage->pIfIo, pFile->pStorage, 0,
@@ -3290 +3493 @@
         rc = VERR_VD_VMDK_INVALID_HEADER;
     }
+
     return rc;
 }
+
 /**
  * Internal: Open an image, constructing all necessary data structures.
@@ -3301 +3506 @@
     pImage->pIfIo      = VDIfIoIntGet(pImage->pVDIfsImage);
     AssertPtrReturn(pImage->pIfIo, VERR_INVALID_PARAMETER);
+
     /*
      * Open the image.
@@ -3313 +3519 @@
     {
         pImage->pFile = pFile;
+
         rc = vmdkDescriptorRead(pImage, pFile);
         if (RT_SUCCESS(rc))
@@ -3330 +3537 @@
                 }
             }
+
             /* Update the image metadata now in case has changed. */
             rc = vmdkFlushImage(pImage, NULL);
@@ -3349 +3557 @@
                              ||  pExtent->enmType == VMDKETYPE_ZERO)
                         pImage->uImageFlags |= VD_IMAGE_FLAGS_FIXED;
+
                     pImage->cbSize += VMDK_SECTOR2BYTE(pExtent->cNominalSectors);
                 }
+
                 if (   !(pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
                     || !(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
@@ -3360 +3570 @@
     /* else: Do NOT signal an appropriate error here, as the VD layer has the
      *       choice of retrying the open if it failed. */
+
     if (RT_SUCCESS(rc))
     {
@@ -3365 +3576 @@
         pImage->RegionList.fFlags   = 0;
         pImage->RegionList.cRegions = 1;
+
         pRegion->offRegion            = 0; /* Disk start. */
         pRegion->cbBlock              = 512;
@@ -3377 +3589 @@
     return rc;
 }
+
 /**
  * Frees a raw descriptor.
@@ -3385 +3598 @@
     if (!pRawDesc)
         return VINF_SUCCESS;
+
     RTStrFree(pRawDesc->pszRawDisk);
     pRawDesc->pszRawDisk = NULL;
+
     /* Partitions: */
     for (unsigned i = 0; i < pRawDesc->cPartDescs; i++)
@@ -3392 +3607 @@
         RTStrFree(pRawDesc->pPartDescs[i].pszRawDevice);
         pRawDesc->pPartDescs[i].pszRawDevice = NULL;
+
         RTMemFree(pRawDesc->pPartDescs[i].pvPartitionData);
         pRawDesc->pPartDescs[i].pvPartitionData = NULL;
     }
+
     RTMemFree(pRawDesc->pPartDescs);
     pRawDesc->pPartDescs = NULL;
+
     RTMemFree(pRawDesc);
     return VINF_SUCCESS;
 }
+
 /**
  * Helper that grows the raw partition descriptor table by @a cToAdd entries,
@@ -3416 +3635 @@
         pRawDesc->cPartDescs = cNew;
         pRawDesc->pPartDescs = paNew;
+
         *ppRet = &paNew[cOld];
         return VINF_SUCCESS;
@@ -3424 +3644 @@
                      pImage->pszFilename, cOld, cNew);
 }
+
 /**
  * @callback_method_impl{FNRTSORTCMP}
@@ -3433 +3654 @@
     return iDelta < 0 ? -1 : iDelta > 0 ? 1 : 0;
 }
+
 /**
  * Post processes the partition descriptors.
@@ -3444 +3666 @@
      */
     RTSortShell(pRawDesc->pPartDescs, pRawDesc->cPartDescs, sizeof(pRawDesc->pPartDescs[0]), vmdkRawDescPartComp, NULL);
+
     /*
      * Check that we don't have overlapping descriptors.  If we do, that's an
@@ -3458 +3681 @@
                              paPartDescs[i].pvPartitionData ? " (data)" : "");
         offLast -= 1;
+
         if (i + 1 < pRawDesc->cPartDescs && offLast >= paPartDescs[i + 1].offStartInVDisk)
             return vdIfError(pImage->pIfError, VERR_FILESYSTEM_CORRUPT /*?*/, RT_SRC_POS,
@@ -3470 +3694 @@
                              paPartDescs[i].pvPartitionData ? " (data)" : "", cbSize);
     }
+
     return VINF_SUCCESS;
 }
+
+
 #ifdef RT_OS_LINUX
 /**
@@ -3494 +3721 @@
     size_t const cchDir = RTPathEnsureTrailingSeparator(pszBlockDevDir, cbBlockDevDir);
     AssertReturn(cchDir > 0, VERR_BUFFER_OVERFLOW);
+
     RTDIR hDir = NIL_RTDIR;
     int rc = RTDirOpen(&hDir, pszBlockDevDir);
@@ -3511 +3739 @@
                     rc = RTStrCopy(&pszBlockDevDir[cchDir], cbBlockDevDir - cchDir, Entry.szName);
                     AssertContinue(RT_SUCCESS(rc)); /* should not happen! */
+
                     dev_t uThisDevNo = ~uDevToLocate;
                     rc = RTLinuxSysFsReadDevNumFile(&uThisDevNo, "%s/dev", pszBlockDevDir);
@@ -3540 +3769 @@
 }
 #endif /* RT_OS_LINUX */
+
 #ifdef RT_OS_FREEBSD
+
+
 /**
  * Reads the config data from the provider and returns offset and size
@@ -3553 +3785 @@
     gconfig *pConfEntry;
     int rc = VERR_NOT_FOUND;
+
     /*
      * Required parameters are located in the list containing key/value pairs.
@@ -3583 +3816 @@
     return rc;
 }
+
+
 /**
  * Searches the partition specified by name and calculates its size and absolute offset.
@@ -3601 +3836 @@
     AssertReturn(pcbAbsoluteOffset,  VERR_INVALID_PARAMETER);
     AssertReturn(pcbSize,            VERR_INVALID_PARAMETER);
+
     ggeom *pParentGeom;
     int rc = VERR_NOT_FOUND;
@@ -3613 +3849 @@
     if (RT_FAILURE(rc))
         return rc;
+
     gprovider *pProvider;
     /*
@@ -3624 +3861 @@
             return vmdkReadPartitionsParamsFromProvider(pProvider, pcbAbsoluteOffset, pcbSize);
     }
+
     /*
      * No provider found. Go over the parent geom again
@@ -3633 +3871 @@
      * provider
      */
+
     LIST_FOREACH(pProvider, &pParentGeom->lg_provider, lg_provider)
     {
@@ -3640 +3879 @@
         if (RT_FAILURE(rc))
             return rc;
+
         uint64_t cbProviderOffset = 0;
         uint64_t cbProviderSize = 0;
@@ -3650 +3890 @@
         }
     }
+
     return VERR_NOT_FOUND;
 }
 #endif
+
+
 /**
  * Attempts to verify the raw partition path.
@@ -3662 +3905 @@
 {
     RT_NOREF(pImage, pPartDesc, idxPartition, pszRawDrive, hRawDrive, cbSector, hVol);
+
     /*
      * Try open the raw partition device.
@@ -3671 +3915 @@
                          N_("VMDK: Image path: '%s'. Failed to open partition #%u on '%s' via '%s' (%Rrc)"),
                          pImage->pszFilename, idxPartition, pszRawDrive, pPartDesc->pszRawDevice, rc);
+
     /*
      * Compare the partition UUID if we can get it.
@@ -3676 +3921 @@
 #ifdef RT_OS_WINDOWS
     DWORD cbReturned;
+
     /* 1. Get the device numbers for both handles, they should have the same disk. */
     STORAGE_DEVICE_NUMBER DevNum1;
@@ -3684 +3930 @@
                        N_("VMDK: Image path: '%s'. IOCTL_STORAGE_GET_DEVICE_NUMBER failed on '%s': %u"),
                        pImage->pszFilename, pszRawDrive, GetLastError());
+
     STORAGE_DEVICE_NUMBER DevNum2;
     RT_ZERO(DevNum2);
@@ -3775 +4022 @@
             rc = VERR_NO_TMP_MEMORY;
     }
+
 #elif defined(RT_OS_LINUX)
     RT_NOREF(hVol);
+
     /* Stat the two devices first to get their device numbers.  (We probably
        could make some assumptions here about the major & minor number assignments
@@ -3797 +4046 @@
         {
             rc = vmdkFindSysBlockDevPath(pImage, szSysPath, sizeof(szSysPath), StDrive.st_rdev, pszRawDrive);
+
             /* Now, scan the directories under that again for a partition device
                matching the hRawPart device's number: */
             if (RT_SUCCESS(rc))
                 rc = vmdkFindSysBlockDevPath(pImage, szSysPath, sizeof(szSysPath), StPart.st_rdev, pPartDesc->pszRawDevice);
+
             /* Having found the /sys/block/device/partition/ path, we can finally
                read the partition attributes and compare with hVol. */
@@ -3813 +4064 @@
                                    pImage->pszFilename, idxPartition, pPartDesc->pszRawDevice, pszRawDrive, iLnxPartition, idxPartition);
                 /* else: ignore failure? */
+
                 /* start offset: */
                 uint32_t const cbLnxSector = 512; /* It's hardcoded in the Linux kernel */
@@ -3826 +4078 @@
                     /* else: ignore failure? */
                 }
+
                 /* the size: */
                 if (RT_SUCCESS(rc))
@@ -3842 +4095 @@
         /* else: We've got nothing to work on, so only do content comparison. */
     }
+
 #elif defined(RT_OS_FREEBSD)
     char szDriveDevName[256];
@@ -3872 +4126 @@
                 rc = vdIfError(pImage->pIfError, VERR_GENERAL_FAILURE, RT_SRC_POS,
                                N_("VMDK: Image path: '%s'. 'PART' class not found in the GEOM tree"), pImage->pszFilename);
+
+
             if (RT_SUCCESS(rc))
             {
@@ -3894 +4150 @@
                                    pImage->pszFilename, pPartDesc->pszRawDevice, pszRawDrive, rc);
             }
+
             geom_deletetree(&geomMesh);
         }
@@ -3900 +4157 @@
                            N_("VMDK: Image path: '%s'. geom_gettree failed: %d"), pImage->pszFilename, err);
     }
+
 #elif defined(RT_OS_SOLARIS)
     RT_NOREF(hVol);
+
     dk_cinfo dkiDriveInfo;
     dk_cinfo dkiPartInfo;
@@ -3949 +4208 @@
              * using another way. If there is an error, it returns errno which will be handled below.
              */
+
             uint32_t numPartition = (uint32_t)dkiPartInfo.dki_partition;
             if (numPartition > NDKMAP)
@@ -3983 +4243 @@
                            N_("VMDK: Image path: '%s'. Partition #%u path ('%s') verification failed on '%s': Start offset %RI64, expected %RU64"),
                            pImage->pszFilename, idxPartition, pPartDesc->pszRawDevice, pszRawDrive, cbOffset, pPartDesc->offStartInVDisk);
+
         if (RT_SUCCESS(rc) && cbSize != pPartDesc->cbData)
             rc = vdIfError(pImage->pIfError, VERR_MISMATCH, RT_SRC_POS,
@@ -4058 +4319 @@
 #else
     RT_NOREF(hVol); /* PORTME */
+    rc = VERR_NOT_SUPPORTED;
 #endif
     if (RT_SUCCESS(rc))
@@ -4073 +4335 @@
         {
             uint8_t *pbSector2 = pbSector1 + cbToCompare;
+
             /* Do the comparing, we repeat if it fails and the data might be volatile. */
             uint64_t uPrevCrc1 = 0;
@@ -4088 +4351 @@
                         {
                             rc = VERR_MISMATCH;
+
                             /* Do data stability checks before repeating: */
                             uint64_t const uCrc1 = RTCrc64(pbSector1, cbToCompare);
@@ -4120 +4384 @@
                     offMissmatch++;
                 int cbSample = (int)RT_MIN(cbToCompare - offMissmatch, 16);
+
                 if (cStable > 0)
                     rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS,
@@ -4133 +4398 @@
                 }
             }
+
             RTMemTmpFree(pbSector1);
         }
@@ -4143 +4409 @@
     return rc;
 }
+
 #ifdef RT_OS_WINDOWS
 /**
@@ -4164 +4431 @@
 }
 #endif /* RT_OS_WINDOWS */
+
 /**
  * Worker for vmdkMakeRawDescriptor that adds partition descriptors when the
@@ -4180 +4448 @@
 {
     *phVolToRelease = NIL_RTDVMVOLUME;
+
     /* Check sanity/understanding. */
     Assert(fPartitions);
     Assert((fPartitions & fPartitionsReadOnly) == fPartitionsReadOnly); /* RO should be a sub-set */
+
     /*
      * Allocate on descriptor for each volume up front.
      */
     uint32_t const cVolumes = RTDvmMapGetValidVolumes(hVolMgr);
+
     PVDISKRAWPARTDESC paPartDescs = NULL;
     int rc = vmdkRawDescAppendPartDesc(pImage, pRawDesc, cVolumes, &paPartDescs);
     AssertRCReturn(rc, rc);
+
     /*
      * Enumerate the partitions (volumes) on the disk and create descriptors for each of them.
@@ -4212 +4484 @@
         Assert(cRefs != UINT32_MAX); RT_NOREF(cRefs);
         *phVolToRelease = hVol = hVolNext;
+
         /*
          * Depending on the fPartitions selector and associated read-only mask,
@@ -4218 +4491 @@
          */
         paPartDescs[i].cbData = RTDvmVolumeGetSize(hVol);
+
         uint64_t offVolumeEndIgnored = 0;
         rc = RTDvmVolumeQueryRange(hVol, &paPartDescs[i].offStartInVDisk, &offVolumeEndIgnored);
@@ -4225 +4499 @@
                              pImage->pszFilename, i, pszRawDrive, rc);
         Assert(paPartDescs[i].cbData == offVolumeEndIgnored + 1 - paPartDescs[i].offStartInVDisk);
+
         /* Note! The index must match IHostDrivePartition::number. */
         uint32_t idxPartition = RTDvmVolumeGetIndex(hVol, RTDVMVOLIDX_HOST);
@@ -4233 +4508 @@
             if (fPartitionsReadOnly & RT_BIT_32(idxPartition))
                 paPartDescs[i].uFlags |= VDISKRAW_READONLY;
+
             if (!fRelative)
             {
@@ -4253 +4529 @@
                  */
                 paPartDescs[i].offStartInDevice = 0;
+
 #if defined(RT_OS_DARWIN) || defined(RT_OS_FREEBSD)
                 /* /dev/rdisk1 -> /dev/rdisk1s2 (s=slice) */
@@ -4306 +4583 @@
 #endif
                 AssertPtrReturn(paPartDescs[i].pszRawDevice, VERR_NO_STR_MEMORY);
+
                 rc = vmdkRawDescVerifyPartitionPath(pImage, &paPartDescs[i], idxPartition, pszRawDrive, hRawDrive, cbSector, hVol);
                 AssertRCReturn(rc, rc);
@@ -4317 +4595 @@
         }
     } /* for each volume */
+
     RTDvmVolumeRelease(hVol);
     *phVolToRelease = NIL_RTDVMVOLUME;
+
     /*
      * Check that we found all the partitions the user selected.
@@ -4333 +4613 @@
                              pImage->pszFilename, pszRawDrive, szLeft);
     }
+
     return VINF_SUCCESS;
 }
+
 /**
  * Worker for vmdkMakeRawDescriptor that adds partition descriptors with copies
@@ -4365 +4647 @@
                          pImage->pszFilename, pszRawDrive, rc);
     AssertReturn(cLocations > 0 && cLocations < _16M, VERR_INTERNAL_ERROR_5);
+
     /* We can allocate the partition descriptors here to save an intentation level. */
     PVDISKRAWPARTDESC paPartDescs = NULL;
     rc = vmdkRawDescAppendPartDesc(pImage, pRawDesc, (uint32_t)cLocations, &paPartDescs);
     AssertRCReturn(rc, rc);
+
     /* Allocate the result table and repeat the location table query: */
     PRTDVMTABLELOCATION paLocations = (PRTDVMTABLELOCATION)RTMemAllocZ(sizeof(paLocations[0]) * cLocations);
@@ -4448 +4732 @@
     return rc;
 }
+
 /**
  * Opens the volume manager for the raw drive when in selected-partition mode.
@@ -4463 +4748 @@
 {
     *phVolMgr = NIL_RTDVM;
+
     RTVFSFILE hVfsFile = NIL_RTVFSFILE;
     int rc = RTVfsFileFromRTFile(hRawDrive, RTFILE_O_READ | RTFILE_O_OPEN | RTFILE_O_DENY_NONE, true /*fLeaveOpen*/, &hVfsFile);
@@ -4469 +4755 @@
                          N_("VMDK: Image path: '%s'.  RTVfsFileFromRTFile failed for '%s' handle (%Rrc)"),
                          pImage->pszFilename, pszRawDrive, rc);
+
     RTDVM hVolMgr = NIL_RTDVM;
     rc = RTDvmCreate(&hVolMgr, hVfsFile, cbSector, 0 /*fFlags*/);
+
     RTVfsFileRelease(hVfsFile);
+
     if (RT_FAILURE(rc))
         return vdIfError(pImage->pIfError, rc, RT_SRC_POS,
                          N_("VMDK: Image path: '%s'. Failed to create volume manager instance for '%s' (%Rrc)"),
                          pImage->pszFilename, pszRawDrive, rc);
+
     rc = RTDvmMapOpen(hVolMgr);
     if (RT_SUCCESS(rc))
@@ -4486 +4776 @@
                      pImage->pszFilename, pszRawDrive, rc);
 }
+
 /**
  * Opens the raw drive device and get the sizes for it.
@@ -4509 +4800 @@
                          N_("VMDK: Image path: '%s'. Failed to open the raw drive '%s' for reading (%Rrc)"),
                          pImage->pszFilename, pszRawDrive, rc);
+
     /*
      * Get the sector size.
@@ -4557 +4849 @@
     return rc;
 }
+
 /**
  * Reads the raw disk configuration, leaving initalization and cleanup to the
@@ -4573 +4866 @@
         return vdIfError(pImage->pIfError, VERR_INVALID_PARAMETER, RT_SRC_POS,
                          N_("VMDK: Image path: '%s'. Getting config interface failed"), pImage->pszFilename);
+
     /*
      * RawDrive = path
@@ -4581 +4875 @@
                          N_("VMDK: Image path: '%s'. Getting 'RawDrive' configuration failed (%Rrc)"), pImage->pszFilename, rc);
     AssertPtrReturn(*ppszRawDrive, VERR_INTERNAL_ERROR_3);
+
     /*
      * Partitions=n[r][,...]
@@ -4586 +4881 @@
     uint32_t const cMaxPartitionBits = sizeof(*pfPartitions) * 8 /* ASSUMES 8 bits per char */;
     *pfPartitions = *pfPartitionsReadOnly = 0;
+
     rc = VDCFGQueryStringAlloc(pImgCfg, "Partitions", ppszFreeMe);
     if (RT_SUCCESS(rc))
@@ -4619 +4915 @@
                                  pImage->pszFilename, psz);
         }
+
         RTStrFree(*ppszFreeMe);
         *ppszFreeMe = NULL;
@@ -4625 +4922 @@
         return vdIfError(pImage->pIfError, rc, RT_SRC_POS,
                          N_("VMDK: Image path: '%s'. Getting 'Partitions' configuration failed (%Rrc)"), pImage->pszFilename, rc);
+
     /*
      * BootSector=base64
@@ -4644 +4942 @@
                              N_("VMDK: Image path: '%s'. Custom bootsector for '%s' is way too big: %zu bytes, max 4MB"),
                              pImage->pszFilename, *ppszRawDrive, cbBootSector);
+
         /* Refuse the boot sector if whole-drive.  This used to be done quietly,
            however, bird disagrees and thinks the user should be told that what
@@ -4652 +4951 @@
                              N_("VMDK: Image path: '%s'. Custom bootsector for '%s' is not supported for whole-drive configurations, only when selecting partitions"),
                              pImage->pszFilename, *ppszRawDrive);
+
         *pcbBootSector = (size_t)cbBootSector;
         *ppvBootSector = RTMemAlloc((size_t)cbBootSector);
@@ -4658 +4958 @@
                              N_("VMDK: Image path: '%s'. Failed to allocate %zd bytes for the custom bootsector for '%s'"),
                              pImage->pszFilename, cbBootSector, *ppszRawDrive);
+
         rc = RTBase64Decode(*ppszFreeMe, *ppvBootSector, cbBootSector, NULL /*pcbActual*/, NULL /*ppszEnd*/);
         if (RT_FAILURE(rc))
@@ -4663 +4964 @@
                               N_("VMDK: Image path: '%s'. Base64 decoding of the custom boot sector for '%s' failed (%Rrc)"),
                               pImage->pszFilename, *ppszRawDrive, rc);
+
         RTStrFree(*ppszFreeMe);
         *ppszFreeMe = NULL;
@@ -4669 +4971 @@
         return vdIfError(pImage->pIfError, rc, RT_SRC_POS,
                          N_("VMDK: Image path: '%s'. Getting 'BootSector' configuration failed (%Rrc)"), pImage->pszFilename, rc);
+
     /*
      * Relative=0/1
@@ -4696 +4999 @@
         *pfRelative = false;
 #endif
+
     return VINF_SUCCESS;
 }
+
 /**
  * Creates a raw drive (nee disk) descriptor.
@@ -4716 +5021 @@
     /* Make sure it's NULL. */
     *ppRaw = NULL;
+
     /*
      * Read the configuration.
@@ -4740 +5046 @@
         if (RT_SUCCESS(rc))
         {
+            pImage->cbSize = cbSize;
             /*
              * Create the raw-drive descriptor
@@ -4767 +5074 @@
                     //pRawDesc->cPartDescs = 0;
                     //pRawDesc->pPartDescs = NULL;
+
                     /* We need to parse the partition map to complete the descriptor: */
                     RTDVM hVolMgr = NIL_RTDVM;
@@ -4778 +5086 @@
                             pRawDesc->enmPartitioningType = enmFormatType == RTDVMFORMATTYPE_MBR
                                                           ? VDISKPARTTYPE_MBR : VDISKPARTTYPE_GPT;
+
                             /* Add copies of the partition tables:  */
                             rc = vmdkRawDescDoCopyPartitionTables(pImage, hVolMgr, pRawDesc, pszRawDrive, hRawDrive,
@@ -4789 +5098 @@
                                                              fPartitions, fPartitionsReadOnly, fRelative, &hVolRelease);
                                 RTDvmVolumeRelease(hVolRelease);
+
                                 /* Finally, sort the partition and check consistency (overlaps, etc): */
                                 if (RT_SUCCESS(rc))
@@ -4832 +5142 @@
     return rc;
 }
+
 /**
  * Internal: create VMDK images for raw disk/partition access.
@@ -4840 +5151 @@
     int rc = VINF_SUCCESS;
     PVMDKEXTENT pExtent;
+
     if (pRaw->uFlags & VDISKRAW_DISK)
     {
@@ -4854 +5166 @@
         if (RT_FAILURE(rc))
             return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not create new file '%s'"), pImage->pszFilename);
+
         /* Set up basename for extent description. Cannot use StrDup. */
         size_t cbBasename = strlen(pRaw->pszRawDisk) + 1;
@@ -4870 +5183 @@
         pExtent->enmAccess = (pRaw->uFlags & VDISKRAW_READONLY) ? VMDKACCESS_READONLY : VMDKACCESS_READWRITE;
         pExtent->fMetaDirty = false;
+
         /* Open flat image, the raw disk. */
         rc = vmdkFileOpen(pImage, &pExtent->pFile, pExtent->pszBasename, pExtent->pszFullname,
@@ -4882 +5196 @@
          * file, write the partition information to a flat extent and
          * open all the (flat) raw disk partitions. */
+
         /* First pass over the partition data areas to determine how many
          * extents we need. One data area can require up to 2 extents, as
@@ -4893 +5208 @@
                 return vdIfError(pImage->pIfError, VERR_INVALID_PARAMETER, RT_SRC_POS,
                                  N_("VMDK: incorrect partition data area ordering set up by the caller in '%s'"), pImage->pszFilename);
+
             if (uStart < pPart->offStartInVDisk)
                 cExtents++;
@@ -4901 +5217 @@
         if (uStart != cbSize)
             cExtents++;
+
         rc = vmdkCreateExtents(pImage, cExtents);
         if (RT_FAILURE(rc))
             return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not create new extent list in '%s'"), pImage->pszFilename);
+
         /* Create raw partition descriptor file. */
         rc = vmdkFileOpen(pImage, &pImage->pFile, NULL, pImage->pszFilename,
@@ -4910 +5228 @@
         if (RT_FAILURE(rc))
             return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not create new file '%s'"), pImage->pszFilename);
+
         /* Create base filename for the partition table extent. */
         /** @todo remove fixed buffer without creating memory leaks. */
@@ -4924 +5243 @@
                     pszBaseBase, pszSuff);
         RTStrFree(pszBaseBase);
+
         /* Second pass over the partitions, now define all extents. */
         uint64_t uPartOffset = 0;
@@ -4932 +5252 @@
             PVDISKRAWPARTDESC pPart = &pRaw->pPartDescs[i];
             pExtent = &pImage->pExtents[cExtents++];
+
             if (uStart < pPart->offStartInVDisk)
             {
@@ -4945 +5266 @@
             }
             uStart = pPart->offStartInVDisk + pPart->cbData;
+
             if (pPart->pvPartitionData)
             {
@@ -4954 +5276 @@
                 memcpy(pszBasename, pszPartition, cbBasename);
                 pExtent->pszBasename = pszBasename;
+
                 /* Set up full name for partition extent. */
                 char *pszDirname = RTStrDup(pImage->pszFilename);
@@ -4969 +5292 @@
                 pExtent->enmAccess = VMDKACCESS_READWRITE;
                 pExtent->fMetaDirty = false;
+
                 /* Create partition table flat image. */
                 rc = vmdkFileOpen(pImage, &pExtent->pFile, pExtent->pszBasename, pExtent->pszFullname,
@@ -5003 +5327 @@
                     pExtent->enmAccess = (pPart->uFlags & VDISKRAW_READONLY) ? VMDKACCESS_READONLY : VMDKACCESS_READWRITE;
                     pExtent->fMetaDirty = false;
+
                     /* Open flat image, the raw partition. */
                     rc = vmdkFileOpen(pImage, &pExtent->pFile, pExtent->pszBasename, pExtent->pszFullname,
@@ -5035 +5360 @@
         }
     }
+
     rc = vmdkDescBaseSetStr(pImage, &pImage->Descriptor, "createType",
                             (pRaw->uFlags & VDISKRAW_DISK) ?
@@ -5042 +5368 @@
     return rc;
 }
+
 /**
  * Internal: create a regular (i.e. file-backed) VMDK image.
@@ -5053 +5380 @@
     uint64_t cbOffset = 0;
     uint64_t cbRemaining = cbSize;
+
     if (uImageFlags & VD_VMDK_IMAGE_FLAGS_SPLIT_2G)
     {
@@ -5064 +5392 @@
     if (RT_FAILURE(rc))
         return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not create new extent list in '%s'"), pImage->pszFilename);
+
     /* Basename strings needed for constructing the extent names. */
     char *pszBasenameSubstr = RTPathFilename(pImage->pszFilename);
     AssertPtr(pszBasenameSubstr);
     size_t cbBasenameSubstr = strlen(pszBasenameSubstr) + 1;
+
     /* Create separate descriptor file if necessary. */
     if (cExtents != 1 || (uImageFlags & VD_IMAGE_FLAGS_FIXED))
@@ -5079 +5409 @@
     else
         pImage->pFile = NULL;
+
     /* Set up all extents. */
     for (unsigned i = 0; i < cExtents; i++)
@@ -5084 +5415 @@
         PVMDKEXTENT pExtent = &pImage->pExtents[i];
         uint64_t cbExtent = cbRemaining;
+
         /* Set up fullname/basename for extent description. Cannot use StrDup
          * for basename, as it is not guaranteed that the memory can be freed
@@ -5140 +5472 @@
             return VERR_NO_STR_MEMORY;
         pExtent->pszFullname = pszFullname;
+
         /* Create file for extent. */
         rc = vmdkFileOpen(pImage, &pExtent->pFile, pExtent->pszBasename, pExtent->pszFullname,
@@ -5155 +5488 @@
                 return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not set size of new file '%s'"), pExtent->pszFullname);
         }
+
         /* Place descriptor file information (where integrated). */
         if (cExtents == 1 && !(uImageFlags & VD_IMAGE_FLAGS_FIXED))
@@ -5164 +5498 @@
             pImage->pDescData = NULL;
         }
+
         if (!(uImageFlags & VD_IMAGE_FLAGS_FIXED))
         {
@@ -5191 +5526 @@
                 pExtent->enmType = VMDKETYPE_FLAT;
         }
+
         pExtent->enmAccess = VMDKACCESS_READWRITE;
         pExtent->fUncleanShutdown = true;
@@ -5196 +5532 @@
         pExtent->uSectorOffset = 0;
         pExtent->fMetaDirty = true;
+
         if (!(uImageFlags & VD_IMAGE_FLAGS_FIXED))
         {
@@ -5207 +5544 @@
                 return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not create new grain directory in '%s'"), pExtent->pszFullname);
         }
+
         cbOffset += cbExtent;
+
         if (RT_SUCCESS(rc))
             vdIfProgress(pIfProgress, uPercentStart + cbOffset * uPercentSpan / cbSize);
+
         cbRemaining -= cbExtent;
     }
+
     if (pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_ESX)
     {
@@ -5220 +5561 @@
             return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not set controller type to lsilogic in '%s'"), pImage->pszFilename);
     }
+
     const char *pszDescType = NULL;
     if (uImageFlags & VD_IMAGE_FLAGS_FIXED)
@@ -5245 +5587 @@
     return rc;
 }
+
 /**
  * Internal: Create a real stream optimized VMDK using only linear writes.
@@ -5253 +5596 @@
     if (RT_FAILURE(rc))
         return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not create new extent list in '%s'"), pImage->pszFilename);
+
     /* Basename strings needed for constructing the extent names. */
     const char *pszBasenameSubstr = RTPathFilename(pImage->pszFilename);
     AssertPtr(pszBasenameSubstr);
     size_t cbBasenameSubstr = strlen(pszBasenameSubstr) + 1;
+
     /* No separate descriptor file. */
     pImage->pFile = NULL;
+
     /* Set up all extents. */
     PVMDKEXTENT pExtent = &pImage->pExtents[0];
+
     /* Set up fullname/basename for extent description. Cannot use StrDup
      * for basename, as it is not guaranteed that the memory can be freed
@@ -5270 +5617 @@
     memcpy(pszBasename, pszBasenameSubstr, cbBasenameSubstr);
     pExtent->pszBasename = pszBasename;
+
     char *pszBasedirectory = RTStrDup(pImage->pszFilename);
     RTPathStripFilename(pszBasedirectory);
@@ -5277 +5625 @@
         return VERR_NO_STR_MEMORY;
     pExtent->pszFullname = pszFullname;
+
     /* Create file for extent. Make it write only, no reading allowed. */
     rc = vmdkFileOpen(pImage, &pExtent->pFile, pExtent->pszBasename, pExtent->pszFullname,
@@ -5284 +5633 @@
     if (RT_FAILURE(rc))
         return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not create new file '%s'"), pExtent->pszFullname);
+
     /* Place descriptor file information. */
     pExtent->uDescriptorSector = 1;
@@ -5290 +5640 @@
     pExtent->pDescData = pImage->pDescData;
     pImage->pDescData = NULL;
+
     uint64_t cSectorsPerGDE, cSectorsPerGD;
     pExtent->enmType = VMDKETYPE_HOSTED_SPARSE;
@@ -5299 +5650 @@
     pExtent->cGDEntries = (pExtent->cSectors + cSectorsPerGDE - 1) / cSectorsPerGDE;
     cSectorsPerGD = (pExtent->cGDEntries + (512 / sizeof(uint32_t) - 1)) / (512 / sizeof(uint32_t));
+
     /* The spec says version is 1 for all VMDKs, but the vast
      * majority of streamOptimized VMDKs actually contain
@@ -5305 +5657 @@
     pExtent->uCompression = VMDK_COMPRESSION_DEFLATE;
     pExtent->fFooter = true;
+
     pExtent->enmAccess = VMDKACCESS_READONLY;
     pExtent->fUncleanShutdown = false;
@@ -5310 +5663 @@
     pExtent->uSectorOffset = 0;
     pExtent->fMetaDirty = true;
+
     /* Create grain directory, without preallocating it straight away. It will
      * be constructed on the fly when writing out the data and written when
@@ -5318 +5672 @@
     if (RT_FAILURE(rc))
         return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not create new grain directory in '%s'"), pExtent->pszFullname);
+
     rc = vmdkDescBaseSetStr(pImage, &pImage->Descriptor, "createType",
                             "streamOptimized");
     if (RT_FAILURE(rc))
         rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not set the image type in '%s'"), pImage->pszFilename);
+
     return rc;
 }
+
 /**
  * Initializes the UUID fields in the DDB.
@@ -5359 +5716 @@
         rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS,
                        N_("VMDK: error storing image UUID in new descriptor in '%s'"), pImage->pszFilename);
+
     return rc;
 }
+
 /**
  * Internal: The actual code for creating any VMDK variant currently in
@@ -5373 +5732 @@
 {
     pImage->uImageFlags = uImageFlags;
+
     pImage->pIfError = VDIfErrorGet(pImage->pVDIfsDisk);
     pImage->pIfIo = VDIfIoIntGet(pImage->pVDIfsImage);
     AssertPtrReturn(pImage->pIfIo, VERR_INVALID_PARAMETER);
+
     int rc = vmdkCreateDescriptor(pImage, pImage->pDescData, pImage->cbDescAlloc,
                                   &pImage->Descriptor);
@@ -5386 +5747 @@
             rc = vmdkMakeRawDescriptor(pImage, &pRaw);
             if (RT_FAILURE(rc))
-                return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could get raw descriptor for '%s'"), pImage->pszFilename);
+                return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not create raw descriptor for '%s'"),
+                    pImage->pszFilename);
+            if (!cbSize)
+                cbSize = pImage->cbSize;
+
             rc = vmdkCreateRawImage(pImage, pRaw, cbSize);
             vmdkRawDescFree(pRaw);
@@ -5402 +5767 @@
                                         uPercentSpan * 95 / 100);
         }
+
         if (RT_SUCCESS(rc))
         {
             vdIfProgress(pIfProgress, uPercentStart + uPercentSpan * 98 / 100);
+
             pImage->cbSize = cbSize;
+
             for (unsigned i = 0; i < pImage->cExtents; i++)
             {
                 PVMDKEXTENT pExtent = &pImage->pExtents[i];
+
                 rc = vmdkDescExtInsert(pImage, &pImage->Descriptor, pExtent->enmAccess,
                                        pExtent->cNominalSectors, pExtent->enmType,
@@ -5418 +5787 @@
                 }
             }
+
             if (RT_SUCCESS(rc))
                 vmdkDescExtRemoveDummy(pImage, &pImage->Descriptor);
-            if (   RT_SUCCESS(rc)
-                && pPCHSGeometry->cCylinders != 0
-                && pPCHSGeometry->cHeads != 0
-                && pPCHSGeometry->cSectors != 0)
-                rc = vmdkDescSetPCHSGeometry(pImage, pPCHSGeometry);
+
+            pImage->LCHSGeometry = *pLCHSGeometry;
+            pImage->PCHSGeometry = *pPCHSGeometry;
+
+            if (RT_SUCCESS(rc))
+            {
+                if (   pPCHSGeometry->cCylinders != 0
+                    && pPCHSGeometry->cHeads != 0
+                    && pPCHSGeometry->cSectors != 0)
+                    rc = vmdkDescSetPCHSGeometry(pImage, pPCHSGeometry);
+                else if (uImageFlags & VD_VMDK_IMAGE_FLAGS_RAWDISK)
+                {
+                    VDGEOMETRY RawDiskPCHSGeometry;
+                    RawDiskPCHSGeometry.cCylinders = (uint32_t)RT_MIN(pImage->cbSize / 512 / 16 / 63, 16383);
+                    RawDiskPCHSGeometry.cHeads = 16;
+                    RawDiskPCHSGeometry.cSectors = 63;
+                    rc = vmdkDescSetPCHSGeometry(pImage, &RawDiskPCHSGeometry);
+                }
+            }
+
             if (   RT_SUCCESS(rc)
                 && pLCHSGeometry->cCylinders != 0
@@ -5430 +5815 @@
                 && pLCHSGeometry->cSectors != 0)
                 rc = vmdkDescSetLCHSGeometry(pImage, pLCHSGeometry);
-            pImage->LCHSGeometry = *pLCHSGeometry;
-            pImage->PCHSGeometry = *pPCHSGeometry;
+
             pImage->ImageUuid = *pUuid;
             RTUuidClear(&pImage->ParentUuid);
             RTUuidClear(&pImage->ModificationUuid);
             RTUuidClear(&pImage->ParentModificationUuid);
+
             if (RT_SUCCESS(rc))
                 rc = vmdkCreateImageDdbUuidsInit(pImage);
+
             if (RT_SUCCESS(rc))
                 rc = vmdkAllocateGrainTableCache(pImage);
+
             if (RT_SUCCESS(rc))
             {
@@ -5446 +5833 @@
                     rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: cannot set image comment in '%s'"), pImage->pszFilename);
             }
+
             if (RT_SUCCESS(rc))
             {
                 vdIfProgress(pIfProgress, uPercentStart + uPercentSpan * 99 / 100);
+
                 if (pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
                 {
@@ -5473 +5862 @@
     else
         rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not create new descriptor in '%s'"), pImage->pszFilename);
+
+
     if (RT_SUCCESS(rc))
     {
@@ -5478 +5869 @@
         pImage->RegionList.fFlags   = 0;
         pImage->RegionList.cRegions = 1;
+
         pRegion->offRegion            = 0; /* Disk start. */
         pRegion->cbBlock              = 512;
@@ -5485 +5877 @@
         pRegion->cbMetadata           = 0;
         pRegion->cRegionBlocksOrBytes = pImage->cbSize;
+
         vdIfProgress(pIfProgress, uPercentStart + uPercentSpan);
     }
@@ -5491 +5884 @@
     return rc;
 }
+
 /**
  * Internal: Update image comment.
@@ -5503 +5897 @@
             return VERR_NO_MEMORY;
     }
+
     int rc = vmdkDescDDBSetStr(pImage, &pImage->Descriptor,
                                "ddb.comment", pszCommentEncoded);
@@ -5511 +5906 @@
     return VINF_SUCCESS;
 }
+
 /**
  * Internal. Clear the grain table buffer for real stream optimized writing.
@@ -5521 +5917 @@
                VMDK_GT_CACHELINE_SIZE * sizeof(uint32_t));
 }
+
 /**
  * Internal. Flush the grain table buffer for real stream optimized writing.
@@ -5529 +5926 @@
     int rc = VINF_SUCCESS;
     uint32_t cCacheLines = RT_ALIGN(pExtent->cGTEntries, VMDK_GT_CACHELINE_SIZE) / VMDK_GT_CACHELINE_SIZE;
+
     /* VMware does not write out completely empty grain tables in the case
      * of streamOptimized images, which according to my interpretation of
@@ -5550 +5948 @@
     if (fAllZero)
         return VINF_SUCCESS;
+
     uint64_t uFileOffset = pExtent->uAppendPosition;
     if (!uFileOffset)
@@ -5555 +5954 @@
     /* Align to sector, as the previous write could have been any size. */
     uFileOffset = RT_ALIGN_64(uFileOffset, 512);
+
     /* Grain table marker. */
     uint8_t aMarker[512];
@@ -5565 +5965 @@
     AssertRC(rc);
     uFileOffset += 512;
+
     if (!pExtent->pGD || pExtent->pGD[uGDEntry])
         return VERR_INTERNAL_ERROR;
+
     pExtent->pGD[uGDEntry] = VMDK_BYTE2SECTOR(uFileOffset);
+
     for (uint32_t i = 0; i < cCacheLines; i++)
     {
@@ -5575 +5978 @@
         for (uint32_t j = 0; j < VMDK_GT_CACHELINE_SIZE; j++, pGTTmp++)
             *pGTTmp = RT_H2LE_U32(*pGTTmp);
+
         rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage, uFileOffset,
                                     &pImage->pGTCache->aGTCache[i].aGTData[0],
@@ -5586 +5990 @@
     return rc;
 }
+
 /**
  * Internal. Free all allocated space for representing an image, and optionally
@@ -5593 +5998 @@
 {
     int rc = VINF_SUCCESS;
+
     /* Freeing a never allocated image (e.g. because the open failed) is
      * not signalled as an error. After all nothing bad happens. */
@@ -5618 +6024 @@
                         pImage->pExtents[i].fMetaDirty = true;
                     }
+
                     /* From now on it's not safe to append any more data. */
                     pImage->pExtents[i].uAppendPosition = 0;
@@ -5623 +6030 @@
             }
         }
+
         if (pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
         {
@@ -5641 +6049 @@
                     AssertRC(rc);
                 }
+
                 uint64_t uFileOffset = pExtent->uAppendPosition;
                 if (!uFileOffset)
                     return VERR_INTERNAL_ERROR;
                 uFileOffset = RT_ALIGN_64(uFileOffset, 512);
+
                 /* From now on it's not safe to append any more data. */
                 pExtent->uAppendPosition = 0;
+
                 /* Grain directory marker. */
                 uint8_t aMarker[512];
@@ -5657 +6068 @@
                 AssertRC(rc);
                 uFileOffset += 512;
+
                 /* Write grain directory in little endian style. The array will
                  * not be used after this, so convert in place. */
@@ -5666 +6078 @@
                                             pExtent->cGDEntries * sizeof(uint32_t));
                 AssertRC(rc);
+
                 pExtent->uSectorGD = VMDK_BYTE2SECTOR(uFileOffset);
                 pExtent->uSectorRGD = VMDK_BYTE2SECTOR(uFileOffset);
@@ -5671 +6084 @@
                                           + pExtent->cGDEntries * sizeof(uint32_t),
                                           512);
+
                 /* Footer marker. */
                 memset(pMarker, '\0', sizeof(aMarker));
@@ -5678 +6092 @@
                                             uFileOffset, aMarker, sizeof(aMarker));
                 AssertRC(rc);
+
                 uFileOffset += 512;
                 rc = vmdkWriteMetaSparseExtent(pImage, pExtent, uFileOffset, NULL);
                 AssertRC(rc);
+
                 uFileOffset += 512;
                 /* End-of-stream marker. */
@@ -5691 +6107 @@
         else if (!fDelete && fFlush)
             vmdkFlushImage(pImage, NULL);
+
         if (pImage->pExtents != NULL)
         {
@@ -5712 +6129 @@
         if (RT_SUCCESS(rc))
             rc = rc2; /* Propogate any error when closing the file. */
+
         if (pImage->pGTCache)
         {
@@ -5723 +6141 @@
         }
     }
+
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
+
 /**
  * Internal. Flush image data (and metadata) to disk.
@@ -5733 +6153 @@
     PVMDKEXTENT pExtent;
     int rc = VINF_SUCCESS;
+
     /* Update descriptor if changed. */
     if (pImage->Descriptor.fDirty)
         rc = vmdkWriteDescriptor(pImage, pIoCtx);
+
     if (RT_SUCCESS(rc))
     {
@@ -5771 +6193 @@
                 }
             }
+
             if (RT_FAILURE(rc))
                 break;
+
             switch (pExtent->enmType)
             {
@@ -5794 +6218 @@
         }
     }
+
     return rc;
 }
+
 /**
  * Internal. Find extent corresponding to the sector number in the disk.
@@ -5804 +6230 @@
     PVMDKEXTENT pExtent = NULL;
     int rc = VINF_SUCCESS;
+
     for (unsigned i = 0; i < pImage->cExtents; i++)
     {
@@ -5814 +6241 @@
         offSector -= pImage->pExtents[i].cNominalSectors;
     }
+
     if (pExtent)
         *ppExtent = pExtent;
     else
         rc = VERR_IO_SECTOR_NOT_FOUND;
+
     return rc;
 }
+
 /**
  * Internal. Hash function for placing the grain table hash entries.
@@ -5830 +6260 @@
     return (uSector + uExtent) % pCache->cEntries;
 }
+
 /**
  * Internal. Get sector number in the extent file from the relative sector
@@ -5844 +6275 @@
     uint32_t aGTDataTmp[VMDK_GT_CACHELINE_SIZE];
     int rc;
+
     /* For newly created and readonly/sequentially opened streamOptimized
      * images this must be a no-op, as the grain directory is not there. */
@@ -5855 +6287 @@
         return VINF_SUCCESS;
     }
+
     uGDIndex = uSector / pExtent->cSectorsPerGDE;
     if (uGDIndex >= pExtent->cGDEntries)
@@ -5866 +6299 @@
         return VINF_SUCCESS;
     }
+
     uGTBlock = uSector / (pExtent->cSectorsPerGrain * VMDK_GT_CACHELINE_SIZE);
     uGTHash = vmdkGTCacheHash(pCache, uGTBlock, pExtent->uExtent);
@@ -5894 +6328 @@
     return VINF_SUCCESS;
 }
+
 /**
  * Internal. Writes the grain and also if necessary the grain tables.
@@ -5908 +6343 @@
     const void *pData;
     int rc;
+
     /* Very strict requirements: always write at least one full grain, with
      * proper alignment. Everything else would require reading of already
@@ -5920 +6356 @@
         || uSector + VMDK_BYTE2SECTOR(cbWrite) > pExtent->cNominalSectors)
         return VERR_INVALID_PARAMETER;
+
     /* Clip write range to at most the rest of the grain. */
     cbWrite = RT_MIN(cbWrite, VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain - uSector % pExtent->cSectorsPerGrain));
+
     /* Do not allow to go back. */
     uGrain = uSector / pExtent->cSectorsPerGrain;
@@ -5930 +6368 @@
     if (uGrain < pExtent->uLastGrainAccess)
         return VERR_VD_VMDK_INVALID_WRITE;
+
     /* Zero byte write optimization. Since we don't tell VBoxHDD that we need
      * to allocate something, we also need to detect the situation ourself. */
@@ -5935 +6374 @@
         && vdIfIoIntIoCtxIsZero(pImage->pIfIo, pIoCtx, cbWrite, true /* fAdvance */))
         return VINF_SUCCESS;
+
     if (uGDEntry != uLastGDEntry)
     {
@@ -5948 +6388 @@
         }
     }
+
     uint64_t uFileOffset;
     uFileOffset = pExtent->uAppendPosition;
@@ -5954 +6395 @@
     /* 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
      * grain table buffer space. Also grain table entry must be clear. */
@@ -5961 +6403 @@
         || pImage->pGTCache->aGTCache[uCacheLine].aGTData[uCacheEntry])
         return VERR_INTERNAL_ERROR;
+
     /* Update grain table entry. */
     pImage->pGTCache->aGTCache[uCacheLine].aGTData[uCacheEntry] = VMDK_BYTE2SECTOR(uFileOffset);
+
     if (cbWrite != VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain))
     {
@@ -5975 +6419 @@
         unsigned cSegments = 1;
         size_t cbSeg = 0;
+
         cbSeg = vdIfIoIntIoCtxSegArrayCreate(pImage->pIfIo, pIoCtx, &Segment,
                                              &cSegments, VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain));
@@ -5991 +6436 @@
     pExtent->uLastGrainAccess = uGrain;
     pExtent->uAppendPosition += cbGrain;
+
     return rc;
 }
+
 /**
  * Internal: Updates the grain table during grain allocation.
@@ -6006 +6453 @@
     uint64_t uSector = pGrainAlloc->uSector;
     PVMDKGTCACHEENTRY pGTCacheEntry;
+
     LogFlowFunc(("pImage=%#p pExtent=%#p pCache=%#p pIoCtx=%#p pGrainAlloc=%#p\n",
                  pImage, pExtent, pCache, pIoCtx, pGrainAlloc));
+
     uGTSector = pGrainAlloc->uGTSector;
     uRGTSector = pGrainAlloc->uRGTSector;
     LogFlow(("uGTSector=%llu uRGTSector=%llu\n", uGTSector, uRGTSector));
+
     /* Update the grain table (and the cache). */
     uGTBlock = uSector / (pExtent->cSectorsPerGrain * VMDK_GT_CACHELINE_SIZE);
@@ -6073 +6523 @@
             return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: cannot write updated backup grain table in '%s'"), pExtent->pszFullname);
     }
+
     LogFlowFunc(("leaving rc=%Rrc\n", rc));
     return rc;
 }
+
 /**
  * Internal - complete the grain allocation by updating disk grain table if required.
@@ -6085 +6537 @@
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
     PVMDKGRAINALLOCASYNC pGrainAlloc = (PVMDKGRAINALLOCASYNC)pvUser;
+
     LogFlowFunc(("pBackendData=%#p pIoCtx=%#p pvUser=%#p rcReq=%Rrc\n",
                  pBackendData, pIoCtx, pvUser, rcReq));
+
     pGrainAlloc->cIoXfersPending--;
     if (!pGrainAlloc->cIoXfersPending && pGrainAlloc->fGTUpdateNeeded)
         rc = vmdkAllocGrainGTUpdate(pImage, pGrainAlloc->pExtent, pIoCtx, pGrainAlloc);
+
     if (!pGrainAlloc->cIoXfersPending)
     {
@@ -6095 +6550 @@
         RTMemFree(pGrainAlloc);
     }
+
     LogFlowFunc(("Leaving rc=%Rrc\n", rc));
     return rc;
 }
+
 /**
  * Internal. Allocates a new grain table (if necessary).
@@ -6109 +6566 @@
     PVMDKGRAINALLOCASYNC pGrainAlloc = NULL;
     int rc;
+
     LogFlowFunc(("pCache=%#p pExtent=%#p pIoCtx=%#p uSector=%llu cbWrite=%llu\n",
                  pCache, pExtent, pIoCtx, uSector, cbWrite));
+
     pGrainAlloc = (PVMDKGRAINALLOCASYNC)RTMemAllocZ(sizeof(VMDKGRAINALLOCASYNC));
     if (!pGrainAlloc)
         return VERR_NO_MEMORY;
+
     pGrainAlloc->pExtent = pExtent;
     pGrainAlloc->uSector = uSector;
+
     uGDIndex = uSector / pExtent->cSectorsPerGDE;
     if (uGDIndex >= pExtent->cGDEntries)
@@ -6130 +6591 @@
     {
         LogFlow(("Allocating new grain table\n"));
+
         /* There is no grain table referenced by this grain directory
          * entry. So there is absolutely no data in this area. Allocate
@@ -6140 +6602 @@
         }
         Assert(!(uFileOffset % 512));
+
         uFileOffset = RT_ALIGN_64(uFileOffset, 512);
         uGTSector = VMDK_BYTE2SECTOR(uFileOffset);
+
         /* Normally the grain table is preallocated for hosted sparse extents
          * that support more than 32 bit sector numbers. So this shouldn't
@@ -6150 +6614 @@
             return VERR_VD_VMDK_INVALID_HEADER;
         }
+
         /* Write grain table by writing the required number of grain table
          * cache chunks. Allocate memory dynamically here or we flood the
@@ -6155 +6620 @@
         size_t cbGTDataTmp = pExtent->cGTEntries * sizeof(uint32_t);
         uint32_t *paGTDataTmp = (uint32_t *)RTMemTmpAllocZ(cbGTDataTmp);
+
         if (!paGTDataTmp)
         {
@@ -6160 +6626 @@
             return VERR_NO_MEMORY;
         }
+
         memset(paGTDataTmp, '\0', cbGTDataTmp);
         rc = vdIfIoIntFileWriteMeta(pImage->pIfIo, pExtent->pFile->pStorage,
@@ -6175 +6642 @@
         pExtent->uAppendPosition = RT_ALIGN_64(  pExtent->uAppendPosition
                                                + cbGTDataTmp, 512);
+
         if (pExtent->pRGD)
         {
@@ -6183 +6651 @@
             Assert(!(uFileOffset % 512));
             uRGTSector = VMDK_BYTE2SECTOR(uFileOffset);
+
             /* Normally the redundant grain table is preallocated for hosted
              * sparse extents that support more than 32 bit sector numbers. So
@@ -6191 +6660 @@
                 return VERR_VD_VMDK_INVALID_HEADER;
             }
+
             /* Write grain table by writing the required number of grain table
              * cache chunks. Allocate memory dynamically here or we flood the
@@ -6205 +6675 @@
                 return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: cannot write backup grain table allocation in '%s'"), pExtent->pszFullname);
             }
+
             pExtent->uAppendPosition = pExtent->uAppendPosition + cbGTDataTmp;
         }
+
         RTMemTmpFree(paGTDataTmp);
+
         /* Update the grain directory on disk (doing it before writing the
          * grain table will result in a garbled extent if the operation is
@@ -6233 +6706 @@
                 return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: cannot write backup grain directory entry in '%s'"), pExtent->pszFullname);
         }
+
         /* As the final step update the in-memory copy of the GDs. */
         pExtent->pGD[uGDIndex] = uGTSector;
@@ -6238 +6712 @@
             pExtent->pRGD[uGDIndex] = uRGTSector;
     }
+
     LogFlow(("uGTSector=%llu uRGTSector=%llu\n", uGTSector, uRGTSector));
     pGrainAlloc->uGTSector = uGTSector;
     pGrainAlloc->uRGTSector = uRGTSector;
+
     uFileOffset = pExtent->uAppendPosition;
     if (!uFileOffset)
         return VERR_INTERNAL_ERROR;
     Assert(!(uFileOffset % 512));
+
     pGrainAlloc->uGrainOffset = uFileOffset;
+
     if (pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
     {
@@ -6251 +6729 @@
                         ("Accesses to stream optimized images must be synchronous\n"),
                         VERR_INVALID_STATE);
+
         if (cbWrite != VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain))
             return vdIfError(pImage->pIfError, VERR_INTERNAL_ERROR, RT_SRC_POS, N_("VMDK: not enough data for a compressed data block in '%s'"), pExtent->pszFullname);
+
         /* Invalidate cache, just in case some code incorrectly allows mixing
          * of reads and writes. Normally shouldn't be needed. */
         pExtent->uGrainSectorAbs = 0;
+
         /* Write compressed data block and the markers. */
         uint32_t cbGrain = 0;
@@ -6261 +6742 @@
         RTSGSEG Segment;
         unsigned cSegments = 1;
+
         cbSeg = vdIfIoIntIoCtxSegArrayCreate(pImage->pIfIo, pIoCtx, &Segment,
                                              &cSegments, cbWrite);
         Assert(cbSeg == cbWrite);
+
         rc = vmdkFileDeflateSync(pImage, pExtent, uFileOffset,
                                  Segment.pvSeg, cbWrite, uSector, &cbGrain);
@@ -6284 +6767 @@
         else if (RT_FAILURE(rc))
             return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: cannot write allocated data block in '%s'"), pExtent->pszFullname);
+
         pExtent->uAppendPosition += cbWrite;
     }
+
     rc = vmdkAllocGrainGTUpdate(pImage, pExtent, pIoCtx, pGrainAlloc);
+
     if (!pGrainAlloc->cIoXfersPending)
     {
@@ -6292 +6778 @@
         RTMemFree(pGrainAlloc);
     }
+
     LogFlowFunc(("leaving rc=%Rrc\n", rc));
+
     return rc;
 }
+
 /**
  * Internal. Reads the contents by sequentially going over the compressed
@@ -6304 +6793 @@
 {
     int rc;
+
     LogFlowFunc(("pImage=%#p pExtent=%#p uSector=%llu pIoCtx=%#p cbRead=%llu\n",
                  pImage, pExtent, uSector, pIoCtx, cbRead));
+
     AssertMsgReturn(vdIfIoIntIoCtxIsSynchronous(pImage->pIfIo, pIoCtx),
                     ("Async I/O not supported for sequential stream optimized images\n"),
                     VERR_INVALID_STATE);
+
     /* Do not allow to go back. */
     uint32_t uGrain = uSector / pExtent->cSectorsPerGrain;
@@ -6314 +6806 @@
         return VERR_VD_VMDK_INVALID_STATE;
     pExtent->uLastGrainAccess = uGrain;
+
     /* After a previous error do not attempt to recover, as it would need
      * seeking (in the general case backwards which is forbidden). */
     if (!pExtent->uGrainSectorAbs)
         return VERR_VD_VMDK_INVALID_STATE;
+
     /* Check if we need to read something from the image or if what we have
      * in the buffer is good to fulfill the request. */
@@ -6324 +6818 @@
         uint32_t uGrainSectorAbs =   pExtent->uGrainSectorAbs
                                    + VMDK_BYTE2SECTOR(pExtent->cbGrainStreamRead);
+
         /* Get the marker from the next data block - and skip everything which
          * is not a compressed grain. If it's a compressed grain which is for
@@ -6338 +6833 @@
             Marker.uSector = RT_LE2H_U64(Marker.uSector);
             Marker.cbSize = RT_LE2H_U32(Marker.cbSize);
+
             if (Marker.cbSize == 0)
             {
@@ -6416 +6912 @@
             }
         } while (Marker.uType != VMDK_MARKER_EOS);
+
         pExtent->uGrainSectorAbs = uGrainSectorAbs;
+
         if (!pExtent->cbGrainStreamRead && Marker.uType == VMDK_MARKER_EOS)
         {
@@ -6425 +6923 @@
         }
     }
+
     if (pExtent->uGrain > uSector / pExtent->cSectorsPerGrain)
     {
@@ -6432 +6931 @@
         return VERR_VD_BLOCK_FREE;
     }
+
     uint32_t uSectorInGrain = uSector % pExtent->cSectorsPerGrain;
     vdIfIoIntIoCtxCopyTo(pImage->pIfIo, pIoCtx,
@@ -6439 +6939 @@
     return VINF_SUCCESS;
 }
+
 /**
  * Replaces a fragment of a string with the specified string.
@@ -6507 +7008 @@
     return pszNewStr;
 }
+
+
 /** @copydoc VDIMAGEBACKEND::pfnProbe */
 static DECLCALLBACK(int) vmdkProbe(const char *pszFilename, PVDINTERFACE pVDIfsDisk,
@@ -6534 +7037 @@
         vmdkFreeImage(pImage, false, false /*fFlush*/);
         RTMemFree(pImage);
+
         if (RT_SUCCESS(rc))
             *penmType = VDTYPE_HDD;
@@ -6539 +7043 @@
     else
         rc = VERR_NO_MEMORY;
+
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnOpen */
 static DECLCALLBACK(int) vmdkOpen(const char *pszFilename, unsigned uOpenFlags,
@@ -6548 +7054 @@
 {
     RT_NOREF1(enmType); /**< @todo r=klaus make use of the type info. */
+
     LogFlowFunc(("pszFilename=\"%s\" uOpenFlags=%#x pVDIfsDisk=%#p pVDIfsImage=%#p enmType=%u ppBackendData=%#p\n",
                  pszFilename, uOpenFlags, pVDIfsDisk, pVDIfsImage, enmType, ppBackendData));
     int rc;
+
     /* Check open flags. All valid flags are supported. */
     AssertReturn(!(uOpenFlags & ~VD_OPEN_FLAGS_MASK), VERR_INVALID_PARAMETER);
     AssertPtrReturn(pszFilename, VERR_INVALID_POINTER);
     AssertReturn(*pszFilename != '\0', VERR_INVALID_PARAMETER);
+
 
     PVMDKIMAGE pImage = (PVMDKIMAGE)RTMemAllocZ(RT_UOFFSETOF(VMDKIMAGE, RegionList.aRegions[1]));
@@ -6567 +7076 @@
         pImage->pVDIfsDisk = pVDIfsDisk;
         pImage->pVDIfsImage = pVDIfsImage;
+
         rc = vmdkOpenImage(pImage, uOpenFlags);
         if (RT_SUCCESS(rc))
@@ -6575 +7085 @@
     else
         rc = VERR_NO_MEMORY;
+
     LogFlowFunc(("returns %Rrc (pBackendData=%#p)\n", rc, *ppBackendData));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnCreate */
 static DECLCALLBACK(int) vmdkCreate(const char *pszFilename, uint64_t cbSize,
@@ -6591 +7103 @@
                  pszFilename, cbSize, uImageFlags, pszComment, pPCHSGeometry, pLCHSGeometry, pUuid, uOpenFlags, uPercentStart, uPercentSpan, pVDIfsDisk, pVDIfsImage, pVDIfsOperation, enmType, ppBackendData));
     int rc;
+
     /* Check the VD container type and image flags. */
     if (   enmType != VDTYPE_HDD
         || (uImageFlags & ~VD_VMDK_IMAGE_FLAGS_MASK) != 0)
         return VERR_VD_INVALID_TYPE;
+
     /* Check size. Maximum 256TB-64K for sparse images, otherwise unlimited. */
     if (   !(uImageFlags & VD_VMDK_IMAGE_FLAGS_RAWDISK)
@@ -6600 +7114 @@
             || (!(uImageFlags & VD_IMAGE_FLAGS_FIXED) && cbSize >= _1T * 256 - _64K)))
         return VERR_VD_INVALID_SIZE;
+
     /* Check image flags for invalid combinations. */
     if (   (uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
         && (uImageFlags & ~(VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED | VD_IMAGE_FLAGS_DIFF)))
         return VERR_INVALID_PARAMETER;
+
     /* Check open flags. All valid flags are supported. */
     AssertReturn(!(uOpenFlags & ~VD_OPEN_FLAGS_MASK), VERR_INVALID_PARAMETER);
@@ -6613 +7129 @@
                    && !(uImageFlags & VD_IMAGE_FLAGS_FIXED)),
                  VERR_INVALID_PARAMETER);
+
     PVMDKIMAGE pImage = (PVMDKIMAGE)RTMemAllocZ(RT_UOFFSETOF(VMDKIMAGE, RegionList.aRegions[1]));
     if (RT_LIKELY(pImage))
     {
         PVDINTERFACEPROGRESS pIfProgress = VDIfProgressGet(pVDIfsOperation);
+
         pImage->pszFilename = pszFilename;
         pImage->pFile = NULL;
@@ -6647 +7165 @@
                     rc = vmdkOpenImage(pImage, uOpenFlags);
                 }
+
                 if (RT_SUCCESS(rc))
                     *ppBackendData = pImage;
             }
+
             if (RT_FAILURE(rc))
                 RTMemFree(pImage->pDescData);
@@ -6655 +7175 @@
         else
             rc = VERR_NO_MEMORY;
+
         if (RT_FAILURE(rc))
             RTMemFree(pImage);
@@ -6660 +7181 @@
     else
         rc = VERR_NO_MEMORY;
+
     LogFlowFunc(("returns %Rrc (pBackendData=%#p)\n", rc, *ppBackendData));
     return rc;
 }
+
 /**
  * Prepares the state for renaming a VMDK image, setting up the state and allocating
@@ -6675 +7198 @@
 {
     AssertReturn(RTPathFilename(pszFilename) != NULL, VERR_INVALID_PARAMETER);
+
     int rc = VINF_SUCCESS;
+
     memset(&pRenameState->DescriptorCopy, 0, sizeof(pRenameState->DescriptorCopy));
+
     /*
      * Allocate an array to store both old and new names of renamed files
@@ -6702 +7228 @@
             pRenameState->fEmbeddedDesc = true;
         }
+
         /* Save the descriptor content. */
         pRenameState->DescriptorCopy.cLines = pImage->Descriptor.cLines;
@@ -6713 +7240 @@
             }
         }
+
         if (RT_SUCCESS(rc))
         {
@@ -6719 +7247 @@
             AssertReturn(pRenameState->pszNewBaseName, VERR_NO_STR_MEMORY);
             RTPathStripSuffix(pRenameState->pszNewBaseName);
+
             pRenameState->pszOldBaseName = RTStrDup(RTPathFilename(pImage->pszFilename));
             AssertReturn(pRenameState->pszOldBaseName, VERR_NO_STR_MEMORY);
             RTPathStripSuffix(pRenameState->pszOldBaseName);
+
             /* Prepare both old and new full names used for string replacement.
                Note! Must abspath the stuff here, so the strstr weirdness later in
@@ -6729 +7259 @@
             AssertReturn(pRenameState->pszNewFullName, VERR_NO_STR_MEMORY);
             RTPathStripSuffix(pRenameState->pszNewFullName);
+
             pRenameState->pszOldFullName = RTPathAbsDup(pImage->pszFilename);
             AssertReturn(pRenameState->pszOldFullName, VERR_NO_STR_MEMORY);
             RTPathStripSuffix(pRenameState->pszOldFullName);
+
             /* Save the old name for easy access to the old descriptor file. */
             pRenameState->pszOldDescName = RTStrDup(pImage->pszFilename);
             AssertReturn(pRenameState->pszOldDescName, VERR_NO_STR_MEMORY);
+
             /* Save old image name. */
             pRenameState->pszOldImageName = pImage->pszFilename;
@@ -6741 +7274 @@
     else
         rc = VERR_NO_TMP_MEMORY;
+
     return rc;
 }
+
 /**
  * Destroys the given rename state, freeing all allocated memory.
@@ -6786 +7321 @@
         RTStrFree(pRenameState->pszNewFullName);
 }
+
 /**
  * Rolls back the rename operation to the original state.
@@ -6796 +7332 @@
 {
     int rc = VINF_SUCCESS;
+
     if (!pRenameState->fImageFreed)
     {
@@ -6804 +7341 @@
         vmdkFreeImage(pImage, false, true /*fFlush*/);
     }
+
     /* Rename files back. */
     for (unsigned i = 0; i <= pRenameState->cExtents; i++)
@@ -6842 +7380 @@
     pImage->pszFilename = pRenameState->pszOldImageName;
     rc = vmdkOpenImage(pImage, pImage->uOpenFlags);
+
     return rc;
 }
+
 /**
  * Rename worker doing the real work.
@@ -6856 +7396 @@
     int rc = VINF_SUCCESS;
     unsigned i, line;
+
     /* Update the descriptor with modified extent names. */
     for (i = 0, line = pImage->Descriptor.uFirstExtent;
@@ -6872 +7413 @@
         pImage->Descriptor.aLines[line] = pRenameState->apszNewLines[i];
     }
+
     if (RT_SUCCESS(rc))
     {
@@ -6878 +7420 @@
         /* Flush the descriptor now, in case it is embedded. */
         vmdkFlushImage(pImage, NULL);
+
         /* Close and rename/move extents. */
         for (i = 0; i < pRenameState->cExtents; i++)
@@ -6895 +7438 @@
             if (RT_FAILURE(rc))
                 break;;
+
             /* Rename the extent file. */
             rc = vdIfIoIntFileMove(pImage->pIfIo, pExtent->pszFullname, pRenameState->apszNewName[i], 0);
@@ -6902 +7446 @@
             pRenameState->apszOldName[i] = RTStrDup(pExtent->pszFullname);
         }
+
         if (RT_SUCCESS(rc))
         {
@@ -6909 +7454 @@
             {
                 pRenameState->fImageFreed = true;
+
                 /* Last elements of new/old name arrays are intended for
                  * storing descriptor's names.
@@ -6923 +7469 @@
                     }
                 }
+
                 /* Update pImage with the new information. */
                 pImage->pszFilename = pszFilename;
+
                 /* Open the new image. */
                 rc = vmdkOpenImage(pImage, pImage->uOpenFlags);
@@ -6930 +7478 @@
         }
     }
+
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnRename */
 static DECLCALLBACK(int) vmdkRename(void *pBackendData, const char *pszFilename)
 {
     LogFlowFunc(("pBackendData=%#p pszFilename=%#p\n", pBackendData, pszFilename));
+
     PVMDKIMAGE  pImage  = (PVMDKIMAGE)pBackendData;
     VMDKRENAMESTATE RenameState;
+
     memset(&RenameState, 0, sizeof(RenameState));
+
     /* Check arguments. */
     AssertPtrReturn(pImage, VERR_INVALID_POINTER);
@@ -6944 +7497 @@
     AssertReturn(*pszFilename != '\0', VERR_INVALID_PARAMETER);
     AssertReturn(!(pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_RAWDISK), VERR_INVALID_PARAMETER);
+
     int rc = vmdkRenameStatePrepare(pImage, &RenameState, pszFilename);
     if (RT_SUCCESS(rc))
     {
         /* --- Up to this point we have not done any damage yet. --- */
+
         rc = vmdkRenameWorker(pImage, &RenameState, pszFilename);
         /* Roll back all changes in case of failure. */
@@ -6956 +7511 @@
         }
     }
+
     vmdkRenameStateDestroy(&RenameState);
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnClose */
 static DECLCALLBACK(int) vmdkClose(void *pBackendData, bool fDelete)
@@ -6965 +7522 @@
     LogFlowFunc(("pBackendData=%#p fDelete=%d\n", pBackendData, fDelete));
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
+
     int rc = vmdkFreeImage(pImage, fDelete, true /*fFlush*/);
     RTMemFree(pImage);
+
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnRead */
 static DECLCALLBACK(int) vmdkRead(void *pBackendData, uint64_t uOffset, size_t cbToRead,
@@ -6977 +7537 @@
                  pBackendData, uOffset, pIoCtx, cbToRead, pcbActuallyRead));
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
+
     AssertPtr(pImage);
     Assert(uOffset % 512 == 0);
@@ -6983 +7544 @@
     AssertReturn(cbToRead, VERR_INVALID_PARAMETER);
     AssertReturn(uOffset + cbToRead <= pImage->cbSize, VERR_INVALID_PARAMETER);
+
     /* Find the extent and check access permissions as defined in the extent descriptor. */
     PVMDKEXTENT pExtent;
@@ -6993 +7555 @@
         /* Clip read range to remain in this extent. */
         cbToRead = RT_MIN(cbToRead, VMDK_SECTOR2BYTE(pExtent->uSectorOffset + pExtent->cNominalSectors - uSectorExtentRel));
+
         /* Handle the read according to the current extent type. */
         switch (pExtent->enmType)
@@ -6999 +7562 @@
             {
                 uint64_t uSectorExtentAbs;
+
                 rc = vmdkGetSector(pImage, pIoCtx, pExtent, uSectorExtentRel, &uSectorExtentAbs);
                 if (RT_FAILURE(rc))
@@ -7022 +7586 @@
                         AssertMsg(vdIfIoIntIoCtxIsSynchronous(pImage->pIfIo, pIoCtx),
                                   ("Async I/O is not supported for stream optimized VMDK's\n"));
+
                         uint32_t uSectorInGrain = uSectorExtentRel % pExtent->cSectorsPerGrain;
                         uSectorExtentAbs -= uSectorInGrain;
@@ -7062 +7627 @@
             {
                 size_t cbSet;
+
                 cbSet = vdIfIoIntIoCtxSet(pImage->pIfIo, pIoCtx, 0, cbToRead);
                 Assert(cbSet == cbToRead);
@@ -7072 +7638 @@
     else if (RT_SUCCESS(rc))
         rc = VERR_VD_VMDK_INVALID_STATE;
+
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnWrite */
 static DECLCALLBACK(int) vmdkWrite(void *pBackendData, uint64_t uOffset, size_t cbToWrite,
@@ -7084 +7652 @@
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
     int rc;
+
     AssertPtr(pImage);
     Assert(uOffset % 512 == 0);
@@ -7089 +7658 @@
     AssertPtrReturn(pIoCtx, VERR_INVALID_POINTER);
     AssertReturn(cbToWrite, VERR_INVALID_PARAMETER);
+
     if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY))
     {
@@ -7094 +7664 @@
         uint64_t uSectorExtentRel;
         uint64_t uSectorExtentAbs;
+
         /* No size check here, will do that later when the extent is located.
          * There are sparse images out there which according to the spec are
@@ -7100 +7671 @@
          * grain boundaries, and with the nominal size not being a multiple of the
          * grain size), this would prevent writing to the last grain. */
+
         rc = vmdkFindExtent(pImage, VMDK_BYTE2SECTOR(uOffset),
                             &pExtent, &uSectorExtentRel);
@@ -7197 +7769 @@
                 }
             }
+
             if (pcbWriteProcess)
                 *pcbWriteProcess = cbToWrite;
@@ -7203 +7776 @@
     else
         rc = VERR_VD_IMAGE_READ_ONLY;
+
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnFlush */
 static DECLCALLBACK(int) vmdkFlush(void *pBackendData, PVDIOCTX pIoCtx)
 {
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
+
     return vmdkFlushImage(pImage, pIoCtx);
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnGetVersion */
 static DECLCALLBACK(unsigned) vmdkGetVersion(void *pBackendData)
@@ -7217 +7794 @@
     LogFlowFunc(("pBackendData=%#p\n", pBackendData));
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
+
     AssertPtrReturn(pImage, 0);
+
     return VMDK_IMAGE_VERSION;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnGetFileSize */
 static DECLCALLBACK(uint64_t) vmdkGetFileSize(void *pBackendData)
@@ -7226 +7806 @@
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
     uint64_t cb = 0;
+
     AssertPtrReturn(pImage, 0);
+
     if (pImage->pFile != NULL)
     {
@@ -7244 +7826 @@
         }
     }
+
     LogFlowFunc(("returns %lld\n", cb));
     return cb;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnGetPCHSGeometry */
 static DECLCALLBACK(int) vmdkGetPCHSGeometry(void *pBackendData, PVDGEOMETRY pPCHSGeometry)
@@ -7253 +7837 @@
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
     int rc = VINF_SUCCESS;
+
     AssertPtrReturn(pImage, VERR_VD_NOT_OPENED);
+
     if (pImage->PCHSGeometry.cCylinders)
         *pPCHSGeometry = pImage->PCHSGeometry;
     else
         rc = VERR_VD_GEOMETRY_NOT_SET;
+
     LogFlowFunc(("returns %Rrc (PCHS=%u/%u/%u)\n", rc, pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads, pPCHSGeometry->cSectors));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnSetPCHSGeometry */
 static DECLCALLBACK(int) vmdkSetPCHSGeometry(void *pBackendData, PCVDGEOMETRY pPCHSGeometry)
@@ -7268 +7856 @@
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
     int rc = VINF_SUCCESS;
+
     AssertPtrReturn(pImage, VERR_VD_NOT_OPENED);
+
     if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY))
     {
@@ -7282 +7872 @@
     else
         rc = VERR_VD_IMAGE_READ_ONLY;
+
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnGetLCHSGeometry */
 static DECLCALLBACK(int) vmdkGetLCHSGeometry(void *pBackendData, PVDGEOMETRY pLCHSGeometry)
@@ -7291 +7883 @@
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
     int rc = VINF_SUCCESS;
+
     AssertPtrReturn(pImage, VERR_VD_NOT_OPENED);
+
     if (pImage->LCHSGeometry.cCylinders)
         *pLCHSGeometry = pImage->LCHSGeometry;
     else
         rc = VERR_VD_GEOMETRY_NOT_SET;
+
     LogFlowFunc(("returns %Rrc (LCHS=%u/%u/%u)\n", rc, pLCHSGeometry->cCylinders, pLCHSGeometry->cHeads, pLCHSGeometry->cSectors));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnSetLCHSGeometry */
 static DECLCALLBACK(int) vmdkSetLCHSGeometry(void *pBackendData, PCVDGEOMETRY pLCHSGeometry)
@@ -7306 +7902 @@
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
     int rc = VINF_SUCCESS;
+
     AssertPtrReturn(pImage, VERR_VD_NOT_OPENED);
+
     if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY))
     {
@@ -7320 +7918 @@
     else
         rc = VERR_VD_IMAGE_READ_ONLY;
+
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnQueryRegions */
 static DECLCALLBACK(int) vmdkQueryRegions(void *pBackendData, PCVDREGIONLIST *ppRegionList)
@@ -7328 +7928 @@
     LogFlowFunc(("pBackendData=%#p ppRegionList=%#p\n", pBackendData, ppRegionList));
     PVMDKIMAGE pThis = (PVMDKIMAGE)pBackendData;
+
     AssertPtrReturn(pThis, VERR_VD_NOT_OPENED);
+
     *ppRegionList = &pThis->RegionList;
     LogFlowFunc(("returns %Rrc\n", VINF_SUCCESS));
     return VINF_SUCCESS;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnRegionListRelease */
 static DECLCALLBACK(void) vmdkRegionListRelease(void *pBackendData, PCVDREGIONLIST pRegionList)
@@ -7340 +7943 @@
     PVMDKIMAGE pThis = (PVMDKIMAGE)pBackendData;
     AssertPtr(pThis); RT_NOREF(pThis);
+
     /* Nothing to do here. */
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnGetImageFlags */
 static DECLCALLBACK(unsigned) vmdkGetImageFlags(void *pBackendData)
@@ -7347 +7952 @@
     LogFlowFunc(("pBackendData=%#p\n", pBackendData));
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
+
     AssertPtrReturn(pImage, 0);
+
     LogFlowFunc(("returns %#x\n", pImage->uImageFlags));
     return pImage->uImageFlags;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnGetOpenFlags */
 static DECLCALLBACK(unsigned) vmdkGetOpenFlags(void *pBackendData)
@@ -7356 +7964 @@
     LogFlowFunc(("pBackendData=%#p\n", pBackendData));
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
+
     AssertPtrReturn(pImage, 0);
+
     LogFlowFunc(("returns %#x\n", pImage->uOpenFlags));
     return pImage->uOpenFlags;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnSetOpenFlags */
 static DECLCALLBACK(int) vmdkSetOpenFlags(void *pBackendData, unsigned uOpenFlags)
@@ -7366 +7977 @@
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
     int rc;
+
     /* Image must be opened and the new flags must be valid. */
     if (!pImage || (uOpenFlags & ~(  VD_OPEN_FLAGS_READONLY | VD_OPEN_FLAGS_INFO
@@ -7388 +8000 @@
         }
     }
+
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnGetComment */
 static DECLCALLBACK(int) vmdkGetComment(void *pBackendData, char *pszComment, size_t cbComment)
@@ -7396 +8010 @@
     LogFlowFunc(("pBackendData=%#p pszComment=%#p cbComment=%zu\n", pBackendData, pszComment, cbComment));
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
+
     AssertPtrReturn(pImage, VERR_VD_NOT_OPENED);
+
     char *pszCommentEncoded = NULL;
     int rc = vmdkDescDDBGetStr(pImage, &pImage->Descriptor,
@@ -7405 +8021 @@
         rc = VINF_SUCCESS;
     }
+
     if (RT_SUCCESS(rc))
     {
@@ -7411 +8028 @@
         else if (pszComment)
                 *pszComment = '\0';
+
         if (pszCommentEncoded)
             RTMemTmpFree(pszCommentEncoded);
     }
+
     LogFlowFunc(("returns %Rrc comment='%s'\n", rc, pszComment));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnSetComment */
 static DECLCALLBACK(int) vmdkSetComment(void *pBackendData, const char *pszComment)
@@ -7423 +8043 @@
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
     int rc;
+
     AssertPtrReturn(pImage, VERR_VD_NOT_OPENED);
+
     if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY))
     {
@@ -7433 +8055 @@
     else
         rc = VERR_VD_IMAGE_READ_ONLY;
+
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnGetUuid */
 static DECLCALLBACK(int) vmdkGetUuid(void *pBackendData, PRTUUID pUuid)
@@ -7441 +8065 @@
     LogFlowFunc(("pBackendData=%#p pUuid=%#p\n", pBackendData, pUuid));
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
+
     AssertPtrReturn(pImage, VERR_VD_NOT_OPENED);
+
     *pUuid = pImage->ImageUuid;
+
     LogFlowFunc(("returns %Rrc (%RTuuid)\n", VINF_SUCCESS, pUuid));
     return VINF_SUCCESS;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnSetUuid */
 static DECLCALLBACK(int) vmdkSetUuid(void *pBackendData, PCRTUUID pUuid)
@@ -7452 +8080 @@
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
     int rc = VINF_SUCCESS;
+
     AssertPtrReturn(pImage, VERR_VD_NOT_OPENED);
+
     if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY))
     {
@@ -7469 +8099 @@
     else
         rc = VERR_VD_IMAGE_READ_ONLY;
+
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnGetModificationUuid */
 static DECLCALLBACK(int) vmdkGetModificationUuid(void *pBackendData, PRTUUID pUuid)
@@ -7477 +8109 @@
     LogFlowFunc(("pBackendData=%#p pUuid=%#p\n", pBackendData, pUuid));
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
+
     AssertPtrReturn(pImage, VERR_VD_NOT_OPENED);
+
     *pUuid = pImage->ModificationUuid;
+
     LogFlowFunc(("returns %Rrc (%RTuuid)\n", VINF_SUCCESS, pUuid));
     return VINF_SUCCESS;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnSetModificationUuid */
 static DECLCALLBACK(int) vmdkSetModificationUuid(void *pBackendData, PCRTUUID pUuid)
@@ -7488 +8124 @@
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
     int rc = VINF_SUCCESS;
+
     AssertPtrReturn(pImage, VERR_VD_NOT_OPENED);
+
     if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY))
     {
@@ -7508 +8146 @@
     else
         rc = VERR_VD_IMAGE_READ_ONLY;
+
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnGetParentUuid */
 static DECLCALLBACK(int) vmdkGetParentUuid(void *pBackendData, PRTUUID pUuid)
@@ -7516 +8156 @@
     LogFlowFunc(("pBackendData=%#p pUuid=%#p\n", pBackendData, pUuid));
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
+
     AssertPtrReturn(pImage, VERR_VD_NOT_OPENED);
+
     *pUuid = pImage->ParentUuid;
+
     LogFlowFunc(("returns %Rrc (%RTuuid)\n", VINF_SUCCESS, pUuid));
     return VINF_SUCCESS;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnSetParentUuid */
 static DECLCALLBACK(int) vmdkSetParentUuid(void *pBackendData, PCRTUUID pUuid)
@@ -7527 +8171 @@
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
     int rc = VINF_SUCCESS;
+
     AssertPtrReturn(pImage, VERR_VD_NOT_OPENED);
+
     if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY))
     {
@@ -7544 +8190 @@
     else
         rc = VERR_VD_IMAGE_READ_ONLY;
+
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnGetParentModificationUuid */
 static DECLCALLBACK(int) vmdkGetParentModificationUuid(void *pBackendData, PRTUUID pUuid)
@@ -7552 +8200 @@
     LogFlowFunc(("pBackendData=%#p pUuid=%#p\n", pBackendData, pUuid));
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
+
     AssertPtrReturn(pImage, VERR_VD_NOT_OPENED);
+
     *pUuid = pImage->ParentModificationUuid;
+
     LogFlowFunc(("returns %Rrc (%RTuuid)\n", VINF_SUCCESS, pUuid));
     return VINF_SUCCESS;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnSetParentModificationUuid */
 static DECLCALLBACK(int) vmdkSetParentModificationUuid(void *pBackendData, PCRTUUID pUuid)
@@ -7563 +8215 @@
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
     int rc = VINF_SUCCESS;
+
     AssertPtrReturn(pImage, VERR_VD_NOT_OPENED);
+
     if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY))
     {
@@ -7579 +8233 @@
     else
         rc = VERR_VD_IMAGE_READ_ONLY;
+
     LogFlowFunc(("returns %Rrc\n", rc));
     return rc;
 }
+
 /** @copydoc VDIMAGEBACKEND::pfnDump */
 static DECLCALLBACK(void) vmdkDump(void *pBackendData)
 {
     PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
+
     AssertPtrReturnVoid(pImage);
     vdIfErrorMessage(pImage->pIfError, "Header: Geometry PCHS=%u/%u/%u LCHS=%u/%u/%u cbSector=%llu\n",
@@ -7597 +8254 @@
 }
 
-/**
- * Returns the size, in bytes, of the sparse extent overhead for
- * the number of desired total sectors and based on the current
- * sectors of the extent.
- *
- * @returns uint64_t size of new overhead in bytes.
- * @param   pExtent         VMDK extent instance.
- * @param   cSectorsNew     Number of desired total sectors.
- */
-static uint64_t vmdkGetNewOverhead(PVMDKEXTENT pExtent, uint64_t cSectorsNew)
-{
-    uint64_t cNewDirEntries = cSectorsNew / pExtent->cSectorsPerGDE;
-    if (cSectorsNew % pExtent->cSectorsPerGDE)
-        cNewDirEntries++;
-
-    size_t cbNewGD = cNewDirEntries * sizeof(uint32_t);
-    uint64_t cbNewDirSize = RT_ALIGN_64(cbNewGD, 512);
-    uint64_t cbNewAllTablesSize = RT_ALIGN_64(cNewDirEntries * pExtent->cGTEntries * sizeof(uint32_t), 512);
-    uint64_t cbNewOverhead = RT_ALIGN_Z(RT_MAX(pExtent->uDescriptorSector
-                                                + pExtent->cDescriptorSectors, 1)
-                                                + cbNewDirSize + cbNewAllTablesSize, 512);
-    cbNewOverhead += cbNewDirSize + cbNewAllTablesSize;
-    cbNewOverhead = RT_ALIGN_64(cbNewOverhead,
-                                VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain));
-
-    return cbNewOverhead;
-}
-
-/**
- * Internal: Replaces the size (in sectors) of an extent in the descriptor file.
- *
- * @returns VBox status code.
- * @param   pImage              VMDK image instance.
- * @param   uLine                Line number of descriptor to change.
- * @param   cSectorsOld         Existing number of sectors.
- * @param   cSectorsNew         New number of sectors.
- */
-static int vmdkReplaceExtentSize(PVMDKIMAGE pImage, PVMDKEXTENT pExtent, unsigned uLine, uint64_t cSectorsOld,
-                                 uint64_t cSectorsNew)
-{
-    char szOldExtentSectors[UINT64_MAX_BUFF_SIZE];
-    char szNewExtentSectors[UINT64_MAX_BUFF_SIZE];
-
-    ssize_t cbWritten = RTStrPrintf2(szOldExtentSectors, sizeof(szOldExtentSectors), "%llu", cSectorsOld);
-    if (cbWritten <= 0 || cbWritten > (ssize_t)sizeof(szOldExtentSectors))
+static int vmdkRepaceExtentSize(PVMDKIMAGE pImage, unsigned line, uint64_t cSectorsOld,
+                                uint64_t cSectorsNew)
+{
+    char * szOldExtentSectors = (char *)RTMemAlloc(UINT64_MAX_BUFF_SIZE);
+    if (!szOldExtentSectors)
+        return VERR_NO_MEMORY;
+
+    int cbWritten = RTStrPrintf2(szOldExtentSectors, UINT64_MAX_BUFF_SIZE, "%llu", cSectorsOld);
+    if (cbWritten <= 0 || cbWritten > UINT64_MAX_BUFF_SIZE)
+    {
+        RTMemFree(szOldExtentSectors);
+        szOldExtentSectors = NULL;
+
         return VERR_BUFFER_OVERFLOW;
-
-    cbWritten = RTStrPrintf2(szNewExtentSectors, sizeof(szNewExtentSectors), "%llu", cSectorsNew);
-    if (cbWritten <= 0 || cbWritten > (ssize_t)sizeof(szNewExtentSectors))
+    }
+
+    char * szNewExtentSectors = (char *)RTMemAlloc(UINT64_MAX_BUFF_SIZE);
+    if (!szNewExtentSectors)
+        return VERR_NO_MEMORY;
+
+    cbWritten = RTStrPrintf2(szNewExtentSectors, UINT64_MAX_BUFF_SIZE, "%llu", cSectorsNew);
+    if (cbWritten <= 0 || cbWritten > UINT64_MAX_BUFF_SIZE)
+    {
+        RTMemFree(szOldExtentSectors);
+        szOldExtentSectors = NULL;
+
+        RTMemFree(szNewExtentSectors);
+        szNewExtentSectors = NULL;
+
         return VERR_BUFFER_OVERFLOW;
-
-    char *pszNewExtentLine = vmdkStrReplace(pImage->Descriptor.aLines[uLine],
+    }
+
+    char * szNewExtentLine = vmdkStrReplace(pImage->Descriptor.aLines[line],
                                             szOldExtentSectors,
                                             szNewExtentSectors);
 
-    if (RT_UNLIKELY(!pszNewExtentLine))
+    RTMemFree(szOldExtentSectors);
+    szOldExtentSectors = NULL;
+
+    RTMemFree(szNewExtentSectors);
+    szNewExtentSectors = NULL;
+
+    if (!szNewExtentLine)
         return VERR_INVALID_PARAMETER;
 
-    vmdkDescExtRemoveByLine(pImage, &pImage->Descriptor, uLine);
-    vmdkDescExtInsert(pImage, &pImage->Descriptor,
-                      pExtent->enmAccess, cSectorsNew,
-                      pExtent->enmType, pExtent->pszBasename, pExtent->uSectorOffset);
-
-    RTStrFree(pszNewExtentLine);
-    pszNewExtentLine = NULL;
-
-    pImage->Descriptor.fDirty = true;
+    pImage->Descriptor.aLines[line] = szNewExtentLine;
 
     return VINF_SUCCESS;
-}
-
-/**
- * Moves sectors down to make room for new overhead.
- * Used for sparse extent resize.
- *
- * @returns VBox status code.
- * @param   pImage          VMDK image instance.
- * @param   pExtent         VMDK extent instance.
- * @param   cSectorsNew     Number of sectors after resize.
- */
-static int vmdkRelocateSectorsForSparseResize(PVMDKIMAGE pImage, PVMDKEXTENT pExtent,
-                                              uint64_t cSectorsNew)
-{
-    int rc = VINF_SUCCESS;
-
-    uint64_t cbNewOverhead = vmdkGetNewOverhead(pExtent, cSectorsNew);
-
-    uint64_t cNewOverheadSectors = VMDK_BYTE2SECTOR(cbNewOverhead);
-    uint64_t cOverheadSectorDiff = cNewOverheadSectors - pExtent->cOverheadSectors;
-
-    uint64_t cbFile = 0;
-    rc = vdIfIoIntFileGetSize(pImage->pIfIo, pExtent->pFile->pStorage, &cbFile);
-
-    uint64_t uNewAppendPosition;
-
-    /* Calculate how many sectors need to be relocated. */
-    unsigned cSectorsReloc = cOverheadSectorDiff;
-    if (cbNewOverhead % VMDK_SECTOR_SIZE)
-        cSectorsReloc++;
-
-    if (cSectorsReloc < pExtent->cSectors)
-        uNewAppendPosition = RT_ALIGN_Z(cbFile + VMDK_SECTOR2BYTE(cOverheadSectorDiff), 512);
-    else
-        uNewAppendPosition = cbFile;
-
-    /*
-    * Get the blocks we need to relocate first, they are appended to the end
-    * of the image.
-    */
-    void *pvBuf = NULL, *pvZero = NULL;
-    do
-    {
-        /* Allocate data buffer. */
-        pvBuf = RTMemAllocZ(VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain));
-        if (!pvBuf)
-        {
-            rc = VERR_NO_MEMORY;
-            break;
-        }
-
-        /* Allocate buffer for overwriting with zeroes. */
-        pvZero = RTMemAllocZ(VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain));
-        if (!pvZero)
-        {
-            RTMemFree(pvBuf);
-            pvBuf = NULL;
-
-            rc = VERR_NO_MEMORY;
-            break;
-        }
-
-        uint32_t *aGTDataTmp = (uint32_t *)RTMemAllocZ(sizeof(uint32_t) * pExtent->cGTEntries);
-        if(!aGTDataTmp)
-        {
-            RTMemFree(pvBuf);
-            pvBuf = NULL;
-
-            RTMemFree(pvZero);
-            pvZero = NULL;
-
-            rc = VERR_NO_MEMORY;
-            break;
-        }
-
-        uint32_t *aRGTDataTmp = (uint32_t *)RTMemAllocZ(sizeof(uint32_t) * pExtent->cGTEntries);
-        if(!aRGTDataTmp)
-        {
-            RTMemFree(pvBuf);
-            pvBuf = NULL;
-
-            RTMemFree(pvZero);
-            pvZero = NULL;
-
-            RTMemFree(aGTDataTmp);
-            aGTDataTmp = NULL;
-
-            rc = VERR_NO_MEMORY;
-            break;
-        }
-
-        /* Search for overlap sector in the grain table. */
-        for (uint32_t idxGD = 0; idxGD < pExtent->cGDEntries; idxGD++)
-        {
-            uint64_t uGTSector = pExtent->pGD[idxGD];
-            uint64_t uRGTSector = pExtent->pRGD[idxGD];
-
-            rc = vdIfIoIntFileReadSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                        VMDK_SECTOR2BYTE(uGTSector),
-                                        aGTDataTmp, sizeof(uint32_t) * pExtent->cGTEntries);
-
-            if (RT_FAILURE(rc))
-                break;
-
-            rc = vdIfIoIntFileReadSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                        VMDK_SECTOR2BYTE(uRGTSector),
-                                        aRGTDataTmp, sizeof(uint32_t) * pExtent->cGTEntries);
-
-            if (RT_FAILURE(rc))
-                break;
-
-            for (uint32_t idxGT = 0; idxGT < pExtent->cGTEntries; idxGT++)
-            {
-                uint64_t aGTEntryLE = RT_LE2H_U64(aGTDataTmp[idxGT]);
-                uint64_t aRGTEntryLE = RT_LE2H_U64(aRGTDataTmp[idxGT]);
-
-                /**
-                 * Check if grain table is valid. If not dump out with an error.
-                 * Shoudln't ever get here (given other checks) but good sanity check.
-                */
-                if (aGTEntryLE != aRGTEntryLE)
-                {
-                    rc = vdIfError(pImage->pIfError, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS,
-                                    N_("VMDK: inconsistent references within grain table in '%s'"), pExtent->pszFullname);
-                    break;
-                }
-
-                if (aGTEntryLE < cNewOverheadSectors
-                    && aGTEntryLE != 0)
-                {
-                    /* Read data and append grain to the end of the image. */
-                    rc = vdIfIoIntFileReadSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                                VMDK_SECTOR2BYTE(aGTEntryLE), pvBuf,
-                                                VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain));
-                    if (RT_FAILURE(rc))
-                        break;
-
-                    rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                                uNewAppendPosition, pvBuf,
-                                                VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain));
-                    if (RT_FAILURE(rc))
-                        break;
-
-                    /* Zero out the old block area. */
-                    rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                                VMDK_SECTOR2BYTE(aGTEntryLE), pvZero,
-                                                VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain));
-                    if (RT_FAILURE(rc))
-                        break;
-
-                    /* Write updated grain tables to file */
-                    aGTDataTmp[idxGT] = VMDK_BYTE2SECTOR(uNewAppendPosition);
-                    aRGTDataTmp[idxGT] = VMDK_BYTE2SECTOR(uNewAppendPosition);
-
-                    if (memcmp(aGTDataTmp, aRGTDataTmp, sizeof(uint32_t) * pExtent->cGTEntries))
-                    {
-                        rc = vdIfError(pImage->pIfError, VERR_VD_VMDK_INVALID_HEADER, RT_SRC_POS,
-                                    N_("VMDK: inconsistency between grain table and backup grain table in '%s'"), pExtent->pszFullname);
-                        break;
-                    }
-
-                    rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                                VMDK_SECTOR2BYTE(uGTSector),
-                                                aGTDataTmp, sizeof(uint32_t) * pExtent->cGTEntries);
-
-                    if (RT_FAILURE(rc))
-                        break;
-
-                    rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                                VMDK_SECTOR2BYTE(uRGTSector),
-                                                aRGTDataTmp, sizeof(uint32_t) * pExtent->cGTEntries);
-
-                    break;
-                }
-            }
-        }
-
-        RTMemFree(aGTDataTmp);
-        aGTDataTmp = NULL;
-
-        RTMemFree(aRGTDataTmp);
-        aRGTDataTmp = NULL;
-
-        if (RT_FAILURE(rc))
-            break;
-
-        uNewAppendPosition += VMDK_SECTOR2BYTE(pExtent->cSectorsPerGrain);
-    } while (0);
-
-    if (pvBuf)
-    {
-        RTMemFree(pvBuf);
-        pvBuf = NULL;
-    }
-
-    if (pvZero)
-    {
-        RTMemFree(pvZero);
-        pvZero = NULL;
-    }
-
-    // Update append position for extent
-    pExtent->uAppendPosition = uNewAppendPosition;
-
-    return rc;
-}
-
-/**
- * Resizes meta/overhead for sparse extent resize.
- *
- * @returns VBox status code.
- * @param   pImage          VMDK image instance.
- * @param   pExtent         VMDK extent instance.
- * @param   cSectorsNew     Number of sectors after resize.
- */
-static int vmdkResizeSparseMeta(PVMDKIMAGE pImage, PVMDKEXTENT pExtent,
-                                uint64_t cSectorsNew)
-{
-    int rc = VINF_SUCCESS;
-    uint32_t cOldGDEntries = pExtent->cGDEntries;
-
-    uint64_t cNewDirEntries = cSectorsNew / pExtent->cSectorsPerGDE;
-    if (cSectorsNew % pExtent->cSectorsPerGDE)
-        cNewDirEntries++;
-
-    size_t cbNewGD = cNewDirEntries * sizeof(uint32_t);
-
-    uint64_t cbNewDirSize = RT_ALIGN_64(cbNewGD, 512);
-    uint64_t cbCurrDirSize = RT_ALIGN_64(pExtent->cGDEntries * VMDK_GRAIN_DIR_ENTRY_SIZE, 512);
-    uint64_t cDirSectorDiff = VMDK_BYTE2SECTOR(cbNewDirSize - cbCurrDirSize);
-
-    uint64_t cbNewAllTablesSize = RT_ALIGN_64(cNewDirEntries * pExtent->cGTEntries * sizeof(uint32_t), 512);
-    uint64_t cbCurrAllTablesSize = RT_ALIGN_64(pExtent->cGDEntries * VMDK_GRAIN_TABLE_SIZE, 512);
-    uint64_t cTableSectorDiff = VMDK_BYTE2SECTOR(cbNewAllTablesSize - cbCurrAllTablesSize);
-
-    uint64_t cbNewOverhead = vmdkGetNewOverhead(pExtent, cSectorsNew);
-    uint64_t cNewOverheadSectors = VMDK_BYTE2SECTOR(cbNewOverhead);
-    uint64_t cOverheadSectorDiff = cNewOverheadSectors - pExtent->cOverheadSectors;
-
-    /*
-    * Get the blocks we need to relocate first, they are appended to the end
-    * of the image.
-    */
-    void *pvBuf = NULL, *pvZero = NULL;
-
-    do
-    {
-        /* Allocate data buffer. */
-        pvBuf = RTMemAllocZ(VMDK_GRAIN_TABLE_SIZE);
-        if (!pvBuf)
-        {
-            rc = VERR_NO_MEMORY;
-            break;
-        }
-
-        /* Allocate buffer for overwriting with zeroes. */
-        pvZero = RTMemAllocZ(VMDK_GRAIN_TABLE_SIZE);
-        if (!pvZero)
-        {
-            RTMemFree(pvBuf);
-            pvBuf = NULL;
-
-            rc = VERR_NO_MEMORY;
-            break;
-        }
-
-        uint32_t uGTStart = VMDK_SECTOR2BYTE(pExtent->uSectorGD) + (cOldGDEntries * VMDK_GRAIN_DIR_ENTRY_SIZE);
-
-        // points to last element in the grain table
-        uint32_t uGTTail = uGTStart + (pExtent->cGDEntries * VMDK_GRAIN_TABLE_SIZE) - VMDK_GRAIN_TABLE_SIZE;
-        uint32_t cbGTOff = RT_ALIGN_Z(VMDK_SECTOR2BYTE(cDirSectorDiff + cTableSectorDiff + cDirSectorDiff), 512);
-
-        for (int i = pExtent->cGDEntries - 1; i >= 0; i--)
-        {
-            rc = vdIfIoIntFileReadSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                        uGTTail, pvBuf,
-                                        VMDK_GRAIN_TABLE_SIZE);
-            if (RT_FAILURE(rc))
-                break;
-
-            rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                        RT_ALIGN_Z(uGTTail + cbGTOff, 512), pvBuf,
-                                        VMDK_GRAIN_TABLE_SIZE);
-            if (RT_FAILURE(rc))
-                break;
-
-            // This overshoots when i == 0, but we don't need it anymore.
-            uGTTail -= VMDK_GRAIN_TABLE_SIZE;
-        }
-
-
-        /* Find the end of the grain directory and start bumping everything down. Update locations of GT entries. */
-        rc = vdIfIoIntFileReadSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                    VMDK_SECTOR2BYTE(pExtent->uSectorGD), pvBuf,
-                                    pExtent->cGDEntries * VMDK_GRAIN_DIR_ENTRY_SIZE);
-        if (RT_FAILURE(rc))
-            break;
-
-        int * tmpBuf = (int *)pvBuf;
-
-        for (uint32_t i = 0; i < pExtent->cGDEntries; i++)
-        {
-            tmpBuf[i] = tmpBuf[i] + VMDK_BYTE2SECTOR(cbGTOff);
-            pExtent->pGD[i] = pExtent->pGD[i] + VMDK_BYTE2SECTOR(cbGTOff);
-        }
-
-        rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                    RT_ALIGN_Z(VMDK_SECTOR2BYTE(pExtent->uSectorGD + cTableSectorDiff + cDirSectorDiff), 512), pvBuf,
-                                    pExtent->cGDEntries * VMDK_GRAIN_DIR_ENTRY_SIZE);
-        if (RT_FAILURE(rc))
-            break;
-
-        pExtent->uSectorGD = pExtent->uSectorGD + cDirSectorDiff + cTableSectorDiff;
-
-        /* Repeat both steps with the redundant grain table/directory. */
-
-        uint32_t uRGTStart = VMDK_SECTOR2BYTE(pExtent->uSectorRGD) + (cOldGDEntries * VMDK_GRAIN_DIR_ENTRY_SIZE);
-
-        // points to last element in the grain table
-        uint32_t uRGTTail = uRGTStart + (pExtent->cGDEntries * VMDK_GRAIN_TABLE_SIZE) - VMDK_GRAIN_TABLE_SIZE;
-        uint32_t cbRGTOff = RT_ALIGN_Z(VMDK_SECTOR2BYTE(cDirSectorDiff), 512);
-
-        for (int i = pExtent->cGDEntries - 1; i >= 0; i--)
-        {
-            rc = vdIfIoIntFileReadSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                        uRGTTail, pvBuf,
-                                        VMDK_GRAIN_TABLE_SIZE);
-            if (RT_FAILURE(rc))
-                break;
-
-            rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                        RT_ALIGN_Z(uRGTTail + cbRGTOff, 512), pvBuf,
-                                        VMDK_GRAIN_TABLE_SIZE);
-            if (RT_FAILURE(rc))
-                break;
-
-            // This overshoots when i == 0, but we don't need it anymore.
-            uRGTTail -= VMDK_GRAIN_TABLE_SIZE;
-        }
-
-        /* Update locations of GT entries. */
-        rc = vdIfIoIntFileReadSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                    VMDK_SECTOR2BYTE(pExtent->uSectorRGD), pvBuf,
-                                    pExtent->cGDEntries * VMDK_GRAIN_DIR_ENTRY_SIZE);
-        if (RT_FAILURE(rc))
-            break;
-
-        tmpBuf = (int *)pvBuf;
-
-        for (uint32_t i = 0; i < pExtent->cGDEntries; i++)
-        {
-            tmpBuf[i] = tmpBuf[i] + cDirSectorDiff;
-            pExtent->pRGD[i] = pExtent->pRGD[i] + cDirSectorDiff;
-        }
-
-        rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                    VMDK_SECTOR2BYTE(pExtent->uSectorRGD), pvBuf,
-                                    pExtent->cGDEntries * VMDK_GRAIN_DIR_ENTRY_SIZE);
-        if (RT_FAILURE(rc))
-            break;
-
-        pExtent->uSectorRGD = pExtent->uSectorRGD;
-        pExtent->cOverheadSectors += cOverheadSectorDiff;
-
-    } while (0);
-
-    if (pvBuf)
-    {
-        RTMemFree(pvBuf);
-        pvBuf = NULL;
-    }
-
-    if (pvZero)
-    {
-        RTMemFree(pvZero);
-        pvZero = NULL;
-    }
-
-    pExtent->cGDEntries = cNewDirEntries;
-
-    /* Allocate buffer for overwriting with zeroes. */
-    pvZero = RTMemAllocZ(VMDK_GRAIN_TABLE_SIZE);
-    if (!pvZero)
-        return VERR_NO_MEMORY;
-
-    // Allocate additional grain dir
-    pExtent->pGD = (uint32_t *) RTMemReallocZ(pExtent->pGD, pExtent->cGDEntries * sizeof(uint32_t), cbNewGD);
-    if (RT_LIKELY(pExtent->pGD))
-    {
-        if (pExtent->uSectorRGD)
-        {
-            pExtent->pRGD = (uint32_t *)RTMemReallocZ(pExtent->pRGD, pExtent->cGDEntries * sizeof(uint32_t), cbNewGD);
-            if (RT_UNLIKELY(!pExtent->pRGD))
-                rc = VERR_NO_MEMORY;
-        }
-    }
-    else
-        return VERR_NO_MEMORY;
-
-
-    uint32_t uTmpDirVal = pExtent->pGD[cOldGDEntries - 1] + VMDK_GRAIN_DIR_ENTRY_SIZE;
-    for (uint32_t i = cOldGDEntries; i < pExtent->cGDEntries; i++)
-    {
-        pExtent->pGD[i] = uTmpDirVal;
-
-        rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                    VMDK_SECTOR2BYTE(uTmpDirVal), pvZero,
-                                    VMDK_GRAIN_TABLE_SIZE);
-
-        if (RT_FAILURE(rc))
-            return rc;
-
-        uTmpDirVal += VMDK_GRAIN_DIR_ENTRY_SIZE;
-    }
-
-    uint32_t uRTmpDirVal = pExtent->pRGD[cOldGDEntries - 1] + VMDK_GRAIN_DIR_ENTRY_SIZE;
-    for (uint32_t i = cOldGDEntries; i < pExtent->cGDEntries; i++)
-    {
-        pExtent->pRGD[i] = uRTmpDirVal;
-
-        rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                    VMDK_SECTOR2BYTE(uRTmpDirVal), pvZero,
-                                    VMDK_GRAIN_TABLE_SIZE);
-
-        if (RT_FAILURE(rc))
-            return rc;
-
-        uRTmpDirVal += VMDK_GRAIN_DIR_ENTRY_SIZE;
-    }
-
-    RTMemFree(pvZero);
-    pvZero = NULL;
-
-    rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                VMDK_SECTOR2BYTE(pExtent->uSectorGD), pExtent->pGD,
-                                pExtent->cGDEntries * VMDK_GRAIN_DIR_ENTRY_SIZE);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage,
-                                VMDK_SECTOR2BYTE(pExtent->uSectorRGD), pExtent->pRGD,
-                                pExtent->cGDEntries * VMDK_GRAIN_DIR_ENTRY_SIZE);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    rc = vmdkReplaceExtentSize(pImage, pExtent, pImage->Descriptor.uFirstExtent + pExtent->uExtent,
-                                pExtent->cNominalSectors, cSectorsNew);
-    if (RT_FAILURE(rc))
-        return rc;
-
-    return rc;
 }
 
@@ -8133 +8318 @@
     unsigned uImageFlags = pImage->uImageFlags;
     PVMDKEXTENT pExtent = &pImage->pExtents[0];
-    pExtent->fMetaDirty = true;
 
     uint64_t cSectorsNew = cbSize / VMDK_SECTOR_SIZE;   /** < New number of sectors in the image after the resize */
@@ -8154 +8338 @@
      */
     /** @todo implement making the image smaller, it is the responsibility of
-     * the user to know what they're doing. */
+     * the user to know what he's doing. */
     if (cbSize < pImage->cbSize)
         rc = VERR_VD_SHRINK_NOT_SUPPORTED;
@@ -8174 +8358 @@
                 return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not set size of new file '%s'"), pExtent->pszFullname);
 
-            rc = vmdkReplaceExtentSize(pImage, pExtent, pImage->Descriptor.uFirstExtent, cSectorsOld, cSectorsNew);
+            rc = vmdkRepaceExtentSize(pImage, pImage->Descriptor.uFirstExtent, cSectorsOld, cSectorsNew);
             if (RT_FAILURE(rc))
                 return rc;
@@ -8191 +8375 @@
 
             uint64_t cSectorsNeeded = cSectorsNew - cSectorsOld;
-
-            /** Space remaining in current last extent file that we don't need to create another one. */
             if (fSpaceAvailible && cSectorsNeeded + cLastExtentRemSectors <= VMDK_BYTE2SECTOR(VMDK_2G_SPLIT_SIZE))
             {
@@ -8202 +8384 @@
                     return vdIfError(pImage->pIfError, rc, RT_SRC_POS, N_("VMDK: could not set size of new file '%s'"), pExtent->pszFullname);
 
-                rc = vmdkReplaceExtentSize(pImage, pExtent, pImage->Descriptor.uFirstExtent + cExtents - 1,
-                                           pExtent->cNominalSectors, cSectorsNeeded + cLastExtentRemSectors);
+                rc = vmdkRepaceExtentSize(pImage, pImage->Descriptor.uFirstExtent + cExtents - 1,
+                                          pExtent->cNominalSectors, cSectorsNeeded + cLastExtentRemSectors);
                 if (RT_FAILURE(rc))
                     return rc;
             }
-            //** Need more extent files to handle all the requested space. */
             else
             {
@@ -8221 +8402 @@
                     cSectorsNeeded = cSectorsNeeded - VMDK_BYTE2SECTOR(VMDK_2G_SPLIT_SIZE) + cLastExtentRemSectors;
 
-                    rc = vmdkReplaceExtentSize(pImage, pExtent, pImage->Descriptor.uFirstExtent + cExtents - 1,
-                                               pExtent->cNominalSectors, VMDK_BYTE2SECTOR(VMDK_2G_SPLIT_SIZE));
+                    rc = vmdkRepaceExtentSize(pImage, pImage->Descriptor.uFirstExtent + cExtents - 1,
+                                              pExtent->cNominalSectors, VMDK_BYTE2SECTOR(VMDK_2G_SPLIT_SIZE));
                     if (RT_FAILURE(rc))
                         return rc;
@@ -8254 +8435 @@
         }
 
-        /**
-         * monolithicSparse.
-         */
-        if (pExtent->enmType == VMDKETYPE_HOSTED_SPARSE && !(uImageFlags & VD_VMDK_IMAGE_FLAGS_SPLIT_2G))
-        {
-            // 1. Calculate sectors needed for new overhead.
-
-            uint64_t cbNewOverhead = vmdkGetNewOverhead(pExtent, cSectorsNew);
-            uint64_t cNewOverheadSectors = VMDK_BYTE2SECTOR(cbNewOverhead);
-            uint64_t cOverheadSectorDiff = cNewOverheadSectors - pExtent->cOverheadSectors;
-
-            // 2. Relocate sectors to make room for new GD/GT, update entries in GD/GT
-            if (cOverheadSectorDiff > 0)
-            {
-                if (pExtent->cSectors > 0)
-                {
-                    /* Do the relocation. */
-                    LogFlow(("Relocating VMDK sectors\n"));
-                    rc = vmdkRelocateSectorsForSparseResize(pImage, pExtent, cSectorsNew);
-                    if (RT_FAILURE(rc))
-                        return rc;
-
-                    rc = vmdkFlushImage(pImage, NULL);
-                    if (RT_FAILURE(rc))
-                        return rc;
-                }
-
-                rc = vmdkResizeSparseMeta(pImage, pExtent, cSectorsNew);
-                if (RT_FAILURE(rc))
-                    return rc;
-            }
-        }
-
-        /**
-         * twoGbSparseExtent
-         */
-        if (pExtent->enmType == VMDKETYPE_HOSTED_SPARSE && (uImageFlags & VD_VMDK_IMAGE_FLAGS_SPLIT_2G))
-        {
-            /* Check to see how much space remains in last extent */
-            bool fSpaceAvailible = false;
-            uint64_t cLastExtentRemSectors = cSectorsOld % VMDK_BYTE2SECTOR(VMDK_2G_SPLIT_SIZE);
-            if (cLastExtentRemSectors)
-                fSpaceAvailible = true;
-
-            uint64_t cSectorsNeeded = cSectorsNew - cSectorsOld;
-
-            if (fSpaceAvailible && cSectorsNeeded + cLastExtentRemSectors <= VMDK_BYTE2SECTOR(VMDK_2G_SPLIT_SIZE))
-            {
-                pExtent = &pImage->pExtents[cExtents - 1];
-                rc = vmdkRelocateSectorsForSparseResize(pImage, pExtent, cSectorsNeeded + cLastExtentRemSectors);
-                if (RT_FAILURE(rc))
-                    return rc;
-
-                rc = vmdkFlushImage(pImage, NULL);
-                if (RT_FAILURE(rc))
-                    return rc;
-
-                rc = vmdkResizeSparseMeta(pImage, pExtent, cSectorsNeeded + cLastExtentRemSectors);
-                if (RT_FAILURE(rc))
-                    return rc;
-            }
-            else
-            {
-                if (fSpaceAvailible)
-                {
-                    pExtent = &pImage->pExtents[cExtents - 1];
-                    rc = vmdkRelocateSectorsForSparseResize(pImage, pExtent, VMDK_BYTE2SECTOR(VMDK_2G_SPLIT_SIZE));
-                    if (RT_FAILURE(rc))
-                        return rc;
-
-                    rc = vmdkFlushImage(pImage, NULL);
-                    if (RT_FAILURE(rc))
-                        return rc;
-
-                    rc = vmdkResizeSparseMeta(pImage, pExtent, VMDK_BYTE2SECTOR(VMDK_2G_SPLIT_SIZE));
-                    if (RT_FAILURE(rc))
-                        return rc;
-
-                    cSectorsNeeded = cSectorsNeeded - VMDK_BYTE2SECTOR(VMDK_2G_SPLIT_SIZE) + cLastExtentRemSectors;
-                }
-
-                unsigned cNewExtents = VMDK_SECTOR2BYTE(cSectorsNeeded) / VMDK_2G_SPLIT_SIZE;
-                if (cNewExtents % VMDK_2G_SPLIT_SIZE || cNewExtents < VMDK_2G_SPLIT_SIZE)
-                    cNewExtents++;
-
-                for (unsigned i = cExtents;
-                     i < cExtents + cNewExtents && cSectorsNeeded >= VMDK_BYTE2SECTOR(VMDK_2G_SPLIT_SIZE);
-                     i++)
-                {
-                    rc = vmdkAddFileBackedExtent(pImage, VMDK_2G_SPLIT_SIZE);
-                    if (RT_FAILURE(rc))
-                        return rc;
-
-                    pExtent = &pImage->pExtents[i];
-
-                    rc = vmdkFlushImage(pImage, NULL);
-                    if (RT_FAILURE(rc))
-                        return rc;
-
-                    pExtent->cSectors = VMDK_BYTE2SECTOR(VMDK_2G_SPLIT_SIZE);
-                    cSectorsNeeded -= VMDK_BYTE2SECTOR(VMDK_2G_SPLIT_SIZE);
-                }
-
-                if (cSectorsNeeded)
-                {
-                    rc = vmdkAddFileBackedExtent(pImage, VMDK_SECTOR2BYTE(cSectorsNeeded));
-                    if (RT_FAILURE(rc))
-                        return rc;
-
-                    pExtent = &pImage->pExtents[pImage->cExtents];
-
-                    rc = vmdkFlushImage(pImage, NULL);
-                    if (RT_FAILURE(rc))
-                        return rc;
-                }
-            }
-        }
-
         /* Successful resize. Update metadata */
         if (RT_SUCCESS(rc))
@@ -8377 +8440 @@
             /* Update size and new block count. */
             pImage->cbSize = cbSize;
-            pExtent->cNominalSectors = cSectorsNew;
-            pExtent->cSectors = cSectorsNew;
+            /** @todo r=jack: update cExtents if needed */
+            pExtent->cNominalSectors = VMDK_BYTE2SECTOR(cbSize);
 
             /* Update geometry. */
@@ -8386 +8449 @@
 
         /* Update header information in base image file. */
-        pImage->Descriptor.fDirty = true;
         rc = vmdkWriteDescriptor(pImage, NULL);
 
-        if (RT_SUCCESS(rc))
-            rc = vmdkFlushImage(pImage, NULL);
+        if (RT_FAILURE(rc))
+            return rc;
+
+        rc = vmdkFlushImage(pImage, NULL);
+
+        if (RT_FAILURE(rc))
+            return rc;
     }
     /* Same size doesn't change the image at all. */
@@ -8397 +8464 @@
     return rc;
 }
+
 
 const VDIMAGEBACKEND g_VmdkBackend =

trunk/src/VBox/Storage/testcase/tstVDIo.cpp

@@ -567 +567 @@
     bool fBase = false;
     bool fDynamic = true;
-    bool fSplit = false;
 
     const char *pcszDisk = paScriptArgs[0].psz;
@@ -584 +583 @@
     else if (!RTStrICmp(paScriptArgs[3].psz, "dynamic"))
         fDynamic = true;
-    else if (!RTStrICmp(paScriptArgs[3].psz, "vmdk-dynamic-split"))
-        fSplit = true;
-    else if (!RTStrICmp(paScriptArgs[3].psz, "vmdk-fixed-split"))
-    {
-        fDynamic = false;
-        fSplit = true;
-    }
     else
     {
@@ -617 +609 @@
             if (fHonorSame)
                 fOpenFlags |= VD_OPEN_FLAGS_HONOR_SAME;
-
-            if (fSplit)
-                fImageFlags |= VD_VMDK_IMAGE_FLAGS_SPLIT_2G;
 
             if (fBase)
@@ -3023 +3012 @@
     return RTEXITCODE_SUCCESS;
 }
+

trunk/src/VBox/Storage/testcase/tstVDResize.vd

@@ -40 +40 @@
     destroydisk("test");
 
-    print("Testing VMDK Monolithic Flat");
-    createdisk("test-vmdk-mflat", true);
-    create("test-vmdk-mflat", "base", "test-vmdk-mflat.vmdk", "Fixed", "VMDK", 4G, false, false);
-    io("test-vmdk-mflat", false, 1, "seq", 64K, 1G, 2G, 1G, 100, "none");
-    resize("test-vmdk-mflat", 6000M);
-    io("test-vmdk-mflat", false, 1, "seq", 64K, 4G, 5G, 1G, 100, "none");
-    close("test-vmdk-mflat", "single", true /* fDelete */);
-    destroydisk("test-vmdk-mflat");
-
-    print("Testing VMDK Split Flat");
-    createdisk("test-vmdk-sflat", true);
-    create("test-vmdk-sflat", "base", "test-vmdk-sflat.vmdk", "vmdk-fixed-split", "VMDK", 4G, false, false);
-    io("test-vmdk-sflat", false, 1, "seq", 64K, 1G, 2G, 1G, 100, "none");
-    resize("test-vmdk-sflat", 6000M);
-    io("test-vmdk-sflat", false, 1, "seq", 64K, 4G, 5G, 1G, 100, "none");
-    close("test-vmdk-sflat", "single", true /* fDelete */);
-    destroydisk("test-vmdk-sflat");
-
-    print("Testing VMDK Sparse");
-    createdisk("test-vmdk-sparse", true);
-    create("test-vmdk-sparse", "base", "test-vmdk-sparse.vmdk", "Dynamic", "VMDK", 4G, false, false);
-    io("test-vmdk-sparse", false, 1, "seq", 64K, 1G, 2G, 1G, 100, "none");
-    resize("test-vmdk-sparse", 6000M);
-    io("test-vmdk-sparse", false, 1, "seq", 64K, 4G, 5G, 1G, 100, "none");
-    close("test-vmdk-sparse", "single", true /* fDelete */);
-    destroydisk("test-vmdk-sparse");
-
-    print("Testing VMDK Sparse Split");
-    createdisk("test-vmdk-sparse-split", true);
-    create("test-vmdk-sparse-split", "base", "test-vmdk-sparse-split.vmdk", "vmdk-dynamic-split", "VMDK", 4G, false, false);
-    io("test-vmdk-sparse-split", false, 1, "seq", 64K, 1G, 2G, 1G, 100, "none");
-    resize("test-vmdk-sparse-split", 6000M);
-    io("test-vmdk-sparse-split", false, 1, "seq", 64K, 4G, 5G, 1G, 100, "none");
-    close("test-vmdk-sparse-split", "single", true /* fDelete */);
-    destroydisk("test-vmdk-sparse-split");
+    print("Testing VMDK Flat");
+    createdisk("test-vmdk-flat", true);
+    create("test-vmdk-flat", "base", "test-vmdk-flat.vmdk", "fixed", "VMDK", 10G, false, false);
+    io("test-vmdk-flat", false, 1, "seq", 64K, 1G, 2G, 10G, 100, "none");
+    resize("test-vmdk-flat", 20000M);
+    close("test-vmdk-flat", "single", true /* fDelete */);
+    destroydisk("test-vmdk-flat");
 
     iorngdestroy();
 }
+