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

Timestamp:

Mar 8, 2019 2:55:07 AM (6 years ago)

Author:

vboxsync

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

129234

Message:

Added AllocationBlockSize property to VDI backend, and ability to set properties with VBoxManage --property key=value

File:

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

trunk/src/VBox/Storage/VDI.cpp

@@ -39 +39 @@
 #define SET_ENDIAN_U32(conv, u32) (conv == VDIECONV_H2F ? RT_H2LE_U32(u32) : RT_LE2H_U32(u32))
 #define SET_ENDIAN_U64(conv, u64) (conv == VDIECONV_H2F ? RT_H2LE_U64(u64) : RT_LE2H_U64(u64))
+
+static const char *vdiAllocationBlockSize = "1048576";
+
+static const VDCONFIGINFO vdiConfigInfo[] = {
+    { "AllocationBlockSize",            vdiAllocationBlockSize,           VDCFGVALUETYPE_INTEGER,      0 }
+};
 
 
@@ -178 +184 @@
 }
 
+
 /**
  * Internal: Set the appropriate endianess on all the Blocks pointed.
@@ -549 +556 @@
  */
 static int vdiSetupImageState(PVDIIMAGEDESC pImage, unsigned uImageFlags, const char *pszComment,
-                              uint64_t cbSize, uint32_t cbDataAlign, PCVDGEOMETRY pPCHSGeometry,
+                              uint64_t cbSize, uint32_t cbAllocationBlock, uint32_t cbDataAlign, PCVDGEOMETRY pPCHSGeometry,
                               PCVDGEOMETRY pLCHSGeometry)
 {
@@ -555 +562 @@
 
     vdiInitPreHeader(&pImage->PreHeader);
-    vdiInitHeader(&pImage->Header, uImageFlags, pszComment, cbSize, VDI_IMAGE_DEFAULT_BLOCK_SIZE, 0,
+    vdiInitHeader(&pImage->Header, uImageFlags, pszComment, cbSize, cbAllocationBlock, 0,
                   cbDataAlign);
     /* Save PCHS geometry. Not much work, and makes the flow of information
@@ -696 +703 @@
     int rc = VINF_SUCCESS;
     uint32_t cbDataAlign = VDI_DATA_ALIGN;
-
+    uint32_t cbAllocationBlock = VDI_IMAGE_DEFAULT_BLOCK_SIZE;
     AssertPtr(pPCHSGeometry);
     AssertPtr(pLCHSGeometry);
@@ -710 +717 @@
                        N_("VDI: comment is too long for '%s'"), pImage->pszFilename);
 
+    PVDINTERFACECONFIG pImgCfg = VDIfConfigGet(pImage->pVDIfsImage);
+    if (pImgCfg) {
+        rc = VDCFGQueryU32Def(pImgCfg, "AllocationBlockSize", &cbAllocationBlock, VDI_IMAGE_DEFAULT_BLOCK_SIZE);
+        if (RT_FAILURE(rc))
+            rc = vdIfError(pImage->pIfError, rc, RT_SRC_POS,
+                           N_("VDI: Getting AllocationBlockSize for '%s' failed (%Rrc)"), pImage->pszFilename, rc);
+    }
+
     if (pIfCfg)
     {
@@ -720 +735 @@
     if (RT_SUCCESS(rc))
     {
-        rc = vdiSetupImageState(pImage, uImageFlags, pszComment, cbSize, cbDataAlign,
-                                pPCHSGeometry, pLCHSGeometry);
+
+        rc = vdiSetupImageState(pImage, uImageFlags, pszComment, cbSize,
+                cbAllocationBlock, cbDataAlign, pPCHSGeometry, pLCHSGeometry);
         if (RT_SUCCESS(rc))
         {
@@ -1484 +1500 @@
         PVDINTERFACEPROGRESS pIfProgress = VDIfProgressGet(pVDIfsOperation);
         PVDINTERFACECONFIG pIfCfg = VDIfConfigGet(pVDIfsOperation);
-
         pImage->pszFilename = pszFilename;
         pImage->pStorage = NULL;
@@ -3132 +3147 @@
     s_aVdiFileExtensions,
     /* paConfigInfo */
-    NULL,
+    vdiConfigInfo,
     /* pfnProbe */
     vdiProbe,