Changeset 18566 in vbox

Timestamp:

Mar 31, 2009 12:28:49 PM (15 years ago)

Author:

vboxsync

Message:

Storage/API/VBoxManage/...: add maximum size check to prevent creation of invalid images, implement fixed-size ESX variants, update VBoxManage and docs accordingly

Location:

trunk

Files:

• include/VBox/VBoxHDD.h (modified) (2 diffs)
• include/VBox/err.h (modified) (1 diff)
• src/VBox/Devices/Storage/VmdkHDDCore.cpp (modified) (16 diffs)
• src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp (modified) (1 diff)
• src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp (modified) (3 diffs)
• src/VBox/Main/idl/VirtualBox.xidl (modified) (2 diffs)

trunk/include/VBox/VBoxHDD.h

@@ -84 +84 @@
 /** VMDK: stream optimized image, read only. */
 #define VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED    (0x0004)
+/** VMDK: ESX variant, use in addition to other flags. */
+#define VD_VMDK_IMAGE_FLAGS_ESX                 (0x0008)
 /** VDI: Fill new blocks with zeroes while expanding image file. Only valid
  * for newly created images, never set for opened existing images. */
@@ -89 +91 @@
 
 /** Mask of valid image flags for VMDK. */
-#define VD_VMDK_IMAGE_FLAGS_MASK            (VD_IMAGE_FLAGS_FIXED | VD_IMAGE_FLAGS_DIFF | VD_IMAGE_FLAGS_NONE | VD_VMDK_IMAGE_FLAGS_SPLIT_2G | VD_VMDK_IMAGE_FLAGS_RAWDISK | VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
+#define VD_VMDK_IMAGE_FLAGS_MASK            (   VD_IMAGE_FLAGS_FIXED | VD_IMAGE_FLAGS_DIFF | VD_IMAGE_FLAGS_NONE \
+                                             |  VD_VMDK_IMAGE_FLAGS_SPLIT_2G | VD_VMDK_IMAGE_FLAGS_RAWDISK \
+                                             | VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED | VD_VMDK_IMAGE_FLAGS_ESX)
 
 /** Mask of valid image flags for VDI. */

trunk/include/VBox/err.h

@@ -1082 +1082 @@
 /** Asynchronous I/O is not finished yet. */
 #define VERR_VD_ASYNC_IO_IN_PROGRESS                (-3210)
+/** The image is too small or too large for this format. */
+#define VERR_VD_INVALID_SIZE                        (-3211)
 /** Generic: Invalid image file header. Use this for plugins. */
 #define VERR_VD_GEN_INVALID_HEADER                  (-3220)

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

@@ -198 +198 @@
     VMDKETYPE_FLAT,
     /** Zero extent. */
-    VMDKETYPE_ZERO
+    VMDKETYPE_ZERO,
+    /** VMFS extent, used by ESX. */
+    VMDKETYPE_VMFS
 #ifdef VBOX_WITH_VMDK_ESX
     ,
@@ -1649 +1651 @@
 {
     static const char *apszAccess[] = { "NOACCESS", "RDONLY", "RW" };
-    static const char *apszType[] = { "", "SPARSE", "FLAT", "ZERO" };
+    static const char *apszType[] = { "", "SPARSE", "FLAT", "ZERO", "VMFS" };
     char *pszTmp;
     unsigned uStart = pDescriptor->uFirstExtent, uLast = 0;
     char szExt[1024];
     ssize_t cbDiff;
+
+    Assert((int)enmAccess < RT_ELEMENTS(apszAccess));
+    Assert((int)enmType < RT_ELEMENTS(apszType));
 
     /* Find last entry in extent description. */
@@ -2073 +2078 @@
     else if (!strcmp(pszCreateType, "streamOptimized"))
         pImage->uImageFlags |= VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED;
+    else if (!strcmp(pszCreateType, "vmfs"))
+        pImage->uImageFlags |= VD_IMAGE_FLAGS_FIXED | VD_VMDK_IMAGE_FLAGS_ESX;
     RTStrFree((char *)(void *)pszCreateType);
 
@@ -2148 +2155 @@
         {
             pImage->pExtents[i].enmType = VMDKETYPE_ZERO;
+            pszLine += 4;
+        }
+        else if (!strncmp(pszLine, "VMFS", 4))
+        {
+            pImage->pExtents[i].enmType = VMDKETYPE_VMFS;
             pszLine += 4;
         }
@@ -3010 +3022 @@
                 PVMDKEXTENT pExtent = &pImage->pExtents[i];
 
-                if (   (pExtent->enmType != VMDKETYPE_FLAT)
-                    && (pExtent->enmType != VMDKETYPE_ZERO))
+                if (    pExtent->enmType != VMDKETYPE_FLAT
+                    &&  pExtent->enmType != VMDKETYPE_ZERO
+                    &&  pExtent->enmType != VMDKETYPE_VMFS)
                 {
                     /*
@@ -3094 +3107 @@
                     }
                     break;
+                case VMDKETYPE_VMFS:
                 case VMDKETYPE_FLAT:
                     rc = vmdkFileOpen(pImage, &pExtent->pFile, pExtent->pszFullname,
@@ -3617 +3631 @@
         }
         else
-            pExtent->enmType = VMDKETYPE_FLAT;
+        {
+            if (uImageFlags & VD_VMDK_IMAGE_FLAGS_ESX)
+                pExtent->enmType = VMDKETYPE_VMFS;
+            else
+                pExtent->enmType = VMDKETYPE_FLAT;
+        }
 
         pExtent->enmAccess = VMDKACCESS_READWRITE;
@@ -3648 +3667 @@
     if (uImageFlags & VD_IMAGE_FLAGS_FIXED)
     {
-        pszDescType =   (cExtents == 1)
-                      ? "monolithicFlat" : "twoGbMaxExtentFlat";
+        if (pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_ESX)
+            pszDescType = "vmfs";
+        else
+            pszDescType =   (cExtents == 1)
+                          ? "monolithicFlat" : "twoGbMaxExtentFlat";
     }
     else
@@ -3942 +3964 @@
                     break;
 #endif /* VBOX_WITH_VMDK_ESX */
+                case VMDKETYPE_VMFS:
                 case VMDKETYPE_FLAT:
                     /* Nothing to do. */
@@ -3958 +3981 @@
             case VMDKETYPE_ESX_SPARSE:
 #endif /* VBOX_WITH_VMDK_ESX */
+            case VMDKETYPE_VMFS:
             case VMDKETYPE_FLAT:
                 /** @todo implement proper path absolute check. */
@@ -4462 +4486 @@
     }
 
+    /* Check size. Maximum 2TB-64K for sparse images, otherwise unlimited. */
+    if (    !cbSize
+        ||  (!(uImageFlags & VD_IMAGE_FLAGS_FIXED) && cbSize >= _1T * 2 - _64K))
+    {
+        rc = VERR_VD_INVALID_SIZE;
+        goto out;
+    }
+
     /* Check remaining arguments. */
     if (   !VALID_PTR(pszFilename)
@@ -4902 +4934 @@
             }
             break;
+        case VMDKETYPE_VMFS:
         case VMDKETYPE_FLAT:
             rc = vmdkFileReadAt(pExtent->pFile,
@@ -5076 +5109 @@
             }
             break;
+        case VMDKETYPE_VMFS:
         case VMDKETYPE_FLAT:
             /* Clip write range to remain in this extent. */
@@ -5684 +5718 @@
         for (unsigned i = 0; i < pImage->cExtents; i++)
         {
-            if (   (pImage->pExtents[i].enmType != VMDKETYPE_FLAT)
-                && (pImage->pExtents[i].enmType != VMDKETYPE_ZERO))
+            if (    pImage->pExtents[i].enmType != VMDKETYPE_FLAT
+                &&  pImage->pExtents[i].enmType != VMDKETYPE_ZERO
+                &&  pImage->pExtents[i].enmType != VMDKETYPE_VMFS)
             {
                 fAsyncIOSupported = false;
@@ -5742 +5777 @@
         switch (pExtent->enmType)
         {
+            case VMDKETYPE_VMFS:
             case VMDKETYPE_FLAT:
             {
@@ -5878 +5914 @@
         switch (pExtent->enmType)
         {
+            case VMDKETYPE_VMFS:
             case VMDKETYPE_FLAT:
             {

trunk/src/VBox/Frontends/VBoxManage/VBoxManageDisk.cpp

@@ -85 +85 @@
                      || !RTStrNICmp(psz, "streamoptimized", len))
                 DiskVariant |= HardDiskVariant_VmdkStreamOptimized;
+            else if (!RTStrNICmp(psz, "esx", len))
+                DiskVariant |= HardDiskVariant_VmdkESX;
             else
                 rc = VERR_PARSE_ERROR;

trunk/src/VBox/Frontends/VBoxManage/VBoxManageHelp.cpp

@@ -324 +324 @@
                  "                            --size <megabytes>\n"
                  "                            [--format VDI|VMDK|VHD] (default: VDI)\n"
-                 "                            [--variant Standard,Fixed,Split2G,StreamOptimized]\n"
+                 "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
                  "                            [--type normal|writethrough] (default: normal)\n"
                  "                            [--comment <comment>]\n"
@@ -343 +343 @@
         RTPrintf("VBoxManage clonehd          <uuid>|<filename> <outputfile>\n"
                  "                            [--format VDI|VMDK|VHD|RAW|<other>]\n"
-                 "                            [--variant Standard,Fixed,Split2G,StreamOptimized]\n"
+                 "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
                  "                            [--type normal|writethrough|immutable]\n"
                  "                            [--remember]\n"
@@ -353 +353 @@
         RTPrintf("VBoxManage convertfromraw   <filename> <outputfile>\n"
                  "                            [--format VDI|VMDK|VHD]\n"
-                 "                            [--variant Standard,Fixed,Split2G,StreamOptimized]\n"
+                 "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
                  "VBoxManage convertfromraw   stdin <outputfile> <bytes>\n"
                  "                            [--format VDI|VMDK|VHD]\n"
-                 "                            [--variant Standard,Fixed,Split2G,StreamOptimized]\n"
+                 "                            [--variant Standard,Fixed,Split2G,Stream,ESX]\n"
                  "\n");
     }

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -8746 +8746 @@
   <enum
     name="HardDiskVariant"
-    uuid="99334b63-7ed0-4f61-8a7e-7ec3e20dd912"
+    uuid="eb7fc6b3-ae23-4c5d-a1f6-e3522dd1efb0"
    >
     <desc>
@@ -8769 +8769 @@
       </desc>
     </const>
-    <const name="Fixed" value="0x1000">
+    <const name="VmdkESX" value="0x08">
+      <desc>
+        VMDK format variant used on ESX products.
+      </desc>
+    </const>
+    <const name="Fixed" value="0x10000">
       <desc>
         Fixed image. Only allowed for base images.
       </desc>
     </const>
-    <const name="Diff" value="0x2000">
+    <const name="Diff" value="0x20000">
       <desc>
         Fixed image. Only allowed for base images.