Changeset 17970 in vbox for trunk/src/VBox/Devices

Timestamp:

Mar 16, 2009 7:08:16 PM (16 years ago)

Author:

vboxsync

Message:

API/HardDisk, Storage/VBoxHDD, Frontend/VBoxManage: eliminated base image type, which led to much unnecessary code duplication. Was triggered by VBoxManage finally being able to create all image variants the backends can support.

Location:

trunk/src/VBox/Devices/Storage

Files:

• ISCSIHDDCore.cpp (modified) (5 diffs)
• RawHDDCore.cpp (modified) (12 diffs)
• VBoxHDD-Internal.h (modified) (3 diffs)
• VBoxHDD.cpp (modified) (18 diffs)
• VDIHDDCore.cpp (modified) (17 diffs)
• VHDHDDCore.cpp (modified) (14 diffs)
• VmdkHDDCore.cpp (modified) (25 diffs)
• testcase/tstVD.cpp (modified) (20 diffs)

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

@@ -2649 +2649 @@
 
 /** @copydoc VBOXHDDBACKEND::pfnCreate */
-static int iscsiCreate(const char *pszFilename, VDIMAGETYPE enmType,
-                       uint64_t cbSize, unsigned uImageFlags,
-                       const char *pszComment,
+static int iscsiCreate(const char *pszFilename, uint64_t cbSize,
+                       unsigned uImageFlags, const char *pszComment,
                        PCPDMMEDIAGEOMETRY pPCHSGeometry,
                        PCPDMMEDIAGEOMETRY pLCHSGeometry, PCRTUUID pUuid,
@@ -2659 +2658 @@
                        void **ppBackendData)
 {
-    LogFlowFunc(("pszFilename=\"%s\" enmType=%d cbSize=%llu uImageFlags=%#x pszComment=\"%s\" pPCHSGeometry=%#p pLCHSGeometry=%#p Uuid=%RTuuid uOpenFlags=%#x uPercentStart=%u uPercentSpan=%u pVDIfsDisk=%#p pVDIfsImage=%#p pVDIfsOperation=%#p ppBackendData=%#p", pszFilename, enmType, cbSize, uImageFlags, pszComment, pPCHSGeometry, pLCHSGeometry, pUuid, uOpenFlags, uPercentStart, uPercentSpan, pVDIfsDisk, pVDIfsImage, pVDIfsOperation, ppBackendData));
+    LogFlowFunc(("pszFilename=\"%s\" cbSize=%llu uImageFlags=%#x pszComment=\"%s\" pPCHSGeometry=%#p pLCHSGeometry=%#p Uuid=%RTuuid uOpenFlags=%#x uPercentStart=%u uPercentSpan=%u pVDIfsDisk=%#p pVDIfsImage=%#p pVDIfsOperation=%#p ppBackendData=%#p", pszFilename, cbSize, uImageFlags, pszComment, pPCHSGeometry, pLCHSGeometry, pUuid, uOpenFlags, uPercentStart, uPercentSpan, pVDIfsDisk, pVDIfsImage, pVDIfsOperation, ppBackendData));
     int rc = VERR_NOT_SUPPORTED;
 
@@ -2883 +2882 @@
 
 
-/** @copydoc VBOXHDDBACKEND::pfnGetImageType */
-static int iscsiGetImageType(void *pBackendData, PVDIMAGETYPE penmImageType)
-{
-    LogFlowFunc(("pBackendData=%#p penmImageType=%#p\n", pBackendData, penmImageType));
-    PISCSIIMAGE pImage = (PISCSIIMAGE)pBackendData;
-    int rc = VINF_SUCCESS;
-
-    Assert(pImage);
-    Assert(penmImageType);
-
-    if (pImage)
-        *penmImageType = VD_IMAGE_TYPE_FIXED;
-    else
-        rc = VERR_VD_NOT_OPENED;
-
-    LogFlowFunc(("returns %Rrc enmImageType=%u\n", rc, *penmImageType));
-    return rc;
-}
-
-
 /** @copydoc VBOXHDDBACKEND::pfnGetSize */
 static uint64_t iscsiGetSize(void *pBackendData)
@@ -3012 +2991 @@
     NOREF(pImage);
 
-    uImageFlags = VD_IMAGE_FLAGS_NONE;
+    uImageFlags = VD_IMAGE_FLAGS_FIXED;
 
     LogFlowFunc(("returns %#x\n", uImageFlags));
@@ -3488 +3467 @@
     /* pfnGetVersion */
     iscsiGetVersion,
-    /* pfnGetImageType */
-    iscsiGetImageType,
     /* pfnGetSize */
     iscsiGetSize,

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

@@ -57 +57 @@
     /** Open flags passed by VBoxHD layer. */
     unsigned        uOpenFlags;
-    /** Image type. */
-    VDIMAGETYPE     enmImageType;
     /** Image flags defined during creation or determined during open. */
     unsigned        uImageFlags;
@@ -146 +144 @@
         goto out;
     }
-    pImage->enmImageType = VD_IMAGE_TYPE_FIXED;
+    pImage->uImageFlags |= VD_IMAGE_FLAGS_FIXED;
 
 out:
@@ -157 +155 @@
  * Internal: Create a raw image.
  */
-static int rawCreateImage(PRAWIMAGE pImage, VDIMAGETYPE enmType,
-                          uint64_t cbSize, unsigned uImageFlags,
-                          const char *pszComment,
+static int rawCreateImage(PRAWIMAGE pImage, uint64_t cbSize,
+                          unsigned uImageFlags, const char *pszComment,
                           PCPDMMEDIAGEOMETRY pPCHSGeometry,
                           PCPDMMEDIAGEOMETRY pLCHSGeometry,
@@ -172 +169 @@
     void *pvBuf = NULL;
 
-    if (enmType != VD_IMAGE_TYPE_FIXED)
+    if (uImageFlags & VD_IMAGE_FLAGS_DIFF)
     {
         rc = rawError(pImage, VERR_VD_RAW_INVALID_TYPE, RT_SRC_POS, N_("Raw: cannot create diff image '%s'"), pImage->pszFilename);
         goto out;
     }
-
-    pImage->enmImageType = enmType;
+    uImageFlags |= VD_IMAGE_FLAGS_FIXED;
+
     pImage->uImageFlags = uImageFlags;
     pImage->PCHSGeometry = *pPCHSGeometry;
@@ -256 +253 @@
                     uPercentStart + uPercentSpan * 98 / 100, pvUser);
 
-    pImage->enmImageType = enmType;
     pImage->cbSize = cbSize;
 
@@ -279 +275 @@
     Assert(pImage);
 
-    if (pImage->enmImageType)
-    {
-        if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY))
-            rawFlushImage(pImage);
-    }
+    if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY))
+        rawFlushImage(pImage);
     if (pImage->File != NIL_RTFILE)
     {
@@ -374 +367 @@
 
 /** @copydoc VBOXHDDBACKEND::pfnCreate */
-static int rawCreate(const char *pszFilename, VDIMAGETYPE enmType,
-                     uint64_t cbSize, unsigned uImageFlags,
-                     const char *pszComment,
+static int rawCreate(const char *pszFilename, uint64_t cbSize,
+                     unsigned uImageFlags, const char *pszComment,
                      PCPDMMEDIAGEOMETRY pPCHSGeometry,
                      PCPDMMEDIAGEOMETRY pLCHSGeometry, PCRTUUID pUuid,
@@ -384 +376 @@
                      void **ppBackendData)
 {
-    LogFlowFunc(("pszFilename=\"%s\" enmType=%d cbSize=%llu uImageFlags=%#x pszComment=\"%s\" pPCHSGeometry=%#p pLCHSGeometry=%#p Uuid=%RTuuid uOpenFlags=%#x uPercentStart=%u uPercentSpan=%u pVDIfsDisk=%#p pVDIfsImage=%#p pVDIfsOperation=%#p ppBackendData=%#p", pszFilename, enmType, cbSize, uImageFlags, pszComment, pPCHSGeometry, pLCHSGeometry, pUuid, uOpenFlags, uPercentStart, uPercentSpan, pVDIfsDisk, pVDIfsImage, pVDIfsOperation, ppBackendData));
+    LogFlowFunc(("pszFilename=\"%s\" cbSize=%llu uImageFlags=%#x pszComment=\"%s\" pPCHSGeometry=%#p pLCHSGeometry=%#p Uuid=%RTuuid uOpenFlags=%#x uPercentStart=%u uPercentSpan=%u pVDIfsDisk=%#p pVDIfsImage=%#p pVDIfsOperation=%#p ppBackendData=%#p", pszFilename, cbSize, uImageFlags, pszComment, pPCHSGeometry, pLCHSGeometry, pUuid, uOpenFlags, uPercentStart, uPercentSpan, pVDIfsDisk, pVDIfsImage, pVDIfsOperation, ppBackendData));
     int rc;
     PRAWIMAGE pImage;
@@ -411 +403 @@
     if (   !VALID_PTR(pszFilename)
         || !*pszFilename
-        || (enmType != VD_IMAGE_TYPE_FIXED)
         || !VALID_PTR(pPCHSGeometry)
         || !VALID_PTR(pLCHSGeometry))
@@ -429 +420 @@
     pImage->pVDIfsDisk = pVDIfsDisk;
 
-    rc = rawCreateImage(pImage, enmType, cbSize, uImageFlags, pszComment,
+    rc = rawCreateImage(pImage, cbSize, uImageFlags, pszComment,
                         pPCHSGeometry, pLCHSGeometry,
                         pfnProgress, pvUser, uPercentStart, uPercentSpan);
@@ -563 +554 @@
     else
         return 0;
-}
-
-/** @copydoc VBOXHDDBACKEND::pfnGetImageType */
-static int rawGetImageType(void *pBackendData, PVDIMAGETYPE penmImageType)
-{
-    LogFlowFunc(("pBackendData=%#p penmImageType=%#p\n", pBackendData, penmImageType));
-    PRAWIMAGE pImage = (PRAWIMAGE)pBackendData;
-    int rc = VINF_SUCCESS;
-
-    Assert(pImage);
-    Assert(penmImageType);
-
-    if (pImage)
-        *penmImageType = pImage->enmImageType;
-    else
-        rc = VERR_VD_NOT_OPENED;
-
-    LogFlowFunc(("returns %Rrc enmImageType=%u\n", rc, *penmImageType));
-    return rc;
 }
 
@@ -1110 +1082 @@
     /* pfnGetVersion */
     rawGetVersion,
-    /* pfnGetImageType */
-    rawGetImageType,
     /* pfnGetSize */
     rawGetSize,

trunk/src/VBox/Devices/Storage/VBoxHDD-Internal.h

@@ -105 +105 @@
      * @param   pszFilename     Name of the image file to create. Guaranteed to be available and
      *                          unchanged during the lifetime of this image.
-     * @param   enmType         Image type. Both base and diff image types are valid.
      * @param   cbSize          Image size in bytes.
      * @param   uImageFlags     Flags specifying special image features.
@@ -120 +119 @@
      * @param   ppvBackendData  Opaque state data for this image.
      */
-    DECLR3CALLBACKMEMBER(int, pfnCreate, (const char *pszFilename, VDIMAGETYPE enmType,
-                                          uint64_t cbSize, unsigned uImageFlags,
-                                          const char *pszComment,
+    DECLR3CALLBACKMEMBER(int, pfnCreate, (const char *pszFilename, uint64_t cbSize,
+                                          unsigned uImageFlags, const char *pszComment,
                                           PCPDMMEDIAGEOMETRY pPCHSGeometry,
                                           PCPDMMEDIAGEOMETRY pLCHSGeometry,
@@ -222 +220 @@
 
     /**
-     * Get the type information for a disk image.
-     *
-     * @returns VBox status code.
-     * @param   pvBackendData   Opaque state data for this image.
-     * @param   penmType        Image type of this image.
-     */
-    DECLR3CALLBACKMEMBER(int, pfnGetImageType, (void *pvBackendData, PVDIMAGETYPE penmType));
-
-    /**
      * Get the capacity of a disk image.
      *

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

@@ -61 +61 @@
     /** Data managed by the backend which keeps the actual info. */
     void            *pvBackendData;
-    /** Cached sanitized image type. */
-    VDIMAGETYPE     enmImageType;
+    /** Cached sanitized image flags. */
+    unsigned        uImageFlags;
     /** Image open flags (only those handled generically in this code and which
      * the backends will never ever see). */
@@ -1052 +1052 @@
         }
 
-        VDIMAGETYPE enmImageType;
-        rc = pImage->Backend->pfnGetImageType(pImage->pvBackendData,
-                                              &enmImageType);
+        unsigned uImageFlags;
+        uImageFlags = pImage->Backend->pfnGetImageFlags(pImage->pvBackendData);
         /* Check image type. As the image itself has only partial knowledge
          * whether it's a base image or not, this info is derived here. The
@@ -1061 +1060 @@
          * and diff images, so this must be corrected here. */
         if (RT_FAILURE(rc))
-            enmImageType = VD_IMAGE_TYPE_INVALID;
+            uImageFlags = VD_IMAGE_FLAGS_NONE;
         if (    RT_SUCCESS(rc)
             &&  !(uOpenFlags & VD_OPEN_FLAGS_INFO))
         {
             if (    pDisk->cImages == 0
-                &&  enmImageType != VD_IMAGE_TYPE_FIXED
-                &&  enmImageType != VD_IMAGE_TYPE_NORMAL)
+                &&  (uImageFlags & VD_IMAGE_FLAGS_DIFF))
             {
                 rc = VERR_VD_INVALID_TYPE;
@@ -1074 +1072 @@
             else if (pDisk->cImages != 0)
             {
-                if (    enmImageType != VD_IMAGE_TYPE_NORMAL
-                    &&  enmImageType != VD_IMAGE_TYPE_DIFF)
+                if (uImageFlags & VD_IMAGE_FLAGS_FIXED)
                 {
                     rc = VERR_VD_INVALID_TYPE;
@@ -1081 +1078 @@
                 }
                 else
-                    enmImageType = VD_IMAGE_TYPE_DIFF;
+                    uImageFlags |= VD_IMAGE_FLAGS_DIFF;
             }
         }
-        pImage->enmImageType = enmImageType;
+        pImage->uImageFlags = uImageFlags;
 
         /* Force sane optimization settings. It's not worth avoiding writes
          * to fixed size images. The overhead would have almost no payback. */
-        if (enmImageType == VD_IMAGE_TYPE_FIXED)
+        if (uImageFlags & VD_IMAGE_FLAGS_FIXED)
             pImage->uOpenFlags |= VD_OPEN_FLAGS_HONOR_SAME;
 
@@ -1182 +1179 @@
  * @param   pszBackend      Name of the image file backend to use.
  * @param   pszFilename     Name of the image file to create.
- * @param   enmType         Image type, only base image types are acceptable.
  * @param   cbSize          Image size in bytes.
  * @param   uImageFlags     Flags specifying special image features.
@@ -1194 +1190 @@
  */
 VBOXDDU_DECL(int) VDCreateBase(PVBOXHDD pDisk, const char *pszBackend,
-                               const char *pszFilename, VDIMAGETYPE enmType,
-                               uint64_t cbSize, unsigned uImageFlags,
-                               const char *pszComment,
+                               const char *pszFilename, uint64_t cbSize,
+                               unsigned uImageFlags, const char *pszComment,
                                PCPDMMEDIAGEOMETRY pPCHSGeometry,
                                PCPDMMEDIAGEOMETRY pLCHSGeometry,
@@ -1207 +1202 @@
     RTUUID uuid;
 
-    LogFlowFunc(("pDisk=%#p pszBackend=\"%s\" pszFilename=\"%s\" enmType=%#x cbSize=%llu uImageFlags=%#x pszComment=\"%s\" PCHS=%u/%u/%u LCHS=%u/%u/%u Uuid=%RTuuid uOpenFlags=%#x pVDIfsImage=%#p pVDIfsOperation=%#p\n",
-                 pDisk, pszBackend, pszFilename, enmType, cbSize, uImageFlags, pszComment,
+    LogFlowFunc(("pDisk=%#p pszBackend=\"%s\" pszFilename=\"%s\" cbSize=%llu uImageFlags=%#x pszComment=\"%s\" PCHS=%u/%u/%u LCHS=%u/%u/%u Uuid=%RTuuid uOpenFlags=%#x pVDIfsImage=%#p pVDIfsOperation=%#p\n",
+                 pDisk, pszBackend, pszFilename, cbSize, uImageFlags, pszComment,
                  pPCHSGeometry->cCylinders, pPCHSGeometry->cHeads,
                  pPCHSGeometry->cSectors, pLCHSGeometry->cCylinders,
@@ -1233 +1228 @@
                            ("pszFilename=%#p \"%s\"\n", pszFilename, pszFilename),
                            rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreakStmt(enmType == VD_IMAGE_TYPE_NORMAL || enmType == VD_IMAGE_TYPE_FIXED,
-                           ("enmType=%#x\n", enmType),
-                           rc = VERR_INVALID_PARAMETER);
         AssertMsgBreakStmt(cbSize,
                            ("cbSize=%llu\n", cbSize),
                            rc = VERR_INVALID_PARAMETER);
-        AssertMsgBreakStmt((uImageFlags & ~VD_IMAGE_FLAGS_MASK) == 0,
+        AssertMsgBreakStmt(   ((uImageFlags & ~VD_IMAGE_FLAGS_MASK) == 0)
+                           || ((uImageFlags & (VD_IMAGE_FLAGS_FIXED | VD_IMAGE_FLAGS_DIFF)) != VD_IMAGE_FLAGS_FIXED),
                            ("uImageFlags=%#x\n", uImageFlags),
                            rc = VERR_INVALID_PARAMETER);
@@ -1313 +1306 @@
 
         pImage->uOpenFlags = uOpenFlags & VD_OPEN_FLAGS_HONOR_SAME;
-        rc = pImage->Backend->pfnCreate(pImage->pszFilename, enmType, cbSize,
+        uImageFlags &= ~VD_IMAGE_FLAGS_DIFF;
+        rc = pImage->Backend->pfnCreate(pImage->pszFilename, cbSize,
                                         uImageFlags, pszComment, pPCHSGeometry,
                                         pLCHSGeometry, pUuid,
@@ -1325 +1319 @@
         if (RT_SUCCESS(rc))
         {
-            pImage->enmImageType = enmType;
+            pImage->uImageFlags = uImageFlags;
 
             /* Force sane optimization settings. It's not worth avoiding writes
              * to fixed size images. The overhead would have almost no payback. */
-            if (enmType == VD_IMAGE_TYPE_FIXED)
+            if (uImageFlags & VD_IMAGE_FLAGS_FIXED)
                 pImage->uOpenFlags |= VD_OPEN_FLAGS_HONOR_SAME;
 
@@ -1518 +1512 @@
 
         pImage->uOpenFlags = uOpenFlags & VD_OPEN_FLAGS_HONOR_SAME;
-        rc = pImage->Backend->pfnCreate(pImage->pszFilename,
-                                        VD_IMAGE_TYPE_DIFF, pDisk->cbSize,
+        rc = pImage->Backend->pfnCreate(pImage->pszFilename, pDisk->cbSize,
                                         uImageFlags, pszComment,
                                         &pDisk->PCHSGeometry,
@@ -1532 +1525 @@
         if (RT_SUCCESS(rc) && pDisk->cImages != 0)
         {
-            pImage->enmImageType = VD_IMAGE_TYPE_DIFF;
+            pImage->uImageFlags |= VD_IMAGE_FLAGS_DIFF;
 
             /* Switch previous image to read-only mode. */
@@ -1952 +1945 @@
                            rc = VERR_INVALID_PARAMETER);
 
-        /* Collect properties of source image. */
-        VDIMAGETYPE enmTypeFrom = pImageFrom->enmImageType;
-
         uint64_t cbSizeFrom;
         cbSizeFrom = pImageFrom->Backend->pfnGetSize(pImageFrom->pvBackendData);
@@ -2010 +2000 @@
          * calls to the backend. Unifies the code and reduces the API
          * dependencies. */
-        if (enmTypeFrom == VD_IMAGE_TYPE_DIFF)
+        if (uImageFlags & VD_IMAGE_FLAGS_DIFF)
         {
             rc = VDCreateDiff(pDiskTo, pszBackend, pszFilename, uImageFlags,
                               szComment, &ImageUuid, &ParentUuid, uOpenFlagsFrom & ~VD_OPEN_FLAGS_READONLY, NULL, NULL);
         } else {
-            VDIMAGETYPE enmTypeTo = enmTypeFrom; /** @todo Please, review this! It's an ugly hack I think... */
-            if (    !strcmp(pszBackend, "RAW")
-                &&  enmTypeTo != VD_IMAGE_TYPE_FIXED)
-                enmTypeTo = VD_IMAGE_TYPE_FIXED;
-
-            rc = VDCreateBase(pDiskTo, pszBackend, pszFilename, enmTypeTo,
-                              cbSize, uImageFlags, szComment,
+            /** @todo Please, review this! It's an ugly hack I think... */
+            if (!RTStrICmp(pszBackend, "RAW"))
+                uImageFlags |= VD_IMAGE_FLAGS_FIXED;
+
+            rc = VDCreateBase(pDiskTo, pszBackend, pszFilename, cbSize,
+                              uImageFlags, szComment,
                               &PCHSGeometryFrom, &LCHSGeometryFrom,
                               NULL, uOpenFlagsFrom & ~VD_OPEN_FLAGS_READONLY, NULL, NULL);
@@ -2814 +2803 @@
 
 /**
- * Get type of image in HDD container.
- *
- * @returns VBox status code.
- * @returns VERR_VD_IMAGE_NOT_FOUND if image with specified number was not opened.
- * @param   pDisk           Pointer to HDD container.
- * @param   nImage          Image number, counts from 0. 0 is always base image of container.
- * @param   penmType        Where to store the image type.
- */
-VBOXDDU_DECL(int) VDGetImageType(PVBOXHDD pDisk, unsigned nImage,
-                                 PVDIMAGETYPE penmType)
-{
-    int rc = VINF_SUCCESS;
-
-    LogFlowFunc(("pDisk=%#p nImage=%u penmType=%#p\n",
-                 pDisk, nImage, penmType));
-    do
-    {
-        /* sanity check */
-        AssertPtrBreakStmt(pDisk, rc = VERR_INVALID_PARAMETER);
-        AssertMsg(pDisk->u32Signature == VBOXHDDDISK_SIGNATURE, ("u32Signature=%08x\n", pDisk->u32Signature));
-
-        /* Check arguments. */
-        AssertMsgBreakStmt(VALID_PTR(penmType),
-                           ("penmType=%#p\n", penmType),
-                           rc = VERR_INVALID_PARAMETER);
-
-        PVDIMAGE pImage = vdGetImageByNumber(pDisk, nImage);
-        AssertPtrBreakStmt(pImage, rc = VERR_VD_IMAGE_NOT_FOUND);
-
-        if (    pImage->enmImageType >= VD_IMAGE_TYPE_FIRST
-            &&  pImage->enmImageType <= VD_IMAGE_TYPE_DIFF)
-        {
-            *penmType = pImage->enmImageType;
-            rc = VINF_SUCCESS;
-        }
-        else
-            rc = VERR_VD_INVALID_TYPE;
-    } while (0);
-
-    LogFlowFunc(("returns %Rrc uenmType=%u\n", rc, *penmType));
-    return rc;
-}
-
-
-/**
  * List the capabilities of image backend in HDD container.
  *
@@ -2872 +2816 @@
     int rc = VINF_SUCCESS;
 
-    LogFlowFunc(("pDisk=%#p nImage=%u penmType=%#p\n",
+    LogFlowFunc(("pDisk=%#p nImage=%u pBackendInfo=%#p\n",
                  pDisk, nImage, pBackendInfo));
     do
@@ -2888 +2832 @@
         AssertPtrBreakStmt(pImage, rc = VERR_VD_IMAGE_NOT_FOUND);
 
-        if (    pImage->enmImageType >= VD_IMAGE_TYPE_FIRST
-            &&  pImage->enmImageType <= VD_IMAGE_TYPE_DIFF)
-        {
-            pBackendInfo->pszBackend = RTStrDup(pImage->Backend->pszBackendName);
-            pBackendInfo->uBackendCaps = pImage->Backend->uBackendCaps;
-            pBackendInfo->papszFileExtensions = pImage->Backend->papszFileExtensions;
-            pBackendInfo->paConfigInfo = pImage->Backend->paConfigInfo;
-            rc = VINF_SUCCESS;
-        }
-        else
-            rc = VERR_VD_INVALID_TYPE;
+        pBackendInfo->pszBackend = RTStrDup(pImage->Backend->pszBackendName);
+        pBackendInfo->uBackendCaps = pImage->Backend->uBackendCaps;
+        pBackendInfo->papszFileExtensions = pImage->Backend->papszFileExtensions;
+        pBackendInfo->paConfigInfo = pImage->Backend->paConfigInfo;
     } while (0);
 

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

@@ -55 +55 @@
 static void vdiInitPreHeader(PVDIPREHEADER pPreHdr);
 static int  vdiValidatePreHeader(PVDIPREHEADER pPreHdr);
-static void vdiInitHeader(PVDIHEADER pHeader, VDIMAGETYPE enmType,
-                          uint32_t uImageFlags, const char *pszComment,
-                          uint64_t cbDisk, uint32_t cbBlock,
-                          uint32_t cbBlockExtra);
+static void vdiInitHeader(PVDIHEADER pHeader, uint32_t uImageFlags,
+                          const char *pszComment, uint64_t cbDisk,
+                          uint32_t cbBlock, uint32_t cbBlockExtra);
 static int  vdiValidateHeader(PVDIHEADER pHeader);
 static void vdiSetupImageDesc(PVDIIMAGEDESC pImage);
@@ -127 +126 @@
 
 /**
- * Internal: translate VD image type enum to VDI image type enum.
+ * Internal: translate VD image flags to VDI image type enum.
  */
-static VDIIMAGETYPE vdiTranslateTypeVD2VDI(VDIMAGETYPE enmType)
-{
-    switch (enmType)
-    {
-        case VD_IMAGE_TYPE_NORMAL:
-            return VDI_IMAGE_TYPE_NORMAL;
-        case VD_IMAGE_TYPE_FIXED:
-            return VDI_IMAGE_TYPE_FIXED;
-        case VD_IMAGE_TYPE_UNDO:
-            return VDI_IMAGE_TYPE_UNDO;
-        case VD_IMAGE_TYPE_DIFF:
-            return VDI_IMAGE_TYPE_DIFF;
-        default:
-            AssertMsgFailed(("invalid VDIMAGETYPE enmType=%d\n", (int)enmType));
-            return VDI_IMAGE_TYPE_NORMAL;
-    }
+static VDIIMAGETYPE vdiTranslateImageFlags2VDI(unsigned uImageFlags)
+{
+    if (uImageFlags & VD_IMAGE_FLAGS_FIXED)
+        return VDI_IMAGE_TYPE_FIXED;
+    else if (uImageFlags & VD_IMAGE_FLAGS_DIFF)
+        return VDI_IMAGE_TYPE_DIFF;
+    else
+        return VDI_IMAGE_TYPE_NORMAL;
 }
 
@@ -150 +141 @@
  * Internal: translate VDI image type enum to VD image type enum.
  */
-static VDIMAGETYPE vdiTranslateTypeVDI2VD(VDIIMAGETYPE enmType)
+static unsigned vdiTranslateVDI2ImageFlags(VDIIMAGETYPE enmType)
 {
     switch (enmType)
     {
         case VDI_IMAGE_TYPE_NORMAL:
-            return VD_IMAGE_TYPE_NORMAL;
+            return VD_IMAGE_FLAGS_NONE;
         case VDI_IMAGE_TYPE_FIXED:
-            return VD_IMAGE_TYPE_FIXED;
-        case VDI_IMAGE_TYPE_UNDO:
-            return VD_IMAGE_TYPE_UNDO;
+            return VD_IMAGE_FLAGS_FIXED;
         case VDI_IMAGE_TYPE_DIFF:
-            return VD_IMAGE_TYPE_DIFF;
+            return VD_IMAGE_FLAGS_DIFF;
         default:
             AssertMsgFailed(("invalid VDIIMAGETYPE enmType=%d\n", (int)enmType));
-            return VD_IMAGE_TYPE_INVALID;
+            return VD_IMAGE_FLAGS_NONE;
     }
 }
@@ -172 +161 @@
  * @param   pHeader     Assumes it was initially initialized to all zeros.
  */
-static void vdiInitHeader(PVDIHEADER pHeader, VDIMAGETYPE enmType,
-                          uint32_t uImageFlags, const char *pszComment,
-                          uint64_t cbDisk, uint32_t cbBlock,
-                          uint32_t cbBlockExtra)
+static void vdiInitHeader(PVDIHEADER pHeader, uint32_t uImageFlags,
+                          const char *pszComment, uint64_t cbDisk,
+                          uint32_t cbBlock, uint32_t cbBlockExtra)
 {
     pHeader->uVersion = VDI_IMAGE_VERSION;
     pHeader->u.v1.cbHeader = sizeof(VDIHEADER1);
-    pHeader->u.v1.u32Type = (uint32_t)vdiTranslateTypeVD2VDI(enmType);
+    pHeader->u.v1.u32Type = (uint32_t)vdiTranslateImageFlags2VDI(uImageFlags);
     pHeader->u.v1.fFlags = (uImageFlags & VD_VDI_IMAGE_FLAGS_ZERO_EXPAND) ? 1 : 0;
 #ifdef VBOX_STRICT
@@ -351 +339 @@
 {
     pImage->uImageFlags        = getImageFlags(&pImage->Header);
+    pImage->uImageFlags       |= vdiTranslateVDI2ImageFlags(getImageType(&pImage->Header));
     pImage->offStartBlocks     = getImageBlocksOffset(&pImage->Header);
     pImage->offStartData       = getImageDataOffset(&pImage->Header);
@@ -363 +352 @@
  * Internal: Create VDI image file.
  */
-static int vdiCreateImage(PVDIIMAGEDESC pImage, VDIMAGETYPE enmType,
-                          uint64_t cbSize, unsigned uImageFlags,
-                          const char *pszComment,
+static int vdiCreateImage(PVDIIMAGEDESC pImage, uint64_t cbSize,
+                          unsigned uImageFlags, const char *pszComment,
                           PCPDMMEDIAGEOMETRY pPCHSGeometry,
                           PCPDMMEDIAGEOMETRY pLCHSGeometry, PCRTUUID pUuid,
@@ -392 +380 @@
 
     vdiInitPreHeader(&pImage->PreHeader);
-    vdiInitHeader(&pImage->Header, enmType, uImageFlags, pszComment, cbSize, VDI_IMAGE_DEFAULT_BLOCK_SIZE, 0);
+    vdiInitHeader(&pImage->Header, uImageFlags, pszComment, cbSize, VDI_IMAGE_DEFAULT_BLOCK_SIZE, 0);
     /* Save PCHS geometry. Not much work, and makes the flow of information
      * quite a bit clearer - relying on the higher level isn't obvious. */
@@ -409 +397 @@
     }
 
-    if (enmType != VD_IMAGE_TYPE_FIXED)
+    if (!(uImageFlags & VD_IMAGE_FLAGS_FIXED))
     {
         /* for growing images mark all blocks in paBlocks as free. */
@@ -439 +427 @@
               + (uint64_t)getImageBlocks(&pImage->Header) * pImage->cbTotalBlockData;
 
-    if (enmType == VD_IMAGE_TYPE_FIXED)
+    if (uImageFlags & VD_IMAGE_FLAGS_FIXED)
     {
         /* Check the free space on the disk and leave early if there is not
@@ -452 +440 @@
     }
 
-    if (enmType == VD_IMAGE_TYPE_FIXED)
+    if (uImageFlags & VD_IMAGE_FLAGS_FIXED)
     {
         /*
@@ -503 +491 @@
     }
 
-    if (enmType == VD_IMAGE_TYPE_FIXED)
+    if (uImageFlags & VD_IMAGE_FLAGS_FIXED)
     {
         /* Fill image with zeroes. We do this for every fixed-size image since on some systems
@@ -853 +841 @@
 
 /** @copydoc VBOXHDDBACKEND::pfnCreate */
-static int vdiCreate(const char *pszFilename, VDIMAGETYPE enmType,
-                     uint64_t cbSize, unsigned uImageFlags,
-                     const char *pszComment,
+static int vdiCreate(const char *pszFilename, uint64_t cbSize,
+                     unsigned uImageFlags, const char *pszComment,
                      PCPDMMEDIAGEOMETRY pPCHSGeometry,
                      PCPDMMEDIAGEOMETRY pLCHSGeometry, PCRTUUID pUuid,
@@ -863 +850 @@
                      void **ppBackendData)
 {
-    LogFlowFunc(("pszFilename=\"%s\" enmType=%d cbSize=%llu uImageFlags=%#x pszComment=\"%s\" pPCHSGeometry=%#p pLCHSGeometry=%#p Uuid=%RTuuid uOpenFlags=%#x uPercentStart=%u uPercentSpan=%u pVDIfsDisk=%#p pVDIfsImage=%#p pVDIfsOperation=%#p ppBackendData=%#p", pszFilename, enmType, cbSize, uImageFlags, pszComment, pPCHSGeometry, pLCHSGeometry, pUuid, uOpenFlags, uPercentStart, uPercentSpan, pVDIfsDisk, pVDIfsImage, pVDIfsOperation, ppBackendData));
+    LogFlowFunc(("pszFilename=\"%s\" cbSize=%llu uImageFlags=%#x pszComment=\"%s\" pPCHSGeometry=%#p pLCHSGeometry=%#p Uuid=%RTuuid uOpenFlags=%#x uPercentStart=%u uPercentSpan=%u pVDIfsDisk=%#p pVDIfsImage=%#p pVDIfsOperation=%#p ppBackendData=%#p", pszFilename, cbSize, uImageFlags, pszComment, pPCHSGeometry, pLCHSGeometry, pUuid, uOpenFlags, uPercentStart, uPercentSpan, pVDIfsDisk, pVDIfsImage, pVDIfsOperation, ppBackendData));
     int rc;
     PVDIIMAGEDESC pImage;
@@ -890 +877 @@
     if (   !VALID_PTR(pszFilename)
         || !*pszFilename
-        || (enmType != VD_IMAGE_TYPE_NORMAL && enmType != VD_IMAGE_TYPE_FIXED
-            && enmType != VD_IMAGE_TYPE_DIFF)
         || cbSize < VDI_IMAGE_DEFAULT_BLOCK_SIZE
         || !VALID_PTR(pPCHSGeometry)
@@ -911 +896 @@
     pImage->pVDIfsDisk = pVDIfsDisk;
 
-    rc = vdiCreateImage(pImage, enmType, cbSize, uImageFlags, pszComment,
+    rc = vdiCreateImage(pImage, cbSize, uImageFlags, pszComment,
                         pPCHSGeometry, pLCHSGeometry, pUuid,
                         pfnProgress, pvUser, uPercentStart, uPercentSpan);
@@ -1190 +1175 @@
     LogFlowFunc(("returns %#x\n", uVersion));
     return uVersion;
-}
-
-/** @copydoc VBOXHDDBACKEND::pfnGetImageType */
-static int vdiGetImageType(void *pBackendData, PVDIMAGETYPE penmImageType)
-{
-    LogFlowFunc(("pBackendData=%#p penmImageType=%#p\n", pBackendData, penmImageType));
-    PVDIIMAGEDESC pImage = (PVDIIMAGEDESC)pBackendData;
-    int rc = VINF_SUCCESS;
-
-    AssertPtr(pImage);
-    AssertPtr(penmImageType);
-
-    if (pImage)
-        *penmImageType = vdiTranslateTypeVDI2VD(getImageType(&pImage->Header));
-    else
-        rc = VERR_VD_NOT_OPENED;
-
-    LogFlowFunc(("returns %Rrc enmImageType=%u\n", rc, *penmImageType));
-    return rc;
 }
 
@@ -1893 +1859 @@
     /* pfnGetVersion */
     vdiGetVersion,
-    /* pfnGetImageType */
-    vdiGetImageType,
     /* pfnGetSize */
     vdiGetSize,

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

@@ -141 +141 @@
     /** Open flags passed by VBoxHD layer. */
     unsigned        uOpenFlags;
-    /** Image type. */
-    VDIMAGETYPE     enmImageType;
     /** Image flags defined during creation or determined during open. */
     unsigned        uImageFlags;
@@ -430 +428 @@
         case VHD_FOOTER_DISK_TYPE_FIXED:
             {
-                pImage->enmImageType = VD_IMAGE_TYPE_FIXED;
+                pImage->uImageFlags |= VD_IMAGE_FLAGS_FIXED;
             }
             break;
         case VHD_FOOTER_DISK_TYPE_DYNAMIC:
             {
-                pImage->enmImageType = VD_IMAGE_TYPE_NORMAL;
+                pImage->uImageFlags &= ~VD_IMAGE_FLAGS_FIXED;
             }
             break;
         case VHD_FOOTER_DISK_TYPE_DIFFERENCING:
             {
-                pImage->enmImageType = VD_IMAGE_TYPE_DIFF;
+                pImage->uImageFlags |= VD_IMAGE_FLAGS_DIFF;
+                pImage->uImageFlags &= ~VD_IMAGE_FLAGS_FIXED;
             }
             break;
@@ -470 +469 @@
     LogFlowFunc(("DataOffset=%llu\n", pImage->u64DataOffset));
 
-    if (pImage->enmImageType == VD_IMAGE_TYPE_NORMAL || pImage->enmImageType == VD_IMAGE_TYPE_DIFF)
+    if (!(pImage->uImageFlags & VD_IMAGE_FLAGS_FIXED))
         rc = vhdLoadDynamicDisk(pImage, pImage->u64DataOffset);
 
@@ -573 +572 @@
     RTMemFree(pBlockAllocationTable);
 
-    if (pImage->enmImageType == VD_IMAGE_TYPE_DIFF)
+    if (pImage->uImageFlags & VD_IMAGE_FLAGS_DIFF)
         memcpy(pImage->ParentUuid.au8, vhdDynamicDiskHeader.ParentUuid, sizeof(pImage->ParentUuid));
 
@@ -618 +617 @@
     else
         return 0;
-}
-
-static int vhdGetImageType(void *pBackendData, PVDIMAGETYPE penmImageType)
-{
-    PVHDIMAGE pImage = (PVHDIMAGE)pBackendData;
-    int rc = VINF_SUCCESS;
-
-    AssertPtr(pImage);
-    AssertPtr(penmImageType);
-
-    if (pImage)
-        *penmImageType = pImage->enmImageType;
-    else
-        rc = VERR_VD_NOT_OPENED;
-
-    return rc;
 }
 
@@ -1313 +1296 @@
     if (pImage && pImage->File != NIL_RTFILE)
     {
-        if (pImage->enmImageType != VD_IMAGE_TYPE_FIXED)
+        if (!(pImage->uImageFlags & VD_IMAGE_FLAGS_FIXED))
         {
             pImage->ParentUuid = *pUuid;
@@ -1525 +1508 @@
  * Internal: The actual code for VHD image creation, both fixed and dynamic.
  */
-static int vhdCreateImage(PVHDIMAGE pImage, VDIMAGETYPE enmType,
-                          uint64_t cbSize, unsigned uImageFlags,
-                          const char *pszComment,
+static int vhdCreateImage(PVHDIMAGE pImage, uint64_t cbSize,
+                          unsigned uImageFlags, const char *pszComment,
                           PCPDMMEDIAGEOMETRY pPCHSGeometry,
                           PCPDMMEDIAGEOMETRY pLCHSGeometry, PCRTUUID pUuid,
@@ -1540 +1522 @@
 
     pImage->uOpenFlags = uOpenFlags;
+    pImage->uImageFlags = uImageFlags;
 
     pImage->pInterfaceError = VDInterfaceGet(pImage->pVDIfsDisk, VDINTERFACETYPE_ERROR);
@@ -1552 +1535 @@
     pImage->File = File;
 
-    pImage->enmImageType = enmType;
     pImage->cbSize = cbSize;
     pImage->ImageUuid = *pUuid;
@@ -1579 +1561 @@
     Footer.SavedState = 0;
 
-    switch (enmType)
-    {
-        case VD_IMAGE_TYPE_FIXED:
-            Footer.DiskType   = RT_H2BE_U32(VHD_FOOTER_DISK_TYPE_FIXED);
-            /*
-             * Initialize fixed image.
-             * "The size of the entire file is the size of the hard disk in
-             * the guest operating system plus the size of the footer."
-             */
-            pImage->u64DataOffset     = VHD_FOOTER_DATA_OFFSET_FIXED;
-            pImage->uCurrentEndOfFile = cbSize;
-            rc = RTFileSetSize(File, pImage->uCurrentEndOfFile + sizeof(VHDFooter));
-            if (RT_FAILURE(rc))
-            {
-                vhdError(pImage, rc, RT_SRC_POS, N_("VHD: cannot set the file size for '%s'"), pImage->pszFilename);
-                goto out;
-            }
-            break;
-        case VD_IMAGE_TYPE_NORMAL:
-        case VD_IMAGE_TYPE_DIFF:
-            /*
-             * Initialize dynamic image.
-             *
-             * The overall structure of dynamic disk is:
-             *
-             * [Copy of hard disk footer (512 bytes)]
-             * [Dynamic disk header (1024 bytes)]
-             * [BAT (Block Allocation Table)]
-             * [Parent Locators]
-             * [Data block 1]
-             * [Data block 2]
-             * ...
-             * [Data block N]
-             * [Hard disk footer (512 bytes)]
-             */
-            Footer.DiskType   = enmType == VD_IMAGE_TYPE_DIFF ?
-                RT_H2BE_U32(VHD_FOOTER_DISK_TYPE_DIFFERENCING) :
-                RT_H2BE_U32(VHD_FOOTER_DISK_TYPE_DYNAMIC);
-            /* We are half way thourgh with creation of image, let the caller know. */
-            if (pfnProgress)
-                pfnProgress(NULL /* WARNING! pVM=NULL  */, (uPercentStart + uPercentSpan) / 2, pvUser);
-
-            rc = vhdCreateDynamicImage(pImage, cbSize);
-            if (RT_FAILURE(rc))
-                goto out;
-
-            break;
-        default:
-            /* Unknown/invalid image type. */
-            rc = VERR_NOT_IMPLEMENTED;
-            break;
+    if (uImageFlags & VD_IMAGE_FLAGS_FIXED)
+    {
+        Footer.DiskType   = RT_H2BE_U32(VHD_FOOTER_DISK_TYPE_FIXED);
+        /*
+         * Initialize fixed image.
+         * "The size of the entire file is the size of the hard disk in
+         * the guest operating system plus the size of the footer."
+         */
+        pImage->u64DataOffset     = VHD_FOOTER_DATA_OFFSET_FIXED;
+        pImage->uCurrentEndOfFile = cbSize;
+        rc = RTFileSetSize(File, pImage->uCurrentEndOfFile + sizeof(VHDFooter));
+        if (RT_FAILURE(rc))
+        {
+            vhdError(pImage, rc, RT_SRC_POS, N_("VHD: cannot set the file size for '%s'"), pImage->pszFilename);
+            goto out;
+        }
+    }
+    else
+    {
+        /*
+         * Initialize dynamic image.
+         *
+         * The overall structure of dynamic disk is:
+         *
+         * [Copy of hard disk footer (512 bytes)]
+         * [Dynamic disk header (1024 bytes)]
+         * [BAT (Block Allocation Table)]
+         * [Parent Locators]
+         * [Data block 1]
+         * [Data block 2]
+         * ...
+         * [Data block N]
+         * [Hard disk footer (512 bytes)]
+         */
+        Footer.DiskType   = (uImageFlags & VD_IMAGE_FLAGS_DIFF)
+                              ? RT_H2BE_U32(VHD_FOOTER_DISK_TYPE_DIFFERENCING)
+                              : RT_H2BE_U32(VHD_FOOTER_DISK_TYPE_DYNAMIC);
+        /* We are half way thourgh with creation of image, let the caller know. */
+        if (pfnProgress)
+            pfnProgress(NULL /* WARNING! pVM=NULL  */, (uPercentStart + uPercentSpan) / 2, pvUser);
+
+        rc = vhdCreateDynamicImage(pImage, cbSize);
+        if (RT_FAILURE(rc))
+            goto out;
     }
 
@@ -1648 +1623 @@
 
     /* Dynamic images contain a copy of the footer at the very beginning of the file. */
-    if (enmType == VD_IMAGE_TYPE_NORMAL || enmType == VD_IMAGE_TYPE_DIFF)
+    if (!(uImageFlags & VD_IMAGE_FLAGS_FIXED))
     {
         /* Write the copy of the footer. */
@@ -1666 +1641 @@
 }
 
-static int vhdCreate(const char *pszFilename, VDIMAGETYPE enmType,
-                     uint64_t cbSize, unsigned uImageFlags,
-                     const char *pszComment,
+static int vhdCreate(const char *pszFilename, uint64_t cbSize,
+                     unsigned uImageFlags, const char *pszComment,
                      PCPDMMEDIAGEOMETRY pPCHSGeometry,
                      PCPDMMEDIAGEOMETRY pLCHSGeometry, PCRTUUID pUuid,
@@ -1711 +1685 @@
     pImage->pVDIfsDisk = NULL;
 
-    rc = vhdCreateImage(pImage, enmType, cbSize, uImageFlags, pszComment,
+    rc = vhdCreateImage(pImage, cbSize, uImageFlags, pszComment,
                         pPCHSGeometry, pLCHSGeometry, pUuid, uOpenFlags,
                         pfnProgress, pvUser, uPercentStart, uPercentSpan);
@@ -1895 +1869 @@
     /* pfnGetVersion */
     vhdGetVersion,
-    /* pfnGetImageType */
-    vhdGetImageType,
     /* pfnGetSize */
     vhdGetSize,

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

@@ -439 +439 @@
     /** Open flags passed by VBoxHD layer. */
     unsigned        uOpenFlags;
-    /** Image type. */
-    VDIMAGETYPE     enmImageType;
     /** Image flags defined during creation or determined during open. */
     unsigned        uImageFlags;
@@ -2057 +2055 @@
     if (    !strcmp(pszCreateType, "twoGbMaxExtentSparse")
         ||  !strcmp(pszCreateType, "twoGbMaxExtentFlat"))
-        pImage->uImageFlags = VD_VMDK_IMAGE_FLAGS_SPLIT_2G;
+        pImage->uImageFlags |= VD_VMDK_IMAGE_FLAGS_SPLIT_2G;
     else if (   !strcmp(pszCreateType, "partitionedDevice")
              || !strcmp(pszCreateType, "fullDevice"))
-        pImage->uImageFlags = VD_VMDK_IMAGE_FLAGS_RAWDISK;
+        pImage->uImageFlags |= VD_VMDK_IMAGE_FLAGS_RAWDISK;
     else if (!strcmp(pszCreateType, "streamOptimized"))
-        pImage->uImageFlags = VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED;
-    else
-        pImage->uImageFlags = 0;
+        pImage->uImageFlags |= VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED;
     RTStrFree((char *)(void *)pszCreateType);
 
@@ -3115 +3111 @@
     }
 
-    pImage->enmImageType = VD_IMAGE_TYPE_NORMAL;
     for (unsigned i = 0; i < pImage->cExtents; i++)
     {
@@ -3122 +3117 @@
             ||  pImage->pExtents[i].enmType == VMDKETYPE_ZERO)
         {
-            pImage->enmImageType = VD_IMAGE_TYPE_FIXED;
+            pImage->uImageFlags |= VD_IMAGE_FLAGS_FIXED;
             break;
         }
@@ -3391 +3386 @@
  * Internal: create a regular (i.e. file-backed) VMDK image.
  */
-static int vmdkCreateRegularImage(PVMDKIMAGE pImage, VDIMAGETYPE enmType,
-                                  uint64_t cbSize, unsigned uImageFlags,
+static int vmdkCreateRegularImage(PVMDKIMAGE pImage, uint64_t cbSize,
+                                  unsigned uImageFlags,
                                   PFNVMPROGRESS pfnProgress, void *pvUser,
                                   unsigned uPercentStart, unsigned uPercentSpan)
@@ -3419 +3414 @@
 
     /* Create searate descriptor file if necessary. */
-    if (cExtents != 1 || enmType == VD_IMAGE_TYPE_FIXED)
+    if (cExtents != 1 || (uImageFlags & VD_IMAGE_FLAGS_FIXED))
     {
         rc = vmdkFileOpen(pImage, &pImage->pFile, pImage->pszFilename,
@@ -3440 +3435 @@
          * with RTMemTmpFree, which must be used as in other code paths
          * StrDup is not usable. */
-        if (cExtents == 1 && enmType != VD_IMAGE_TYPE_FIXED)
+        if (cExtents == 1 && !(uImageFlags & VD_IMAGE_FLAGS_FIXED))
         {
             char *pszBasename = (char *)RTMemTmpAlloc(cbBasenameSubstr);
@@ -3455 +3450 @@
             char *pszTmp;
             size_t cbTmp;
-            if (enmType == VD_IMAGE_TYPE_FIXED)
+            if (uImageFlags & VD_IMAGE_FLAGS_FIXED)
             {
                 if (cExtents == 1)
@@ -3496 +3491 @@
         if (RT_FAILURE(rc))
             return vmdkError(pImage, rc, RT_SRC_POS, N_("VMDK: could not create new file '%s'"), pExtent->pszFullname);
-        if (enmType == VD_IMAGE_TYPE_FIXED)
+        if (uImageFlags & VD_IMAGE_FLAGS_FIXED)
         {
             rc = vmdkFileSetSize(pExtent->pFile, cbExtent);
@@ -3546 +3541 @@
 
         /* Place descriptor file information (where integrated). */
-        if (cExtents == 1 && enmType != VD_IMAGE_TYPE_FIXED)
+        if (cExtents == 1 && !(uImageFlags & VD_IMAGE_FLAGS_FIXED))
         {
             pExtent->uDescriptorSector = 1;
@@ -3555 +3550 @@
         }
 
-        if (enmType == VD_IMAGE_TYPE_NORMAL)
+        if (!(uImageFlags & VD_IMAGE_FLAGS_FIXED))
         {
             uint64_t cSectorsPerGDE, cSectorsPerGD;
@@ -3578 +3573 @@
         pExtent->fMetaDirty = true;
 
-        if (enmType == VD_IMAGE_TYPE_NORMAL)
+        if (!(uImageFlags & VD_IMAGE_FLAGS_FIXED))
         {
             rc = vmdkCreateGrainDirectory(pExtent,
@@ -3599 +3594 @@
 
     const char *pszDescType = NULL;
-    if (enmType == VD_IMAGE_TYPE_FIXED)
+    if (uImageFlags & VD_IMAGE_FLAGS_FIXED)
     {
         pszDescType =   (cExtents == 1)
                       ? "monolithicFlat" : "twoGbMaxExtentFlat";
     }
-    else if (enmType == VD_IMAGE_TYPE_NORMAL)
+    else
     {
         if (pImage->uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
@@ -3614 +3609 @@
         }
     }
-    else
-        AssertMsgFailed(("invalid image type %d\n", enmType));
     rc = vmdkDescBaseSetStr(pImage, &pImage->Descriptor, "createType",
                             pszDescType);
@@ -3627 +3620 @@
  * existence on hosted environments.
  */
-static int vmdkCreateImage(PVMDKIMAGE pImage, VDIMAGETYPE enmType,
-                           uint64_t cbSize, unsigned uImageFlags,
-                           const char *pszComment,
+static int vmdkCreateImage(PVMDKIMAGE pImage, uint64_t cbSize,
+                           unsigned uImageFlags, const char *pszComment,
                            PCPDMMEDIAGEOMETRY pPCHSGeometry,
                            PCPDMMEDIAGEOMETRY pLCHSGeometry, PCRTUUID pUuid,
@@ -3657 +3649 @@
     }
 
-    if (    enmType == VD_IMAGE_TYPE_FIXED
+    if (    (uImageFlags & VD_IMAGE_FLAGS_FIXED)
         &&  (uImageFlags & VD_VMDK_IMAGE_FLAGS_RAWDISK))
     {
@@ -3667 +3659 @@
         rc = vmdkCreateRawImage(pImage, pRaw, cbSize);
     }
-    else if (   enmType == VD_IMAGE_TYPE_FIXED
-             || enmType == VD_IMAGE_TYPE_NORMAL)
+    else
     {
         /* Regular fixed or sparse image (monolithic or split). */
-        rc = vmdkCreateRegularImage(pImage, enmType, cbSize, uImageFlags,
+        rc = vmdkCreateRegularImage(pImage, cbSize, uImageFlags,
                                     pfnProgress, pvUser, uPercentStart,
                                     uPercentSpan * 95 / 100);
-    }
-    else
-    {
-        /* Unknown/invalid image type. */
-        rc = VERR_NOT_IMPLEMENTED;
     }
 
@@ -3688 +3674 @@
                     uPercentStart + uPercentSpan * 98 / 100, pvUser);
 
-    pImage->enmImageType = enmType;
     pImage->cbSize = cbSize;
 
@@ -3819 +3804 @@
     AssertPtr(pImage);
 
-    if (pImage->enmImageType)
-    {
-        if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY))
-        {
-            /* Mark all extents as clean. */
-            for (unsigned i = 0; i < pImage->cExtents; i++)
+    if (!(pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY))
+    {
+        /* Mark all extents as clean. */
+        for (unsigned i = 0; i < pImage->cExtents; i++)
+        {
+            if ((   pImage->pExtents[i].enmType == VMDKETYPE_HOSTED_SPARSE
+#ifdef VBOX_WITH_VMDK_ESX
+                 || pImage->pExtents[i].enmType == VMDKETYPE_ESX_SPARSE
+#endif /* VBOX_WITH_VMDK_ESX */
+                )
+                &&  pImage->pExtents[i].fUncleanShutdown)
             {
-                if ((   pImage->pExtents[i].enmType == VMDKETYPE_HOSTED_SPARSE
-#ifdef VBOX_WITH_VMDK_ESX
-                     || pImage->pExtents[i].enmType == VMDKETYPE_ESX_SPARSE
-#endif /* VBOX_WITH_VMDK_ESX */
-                    )
-                    &&  pImage->pExtents[i].fUncleanShutdown)
-                {
-                    pImage->pExtents[i].fUncleanShutdown = false;
-                    pImage->pExtents[i].fMetaDirty = true;
-                }
+                pImage->pExtents[i].fUncleanShutdown = false;
+                pImage->pExtents[i].fMetaDirty = true;
             }
         }
-        (void)vmdkFlushImage(pImage);
-    }
+    }
+    (void)vmdkFlushImage(pImage);
+
     if (pImage->pExtents != NULL)
     {
@@ -4352 +4335 @@
 
 /** @copydoc VBOXHDDBACKEND::pfnCreate */
-static int vmdkCreate(const char *pszFilename, VDIMAGETYPE enmType,
-                      uint64_t cbSize, unsigned uImageFlags,
-                      const char *pszComment,
+static int vmdkCreate(const char *pszFilename, uint64_t cbSize,
+                      unsigned uImageFlags, const char *pszComment,
                       PCPDMMEDIAGEOMETRY pPCHSGeometry,
                       PCPDMMEDIAGEOMETRY pLCHSGeometry, PCRTUUID pUuid,
@@ -4362 +4344 @@
                       void **ppBackendData)
 {
-    LogFlowFunc(("pszFilename=\"%s\" enmType=%d cbSize=%llu uImageFlags=%#x pszComment=\"%s\" pPCHSGeometry=%#p pLCHSGeometry=%#p Uuid=%RTuuid uOpenFlags=%#x uPercentStart=%u uPercentSpan=%u pVDIfsDisk=%#p pVDIfsImage=%#p pVDIfsOperation=%#p ppBackendData=%#p", pszFilename, enmType, cbSize, uImageFlags, pszComment, pPCHSGeometry, pLCHSGeometry, pUuid, uOpenFlags, uPercentStart, uPercentSpan, pVDIfsDisk, pVDIfsImage, pVDIfsOperation, ppBackendData));
+    LogFlowFunc(("pszFilename=\"%s\" cbSize=%llu uImageFlags=%#x pszComment=\"%s\" pPCHSGeometry=%#p pLCHSGeometry=%#p Uuid=%RTuuid uOpenFlags=%#x uPercentStart=%u uPercentSpan=%u pVDIfsDisk=%#p pVDIfsImage=%#p pVDIfsOperation=%#p ppBackendData=%#p", pszFilename, cbSize, uImageFlags, pszComment, pPCHSGeometry, pLCHSGeometry, pUuid, uOpenFlags, uPercentStart, uPercentSpan, pVDIfsDisk, pVDIfsImage, pVDIfsOperation, ppBackendData));
     int rc;
     PVMDKIMAGE pImage;
@@ -4385 +4367 @@
     }
 
-    /* @todo A quick hack to support differencing images in VMDK. */
-    if (enmType == VD_IMAGE_TYPE_DIFF)
-        enmType = VD_IMAGE_TYPE_NORMAL;
-
     /* Check remaining arguments. */
     if (   !VALID_PTR(pszFilename)
         || !*pszFilename
         || strchr(pszFilename, '"')
-        || (enmType != VD_IMAGE_TYPE_NORMAL && enmType != VD_IMAGE_TYPE_FIXED)
         || !VALID_PTR(pPCHSGeometry)
         || !VALID_PTR(pLCHSGeometry)
         || (   (uImageFlags & VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
-            && (   (uImageFlags & ~VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED)
-                || (enmType != VD_IMAGE_TYPE_NORMAL))))
+            && (uImageFlags & ~(VD_VMDK_IMAGE_FLAGS_STREAM_OPTIMIZED | VD_IMAGE_FLAGS_DIFF))))
     {
         rc = VERR_INVALID_PARAMETER;
@@ -4425 +4401 @@
     }
 
-    rc = vmdkCreateImage(pImage, enmType, cbSize, uImageFlags, pszComment,
+    rc = vmdkCreateImage(pImage, cbSize, uImageFlags, pszComment,
                          pPCHSGeometry, pLCHSGeometry, pUuid,
                          pfnProgress, pvUser, uPercentStart, uPercentSpan);
@@ -5045 +5021 @@
 }
 
-/** @copydoc VBOXHDDBACKEND::pfnGetImageType */
-static int vmdkGetImageType(void *pBackendData, PVDIMAGETYPE penmImageType)
-{
-    LogFlowFunc(("pBackendData=%#p penmImageType=%#p\n", pBackendData, penmImageType));
-    PVMDKIMAGE pImage = (PVMDKIMAGE)pBackendData;
-    int rc = VINF_SUCCESS;
-
-    AssertPtr(pImage);
-    AssertPtr(penmImageType);
-
-    if (pImage && pImage->cExtents != 0)
-        *penmImageType = pImage->enmImageType;
-    else
-        rc = VERR_VD_NOT_OPENED;
-
-    LogFlowFunc(("returns %Rrc enmImageType=%u\n", rc, *penmImageType));
-    return rc;
-}
-
 /** @copydoc VBOXHDDBACKEND::pfnGetSize */
 static uint64_t vmdkGetSize(void *pBackendData)
@@ -5943 +5900 @@
     /* pfnGetVersion */
     vmdkGetVersion,
-    /* pfnGetImageType */
-    vmdkGetImageType,
     /* pfnGetSize */
     vmdkGetSize,

trunk/src/VBox/Devices/Storage/testcase/tstVD.cpp

@@ -56 +56 @@
 
 static int tstVDCreateDelete(const char *pszBackend, const char *pszFilename,
-                             uint64_t cbSize, VDIMAGETYPE enmType,
-                             unsigned uFlags, bool fDelete)
+                             uint64_t cbSize, unsigned uFlags, bool fDelete)
 {
     int rc;
@@ -90 +89 @@
     CHECK("VDCreate()");
 
-    rc = VDCreateBase(pVD, pszBackend, pszFilename, enmType, cbSize,
+    rc = VDCreateBase(pVD, pszBackend, pszFilename, cbSize,
                       uFlags, "Test image", &PCHS, &LCHS, NULL,
                       VD_OPEN_FLAGS_NORMAL, NULL, NULL);
@@ -556 +555 @@
     else
     {
-        rc = VDCreateBase(pVD, pszBackend, pszBaseFilename,
-                          VD_IMAGE_TYPE_NORMAL, u64DiskSize,
+        rc = VDCreateBase(pVD, pszBackend, pszBaseFilename, u64DiskSize,
                           VD_IMAGE_FLAGS_NONE, "Test image",
                           &PCHS, &LCHS, NULL, VD_OPEN_FLAGS_NORMAL,
@@ -667 +665 @@
     }
 
-    rc = VDCreateBase(pVD, pszBackend, pszFilename,
-                      VD_IMAGE_TYPE_NORMAL, u64DiskSize,
+    rc = VDCreateBase(pVD, pszBackend, pszFilename, u64DiskSize,
                       VD_IMAGE_FLAGS_NONE, "Test image",
                       &PCHS, &LCHS, NULL, VD_OPEN_FLAGS_NORMAL,
@@ -744 +741 @@
 
 static int tstVmdkCreateRenameOpen(const char *src, const char *dst,
-                                   uint64_t cbSize, VDIMAGETYPE enmType,
-                                   unsigned uFlags)
-{
-    int rc = tstVDCreateDelete("VMDK", src, cbSize, enmType, uFlags, false);
+                                   uint64_t cbSize, unsigned uFlags)
+{
+    int rc = tstVDCreateDelete("VMDK", src, cbSize, uFlags, false);
     if (RT_FAILURE(rc))
         return rc;
@@ -802 +798 @@
 {
     int rc = tstVmdkCreateRenameOpen("tmpVDCreate.vmdk", "tmpVDRename.vmdk", _4G,
-                                 VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE);
+                                     VD_IMAGE_FLAGS_NONE);
     if (RT_FAILURE(rc))
     {
@@ -809 +805 @@
     }
     rc = tstVmdkCreateRenameOpen("tmpVDCreate.vmdk", "tmpVDRename.vmdk", _4G,
-                                 VD_IMAGE_TYPE_NORMAL, VD_VMDK_IMAGE_FLAGS_SPLIT_2G);
+                                 VD_VMDK_IMAGE_FLAGS_SPLIT_2G);
     if (RT_FAILURE(rc))
     {
@@ -816 +812 @@
     }
     rc = tstVmdkCreateRenameOpen("tmpVDCreate.vmdk", DST_PATH, _4G,
-                                 VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE);
+                                 VD_IMAGE_FLAGS_NONE);
     if (RT_FAILURE(rc))
     {
@@ -823 +819 @@
     }
     rc = tstVmdkCreateRenameOpen("tmpVDCreate.vmdk", DST_PATH, _4G,
-                                 VD_IMAGE_TYPE_NORMAL, VD_VMDK_IMAGE_FLAGS_SPLIT_2G);
+                                 VD_VMDK_IMAGE_FLAGS_SPLIT_2G);
     if (RT_FAILURE(rc))
     {
@@ -836 +832 @@
 
     rc = tstVmdkCreateRenameOpen("tmpVDCreate.vmdk", DST_PATH, _4G,
-                                 VD_IMAGE_TYPE_NORMAL, VD_VMDK_IMAGE_FLAGS_SPLIT_2G);
+                                 VD_VMDK_IMAGE_FLAGS_SPLIT_2G);
     if (RT_SUCCESS(rc))
     {
@@ -902 +898 @@
 #ifdef VMDK_TEST
     rc = tstVDCreateDelete("VMDK", "tmpVDCreate.vmdk", 2 * _4G,
-                           VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
-                           true);
+                           VD_IMAGE_FLAGS_NONE, true);
     if (RT_FAILURE(rc))
     {
@@ -910 +905 @@
     }
     rc = tstVDCreateDelete("VMDK", "tmpVDCreate.vmdk", 2 * _4G,
-                           VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
-                           false);
+                           VD_IMAGE_FLAGS_NONE, false);
     if (RT_FAILURE(rc))
     {
@@ -928 +922 @@
 #ifdef VDI_TEST
     rc = tstVDCreateDelete("VDI", "tmpVDCreate.vdi", 2 * _4G,
-                           VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
-                           true);
+                           VD_IMAGE_FLAGS_NONE, true);
     if (RT_FAILURE(rc))
     {
@@ -936 +929 @@
     }
     rc = tstVDCreateDelete("VDI", "tmpVDCreate.vdi", 2 * _4G,
-                           VD_IMAGE_TYPE_FIXED, VD_IMAGE_FLAGS_NONE,
-                           true);
+                           VD_IMAGE_FLAGS_NONE, true);
     if (RT_FAILURE(rc))
     {
@@ -946 +938 @@
 #ifdef VMDK_TEST
     rc = tstVDCreateDelete("VMDK", "tmpVDCreate.vmdk", 2 * _4G,
-                           VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
-                           true);
+                           VD_IMAGE_FLAGS_NONE, true);
     if (RT_FAILURE(rc))
     {
@@ -954 +945 @@
     }
     rc = tstVDCreateDelete("VMDK", "tmpVDCreate.vmdk", 2 * _4G,
-                           VD_IMAGE_TYPE_NORMAL, VD_VMDK_IMAGE_FLAGS_SPLIT_2G,
-                           true);
+                           VD_VMDK_IMAGE_FLAGS_SPLIT_2G, true);
     if (RT_FAILURE(rc))
     {
@@ -962 +952 @@
     }
     rc = tstVDCreateDelete("VMDK", "tmpVDCreate.vmdk", 2 * _4G,
-                           VD_IMAGE_TYPE_FIXED, VD_IMAGE_FLAGS_NONE,
-                           true);
+                           VD_IMAGE_FLAGS_FIXED, true);
     if (RT_FAILURE(rc))
     {
@@ -970 +959 @@
     }
     rc = tstVDCreateDelete("VMDK", "tmpVDCreate.vmdk", 2 * _4G,
-                           VD_IMAGE_TYPE_FIXED, VD_VMDK_IMAGE_FLAGS_SPLIT_2G,
+                           VD_IMAGE_FLAGS_FIXED | VD_VMDK_IMAGE_FLAGS_SPLIT_2G,
                            true);
     if (RT_FAILURE(rc))
@@ -980 +969 @@
 #ifdef VHD_TEST
     rc = tstVDCreateDelete("VHD", "tmpVDCreate.vhd", 2 * _4G,
-                           VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
-                           true);
+                           VD_IMAGE_FLAGS_NONE, true);
     if (RT_FAILURE(rc))
     {
@@ -988 +976 @@
     }
     rc = tstVDCreateDelete("VHD", "tmpVDCreate.vhd", 2 * _4G,
-                           VD_IMAGE_TYPE_FIXED, VD_IMAGE_FLAGS_NONE,
-                           true);
+                           VD_IMAGE_FLAGS_FIXED, true);
     if (RT_FAILURE(rc))
     {