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

Timestamp:

Jul 12, 2019 4:11:19 PM (6 years ago)

Author:

vboxsync

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

132104

Message:

Changes per #5899 / Comment #14

Location:

trunk/src/VBox/Storage

Files:

• VDI.cpp (modified) (6 diffs)
• VDICore.h (modified) (1 diff)

trunk/src/VBox/Storage/VDI.cpp

@@ -44 +44 @@
 static const VDCONFIGINFO vdiConfigInfo[] =
 {
-    { "AllocationBlockSize",            vdiAllocationBlockSize,           VDCFGVALUETYPE_INTEGER,      0 },
+    { "AllocationBlockSize",            vdiAllocationBlockSize,           VDCFGVALUETYPE_INTEGER,      VD_CFGKEY_CREATEONLY },
     { NULL,                             NULL,                             VDCFGVALUETYPE_INTEGER,      0 }
 };
@@ -541 +541 @@
     pImage->uShiftOffset2Index = getPowerOfTwo(getImageBlockSize(&pImage->Header));
     pImage->offStartBlockData  = getImageExtraBlockSize(&pImage->Header);
-    pImage->cbTotalBlockData   =   pImage->offStartBlockData
+    pImage->cbAllocationBlock  = getImageBlockSize(&pImage->Header);
+    pImage->cbTotalBlockData   = pImage->offStartBlockData
                                  + getImageBlockSize(&pImage->Header);
 }
@@ -706 +707 @@
     int rc = VINF_SUCCESS;
     uint32_t cbDataAlign = VDI_DATA_ALIGN;
-    uint32_t cbAllocationBlock = VDI_IMAGE_DEFAULT_BLOCK_SIZE;
     AssertPtr(pPCHSGeometry);
     AssertPtr(pLCHSGeometry);
@@ -723 +723 @@
     if (pImgCfg)
     {
-        rc = VDCFGQueryU32Def(pImgCfg, "AllocationBlockSize", &cbAllocationBlock, VDI_IMAGE_DEFAULT_BLOCK_SIZE);
+        rc = VDCFGQueryU32Def(pImgCfg, "AllocationBlockSize",
+                &pImage->cbAllocationBlock, VDI_IMAGE_DEFAULT_BLOCK_SIZE);
         if (RT_FAILURE(rc))
             rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS,
@@ -741 +742 @@
 
         rc = vdiSetupImageState(pImage, uImageFlags, pszComment, cbSize,
-                cbAllocationBlock, cbDataAlign, pPCHSGeometry, pLCHSGeometry);
+                pImage->cbAllocationBlock, cbDataAlign, pPCHSGeometry, pLCHSGeometry);
+
         if (RT_SUCCESS(rc))
         {
@@ -1013 +1015 @@
         pRegion->cbMetadata           = 0;
         pRegion->cRegionBlocksOrBytes = getImageDiskSize(&pImage->Header);
+        if (uOpenFlags & VD_OPEN_FLAGS_INFO)
+        {
+            PVDINTERFACECONFIG pImgCfg = VDIfConfigGet(pImage->pVDIfsImage);
+            if (pImgCfg)
+            {
+                rc = VDCFGUpdateU64(pImgCfg, true, "AllocationBlockSize", pImage->cbAllocationBlock);
+                if (RT_FAILURE(rc))
+                    return rc;
+            }
+        }
     }
     else

trunk/src/VBox/Storage/VDICore.h

@@ -554 +554 @@
     /** Total size of image block (including the extra data). */
     unsigned                cbTotalBlockData;
+    /** Allocation Block Size */
+    unsigned                cbAllocationBlock;
     /** Container filename. (UTF-8) */
     const char             *pszFilename;