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

Timestamp:

Oct 10, 2012 3:57:27 PM (12 years ago)

Author:

vboxsync

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

81297

Message:

Storage/VDI: Make the block data alignment configurable

File:

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

trunk/src/VBox/Storage/VDI.cpp

@@ -326 +326 @@
 static void vdiInitHeader(PVDIHEADER pHeader, uint32_t uImageFlags,
                           const char *pszComment, uint64_t cbDisk,
-                          uint32_t cbBlock, uint32_t cbBlockExtra)
+                          uint32_t cbBlock, uint32_t cbBlockExtra,
+                          uint32_t cbDataAlign)
 {
     pHeader->uVersion = VDI_IMAGE_VERSION;
@@ -360 +361 @@
 
     /* Init offsets. */
-    pHeader->u.v1plus.offBlocks = RT_ALIGN_32(sizeof(VDIPREHEADER) + sizeof(VDIHEADER1PLUS), VDI_DATA_ALIGN);
-    pHeader->u.v1plus.offData = RT_ALIGN_32(pHeader->u.v1plus.offBlocks + (pHeader->u.v1plus.cBlocks * sizeof(VDIIMAGEBLOCKPOINTER)), VDI_DATA_ALIGN);
+    pHeader->u.v1plus.offBlocks = RT_ALIGN_32(sizeof(VDIPREHEADER) + sizeof(VDIHEADER1PLUS), cbDataAlign);
+    pHeader->u.v1plus.offData = RT_ALIGN_32(pHeader->u.v1plus.offBlocks + (pHeader->u.v1plus.cBlocks * sizeof(VDIIMAGEBLOCKPOINTER)), cbDataAlign);
 
     /* Init uuids. */
@@ -521 +522 @@
                           unsigned uOpenFlags, PFNVDPROGRESS pfnProgress,
                           void *pvUser, unsigned uPercentStart,
-                          unsigned uPercentSpan)
+                          unsigned uPercentSpan, PVDINTERFACECONFIG pIfCfg)
 {
     int rc;
@@ -527 +528 @@
     uint64_t cbFill;
     uint64_t uOff;
+    uint32_t cbDataAlign = VDI_DATA_ALIGN;
 
     AssertPtr(pPCHSGeometry);
@@ -544 +546 @@
     }
 
+    if (pIfCfg)
+    {
+        rc = VDCFGQueryU32Def(pIfCfg, "DataAlignment", &cbDataAlign, VDI_DATA_ALIGN);
+        if (RT_FAILURE(rc))
+        {
+            rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS,
+                           N_("VDI: Getting data alignment for '%s' failed (%Rrc)"), pImage->pszFilename);
+            goto out;
+        }
+    }
+
     vdiInitPreHeader(&pImage->PreHeader);
-    vdiInitHeader(&pImage->Header, uImageFlags, pszComment, cbSize, VDI_IMAGE_DEFAULT_BLOCK_SIZE, 0);
+    vdiInitHeader(&pImage->Header, uImageFlags, pszComment, cbSize, VDI_IMAGE_DEFAULT_BLOCK_SIZE, 0,
+                  cbDataAlign);
     /* Save PCHS geometry. Not much work, and makes the flow of information
      * quite a bit clearer - relying on the higher level isn't obvious. */
@@ -1476 +1490 @@
     }
 
+    PVDINTERFACECONFIG pIfCfg = VDIfConfigGet(pVDIfsOperation);
+
     /* Check the image flags. */
     if ((uImageFlags & ~VD_VDI_IMAGE_FLAGS_MASK) != 0)
@@ -1525 +1541 @@
     rc = vdiCreateImage(pImage, cbSize, uImageFlags, pszComment,
                         pPCHSGeometry, pLCHSGeometry, pUuid, uOpenFlags,
-                        pfnProgress, pvUser, uPercentStart, uPercentSpan);
+                        pfnProgress, pvUser, uPercentStart, uPercentSpan,
+                        pIfCfg);
     if (RT_SUCCESS(rc))
     {