Changeset 33524 in vbox for trunk/src/VBox/Devices/Storage

Timestamp:

Oct 27, 2010 4:44:37 PM (14 years ago)

Author:

vboxsync

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

67121

Message:

Storage: Implement offical support for other disk types like DVD and floppy images. DMG images can be used now without hacks

Location:

trunk/src/VBox/Devices/Storage

Files:

• DMGHDDCore.cpp (modified) (6 diffs)
• DrvVD.cpp (modified) (4 diffs)
• ISCSIHDDCore.cpp (modified) (2 diffs)
• ParallelsHDDCore.cpp (modified) (6 diffs)
• RawHDDCore.cpp (modified) (7 diffs)
• VBoxHDD.cpp (modified) (13 diffs)
• VCICacheCore.cpp (modified) (1 diff)
• VDIHDDCore.cpp (modified) (6 diffs)
• VHDHDDCore.cpp (modified) (6 diffs)
• VmdkHDDCore.cpp (modified) (5 diffs)
• testcase/tstVD-2.cpp (modified) (2 diffs)
• testcase/tstVD.cpp (modified) (8 diffs)
• testcase/tstVDCopy.cpp (modified) (2 diffs)
• testcase/tstVDShareable.cpp (modified) (1 diff)
• testcase/tstVDSnap.cpp (modified) (1 diff)
• testcase/vbox-img.cpp (modified) (9 diffs)
• testcase/vditool.cpp (modified) (1 diff)

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

@@ -407 +407 @@
 
 /** NULL-terminated array of supported file extensions. */
-static const char *const s_apszDmgFileExtensions[] =
-{
-    "dmg",
-    NULL
+static const VDFILEEXTENSION s_aDmgFileExtensions[] =
+{
+    {"dmg", VDTYPE_DVD},
+    {NULL, VDTYPE_INVALID}
 };
 
@@ -1592 +1592 @@
 /** @copydoc VBOXHDDBACKEND::pfnCheckIfValid */
 static int dmgCheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,
-                           PVDINTERFACE pVDIfsImage)
-{
-    LogFlowFunc(("pszFilename=\"%s\" pVDIfsDisk=%#p pVDIfsImage=%#p\n", pszFilename, pVDIfsDisk, pVDIfsImage));
+                           PVDINTERFACE pVDIfsImage, VDTYPE *penmType)
+{
+    LogFlowFunc(("pszFilename=\"%s\" pVDIfsDisk=%#p pVDIfsImage=%#p penmType=%#p\n",
+                 pszFilename, pVDIfsDisk, pVDIfsImage, penmType));
     int rc;
     PVDIOSTORAGE pStorage;
@@ -1639 +1640 @@
         {
             if (dmgUdifFtrIsValid(&Ftr, offFtr))
+            {
                 rc = VINF_SUCCESS;
+                *penmType = VDTYPE_DVD;
+            }
             else
             {
@@ -1659 +1663 @@
 static int dmgOpen(const char *pszFilename, unsigned uOpenFlags,
                    PVDINTERFACE pVDIfsDisk, PVDINTERFACE pVDIfsImage,
-                   void **ppBackendData)
+                   VDTYPE enmType, void **ppBackendData)
 {
     LogFlowFunc(("pszFilename=\"%s\" uOpenFlags=%#x pVDIfsDisk=%#p pVDIfsImage=%#p ppBackendData=%#p\n", pszFilename, uOpenFlags, pVDIfsDisk, pVDIfsImage, ppBackendData));
@@ -2136 +2140 @@
 {
     LogFlowFunc(("pBackendData=%#p pszComment=\"%s\"\n", pBackendData, pszComment));
-    PDMGIMAGE pThis = (PDMGIMAGE)pBackendData;
+    PDMGIMAGE pImage = (PDMGIMAGE)pBackendData;
     int rc;
 
-    AssertPtr(pThis);
-
-    if (pThis->uOpenFlags & VD_OPEN_FLAGS_READONLY)
-    {
-        rc = VERR_VD_IMAGE_READ_ONLY;
-        goto out;
-    }
-
-    if (pThis)
-        rc = VERR_NOT_SUPPORTED;
+    AssertPtr(pImage);
+
+    if (pImage)
+    {
+        if (pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
+            rc = VERR_VD_IMAGE_READ_ONLY;
+        else
+            rc = VERR_NOT_SUPPORTED;
+    }
     else
         rc = VERR_VD_NOT_OPENED;
@@ -2346 +2349 @@
     /* uBackendCaps */
     VD_CAP_FILE | VD_CAP_VFS,
-    /* papszFileExtensions */
-    s_apszDmgFileExtensions,
+    /* paFileExtensions */
+    s_aDmgFileExtensions,
     /* paConfigInfo */
     NULL,

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

@@ -2004 +2004 @@
     unsigned    iLevel = 0;
     PCFGMNODE   pCurNode = pCfg;
+    VDTYPE      enmType = VDTYPE_HDD;
 
     for (;;)
@@ -2017 +2018 @@
                                           "ReadOnly\0MaybeReadOnly\0TempReadOnly\0Shareable\0HonorZeroWrites\0"
                                           "HostIPStack\0UseNewIo\0BootAcceleration\0BootAccelerationBuffer\0"
-                                          "SetupMerge\0MergeSource\0MergeTarget\0BwGroup\0");
+                                          "SetupMerge\0MergeSource\0MergeTarget\0BwGroup\0Type\0");
         }
         else
@@ -2132 +2133 @@
             else
                 rc = VINF_SUCCESS;
+
+            char *psz;
+            rc = CFGMR3QueryStringAlloc(pCfg, "Type", &psz);
+            if (RT_FAILURE(rc))
+            {
+                rc = PDMDRV_SET_ERROR(pDrvIns, VERR_PDM_BLOCK_NO_TYPE, N_("Failed to obtain the type"));
+                break;
+            }
+            else if (!strcmp(psz, "HardDisk"))
+                enmType = VDTYPE_HDD;
+            else if (!strcmp(psz, "DVD"))
+                enmType = VDTYPE_DVD;
+            else if (!strcmp(psz, "Floppy"))
+                enmType = VDTYPE_FLOPPY;
+            else
+            {
+                rc = PDMDrvHlpVMSetError(pDrvIns, VERR_PDM_BLOCK_UNKNOWN_TYPE, RT_SRC_POS,
+                                         N_("Unknown type \"%s\""), psz);
+                MMR3HeapFree(psz);
+                break;
+            }
+            MMR3HeapFree(psz); psz = NULL;
         }
 
@@ -2270 +2293 @@
         if (RT_SUCCESS(rc))
         {
-            rc = VDCreate(pThis->pVDIfsDisk, &pThis->pDisk);
+            rc = VDCreate(pThis->pVDIfsDisk, enmType, &pThis->pDisk);
             /* Error message is already set correctly. */
         }

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

@@ -4369 +4369 @@
 /** @copydoc VBOXHDDBACKEND::pfnCheckIfValid */
 static int iscsiCheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,
-                             PVDINTERFACE pVDIfsImage)
+                             PVDINTERFACE pVDIfsImage, VDTYPE *penmType)
 {
     LogFlowFunc(("pszFilename=\"%s\"\n", pszFilename));
@@ -4384 +4384 @@
 static int iscsiOpen(const char *pszFilename, unsigned uOpenFlags,
                      PVDINTERFACE pVDIfsDisk, PVDINTERFACE pVDIfsImage,
-                     void **ppBackendData)
+                     VDTYPE enmType, void **ppBackendData)
 {
     LogFlowFunc(("pszFilename=\"%s\" uOpenFlags=%#x pVDIfsDisk=%#p pVDIfsImage=%#p ppBackendData=%#p\n", pszFilename, uOpenFlags, pVDIfsDisk, pVDIfsImage, ppBackendData));

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

@@ -105 +105 @@
 
 /** NULL-terminated array of supported file extensions. */
-static const char *const s_apszParallelsFileExtensions[] =
-{
-    "hdd",
-    NULL
+static const VDFILEEXTENSION s_aParallelsFileExtensions[] =
+{
+    {"hdd", VDTYPE_HDD},
+    {NULL, VDTYPE_INVALID}
 };
 
@@ -415 +415 @@
 /** @copydoc VBOXHDDBACKEND::pfnCheckIfValid */
 static int parallelsCheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,
-                                 PVDINTERFACE pVDIfsImage)
+                                 PVDINTERFACE pVDIfsImage, VDTYPE *penmType)
 {
     int rc;
@@ -471 +471 @@
     }
 
+    if (RT_SUCCESS(rc))
+        *penmType = VDTYPE_HDD;
+
     pInterfaceIOCallbacks->pfnClose(pInterfaceIO->pvUser, pStorage);
     return rc;
@@ -478 +481 @@
 static int parallelsOpen(const char *pszFilename, unsigned uOpenFlags,
                          PVDINTERFACE pVDIfsDisk, PVDINTERFACE pVDIfsImage,
-                         void **ppBackendData)
+                         VDTYPE enmType, void **ppBackendData)
 {
     LogFlowFunc(("pszFilename=\"%s\" uOpenFlags=%#x pVDIfsDisk=%#p pVDIfsImage=%#p ppBackendData=%#p\n", pszFilename, uOpenFlags, pVDIfsDisk, pVDIfsImage, ppBackendData));
@@ -1001 +1004 @@
     AssertPtr(pImage);
 
-    if (pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
-    {
-        rc = VERR_VD_IMAGE_READ_ONLY;
-        goto out;
-    }
-
-    if (pImage)
-        rc = VERR_NOT_SUPPORTED;
+    if (pImage)
+    {
+        if (pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
+            rc = VERR_VD_IMAGE_READ_ONLY;
+        else
+            rc = VERR_NOT_SUPPORTED;
+    }
     else
         rc = VERR_VD_NOT_OPENED;
@@ -1357 +1359 @@
     /* uBackendCaps */
     VD_CAP_FILE | VD_CAP_ASYNC | VD_CAP_VFS,
-    /* papszFileExtensions */
-    s_apszParallelsFileExtensions,
+    /* paFileExtensions */
+    s_aParallelsFileExtensions,
     /* paConfigInfo */
     NULL,

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

@@ -26 +26 @@
 #include <iprt/assert.h>
 #include <iprt/alloc.h>
-
+#include <iprt/path.h>
 
 /*******************************************************************************
 *   Constants And Macros, Structures and Typedefs                              *
 *******************************************************************************/
+/**
+ * ISO volume descriptor.
+ */
+#pragma pack(1)
+typedef struct ISOVOLDESC
+{
+    union
+    {
+        /** Byte view. */
+        uint8_t au8[2048];
+        /** Field view. */
+        struct
+        {
+            /** Descriptor type. */
+            uint8_t u8Type;
+            /** Standard identifier */
+            uint8_t au8Id[5];
+            /** Descriptor version. */
+            uint8_t u8Version;
+            /** Rest depends on the descriptor type. */
+        } fields;
+    };
+} ISOVOLDESC, *PISOVOLDESC;
+#pragma pack()
+AssertCompileSize(ISOVOLDESC, 2048);
 
 /**
@@ -82 +107 @@
 
 /** NULL-terminated array of supported file extensions. */
-static const char *const s_apszRawFileExtensions[] =
-{
-    /** @todo At the moment this backend doesn't claim any extensions, but it might
-     * be useful to add a few later. However this needs careful testing, as the
-     * CheckIfValid function never returns success. */
-    NULL
+static const VDFILEEXTENSION s_aRawFileExtensions[] =
+{
+    {"iso", VDTYPE_DVD},
+    {"img", VDTYPE_FLOPPY},
+    {"ima", VDTYPE_FLOPPY},
+    {NULL, VDTYPE_INVALID}
 };
 
@@ -484 +509 @@
 /** @copydoc VBOXHDDBACKEND::pfnCheckIfValid */
 static int rawCheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,
-                           PVDINTERFACE pVDIfsImage)
-{
-    LogFlowFunc(("pszFilename=\"%s\"\n", pszFilename));
+                           PVDINTERFACE pVDIfsImage, VDTYPE *penmType)
+{
+    LogFlowFunc(("pszFilename=\"%s\" pVDIfsDisk=%#p pVDIfsImage=%#p\n", pszFilename, pVDIfsDisk, pVDIfsImage));
+    PVDIOSTORAGE pStorage = NULL;
+    uint64_t cbFile;
     int rc = VINF_SUCCESS;
+    ISOVOLDESC IsoVolDesc;
+    char *pszExtension = NULL;
+
+    /* Get I/O interface. */
+    PVDINTERFACE pInterfaceIO = VDInterfaceGet(pVDIfsImage, VDINTERFACETYPE_IOINT);
+    AssertPtrReturn(pInterfaceIO, VERR_INVALID_PARAMETER);
+    PVDINTERFACEIOINT pInterfaceIOCallbacks = VDGetInterfaceIOInt(pInterfaceIO);
+    AssertPtrReturn(pInterfaceIOCallbacks, VERR_INVALID_PARAMETER);
 
     if (   !VALID_PTR(pszFilename)
@@ -496 +531 @@
     }
 
-    /* Always return failure, to avoid opening everything as a raw image. */
-    rc = VERR_VD_RAW_INVALID_HEADER;
+    pszExtension = RTPathExt(pszFilename);
+
+    /*
+     * Open the file and read the footer.
+     */
+    rc = pInterfaceIOCallbacks->pfnOpen(pInterfaceIO->pvUser, pszFilename,
+                                        VDOpenFlagsToFileOpenFlags(VD_OPEN_FLAGS_READONLY,
+                                                                   false /* fCreate */),
+                                        &pStorage);
+    if (RT_SUCCESS(rc))
+        rc = pInterfaceIOCallbacks->pfnGetSize(pInterfaceIO->pvUser, pStorage,
+                                               &cbFile);
+
+    /* Try to guess the image type based on the extension. */
+    if (   RT_SUCCESS(rc)
+        && pszExtension)
+    {
+        if (!strcmp(pszExtension, ".iso")) /* DVD images. */
+        {
+            if (cbFile >= (32768 + sizeof(ISOVOLDESC)))
+            {
+                rc = pInterfaceIOCallbacks->pfnReadSync(pInterfaceIO->pvUser, pStorage,
+                                                        32768, &IsoVolDesc, sizeof(IsoVolDesc), NULL);
+            }
+            else
+                rc = VERR_VD_RAW_INVALID_HEADER;
+
+            if (RT_SUCCESS(rc))
+            {
+                /*
+                 * Do we recognize this stuff?
+                 */
+                if (   !memcmp(IsoVolDesc.fields.au8Id, "BEA01", 5)
+                    || !memcmp(IsoVolDesc.fields.au8Id, "BOOT2", 5)
+                    || !memcmp(IsoVolDesc.fields.au8Id, "CD001", 5)
+                    || !memcmp(IsoVolDesc.fields.au8Id, "CDW02", 5)
+                    || !memcmp(IsoVolDesc.fields.au8Id, "NSR02", 5)
+                    || !memcmp(IsoVolDesc.fields.au8Id, "NSR03", 5)
+                    || !memcmp(IsoVolDesc.fields.au8Id, "TEA01", 5))
+                {
+                    *penmType = VDTYPE_DVD;
+                    rc = VINF_SUCCESS;
+                }
+                else
+                    rc = VERR_VD_RAW_INVALID_HEADER;
+            }
+        }
+        else if (!strcmp(pszExtension, ".img") || !strcmp(pszExtension, ".ima")) /* Floppy images */
+        {
+            if (!(cbFile % 512))
+            {
+                *penmType = VDTYPE_FLOPPY;
+                rc = VINF_SUCCESS;
+            }
+            else
+                rc = VERR_VD_RAW_INVALID_HEADER;
+        }
+    }
+    else
+        rc = VERR_VD_RAW_INVALID_HEADER;
+
+    if (pStorage)
+        pInterfaceIOCallbacks->pfnClose(pInterfaceIO->pvUser, pStorage);
 
 out:
@@ -507 +603 @@
 static int rawOpen(const char *pszFilename, unsigned uOpenFlags,
                    PVDINTERFACE pVDIfsDisk, PVDINTERFACE pVDIfsImage,
-                   void **ppBackendData)
+                   VDTYPE enmType, void **ppBackendData)
 {
     LogFlowFunc(("pszFilename=\"%s\" uOpenFlags=%#x pVDIfsDisk=%#p pVDIfsImage=%#p ppBackendData=%#p\n", pszFilename, uOpenFlags, pVDIfsDisk, pVDIfsImage, ppBackendData));
@@ -1040 +1136 @@
     AssertPtr(pImage);
 
-    if (pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
-    {
-        rc = VERR_VD_IMAGE_READ_ONLY;
-        goto out;
-    }
-
-    if (pImage)
-        rc = VERR_NOT_SUPPORTED;
+    if (pImage)
+    {
+        if (pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
+            rc = VERR_VD_IMAGE_READ_ONLY;
+        else
+            rc = VERR_NOT_SUPPORTED;
+    }
     else
         rc = VERR_VD_NOT_OPENED;
@@ -1292 +1387 @@
 {
     /* pszBackendName */
-    "raw",
+    "RAW",
     /* cbSize */
     sizeof(VBOXHDDBACKEND),
     /* uBackendCaps */
     VD_CAP_CREATE_FIXED | VD_CAP_FILE | VD_CAP_ASYNC | VD_CAP_VFS,
-    /* papszFileExtensions */
-    s_apszRawFileExtensions,
+    /* paFileExtensions */
+    s_aRawFileExtensions,
     /* paConfigInfo */
     NULL,

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

@@ -156 +156 @@
     /** Structure signature (VBOXHDDDISK_SIGNATURE). */
     uint32_t            u32Signature;
+
+    /** Image type. */
+    VDTYPE              enmType;
 
     /** Number of opened images. */
@@ -440 +443 @@
 extern VBOXHDDBACKEND g_VhdBackend;
 extern VBOXHDDBACKEND g_ParallelsBackend;
-#ifdef VBOX_WITH_DMG
 extern VBOXHDDBACKEND g_DmgBackend;
-#endif
 #ifdef VBOX_WITH_ISCSI
 extern VBOXHDDBACKEND g_ISCSIBackend;
@@ -451 +452 @@
 static PVBOXHDDBACKEND aStaticBackends[] =
 {
-    &g_RawBackend,
     &g_VmdkBackend,
     &g_VDIBackend,
     &g_VhdBackend,
-    &g_ParallelsBackend
-#ifdef VBOX_WITH_DMG
-    ,&g_DmgBackend
-#endif
+    &g_ParallelsBackend,
+    &g_DmgBackend,
+    &g_RawBackend
 #ifdef VBOX_WITH_ISCSI
     ,&g_ISCSIBackend
@@ -3584 +3583 @@
         pEntries[i].pszBackend = g_apBackends[i]->pszBackendName;
         pEntries[i].uBackendCaps = g_apBackends[i]->uBackendCaps;
-        pEntries[i].papszFileExtensions = g_apBackends[i]->papszFileExtensions;
+        pEntries[i].paFileExtensions = g_apBackends[i]->paFileExtensions;
         pEntries[i].paConfigInfo = g_apBackends[i]->paConfigInfo;
         pEntries[i].pfnComposeLocation = g_apBackends[i]->pfnComposeLocation;
@@ -3622 +3621 @@
             pEntry->pszBackend = g_apBackends[i]->pszBackendName;
             pEntry->uBackendCaps = g_apBackends[i]->uBackendCaps;
-            pEntry->papszFileExtensions = g_apBackends[i]->papszFileExtensions;
+            pEntry->paFileExtensions = g_apBackends[i]->paFileExtensions;
             pEntry->paConfigInfo = g_apBackends[i]->paConfigInfo;
             return VINF_SUCCESS;
@@ -3637 +3636 @@
  * @returns VBox status code.
  * @param   pVDIfsDisk      Pointer to the per-disk VD interface list.
+ * @param   enmType         Type of the image container.
  * @param   ppDisk          Where to store the reference to HDD container.
  */
-VBOXDDU_DECL(int) VDCreate(PVDINTERFACE pVDIfsDisk, PVBOXHDD *ppDisk)
+VBOXDDU_DECL(int) VDCreate(PVDINTERFACE pVDIfsDisk, VDTYPE enmType, PVBOXHDD *ppDisk)
 {
     int rc = VINF_SUCCESS;
@@ -3656 +3656 @@
         {
             pDisk->u32Signature = VBOXHDDDISK_SIGNATURE;
+            pDisk->enmType      = enmType;
             pDisk->cImages      = 0;
             pDisk->pBase        = NULL;
@@ -3809 +3810 @@
  */
 VBOXDDU_DECL(int) VDGetFormat(PVDINTERFACE pVDIfsDisk, PVDINTERFACE pVDIfsImage,
-                              const char *pszFilename, char **ppszFormat)
+                              const char *pszFilename, char **ppszFormat, VDTYPE *penmType)
 {
     int rc = VERR_NOT_SUPPORTED;
@@ -3825 +3826 @@
     AssertMsgReturn(VALID_PTR(ppszFormat),
                     ("ppszFormat=%#p\n", ppszFormat),
+                    VERR_INVALID_PARAMETER);
+    AssertMsgReturn(VALID_PTR(ppszFormat),
+                    ("penmType=%#p\n", penmType),
                     VERR_INVALID_PARAMETER);
 
@@ -3886 +3890 @@
         {
             rc = g_apBackends[i]->pfnCheckIfValid(pszFilename, pVDIfsDisk,
-                                                  pVDIfsImage);
+                                                  pVDIfsImage, penmType);
             if (    RT_SUCCESS(rc)
                 /* The correct backend has been found, but there is a small
@@ -4048 +4052 @@
                                       pDisk->pVDIfsDisk,
                                       pImage->pVDIfsImage,
+                                      pDisk->enmType,
                                       &pImage->pBackendData);
         /* If the open in read-write mode failed, retry in read-only mode. */
@@ -4063 +4068 @@
                                                pDisk->pVDIfsDisk,
                                                pImage->pVDIfsImage,
+                                               pDisk->enmType,
                                                &pImage->pBackendData);
             if (RT_FAILURE(rc))
@@ -7186 +7192 @@
         pBackendInfo->pszBackend = pImage->Backend->pszBackendName;
         pBackendInfo->uBackendCaps = pImage->Backend->uBackendCaps;
-        pBackendInfo->papszFileExtensions = pImage->Backend->papszFileExtensions;
+        pBackendInfo->paFileExtensions = pImage->Backend->paFileExtensions;
         pBackendInfo->paConfigInfo = pImage->Backend->paConfigInfo;
     } while (0);

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

@@ -1901 +1901 @@
     AssertPtr(pCache);
 
-    if (pCache->uOpenFlags & VD_OPEN_FLAGS_READONLY)
-    {
-        rc = VERR_VD_IMAGE_READ_ONLY;
-        goto out;
-    }
-
     if (pCache)
-        rc = VERR_NOT_SUPPORTED;
+    {
+        if (pCache->uOpenFlags & VD_OPEN_FLAGS_READONLY)
+            rc = VERR_VD_IMAGE_READ_ONLY;
+        else
+            rc = VERR_NOT_SUPPORTED;
+    }
     else
         rc = VERR_VD_NOT_OPENED;

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

@@ -38 +38 @@
 
 /** NULL-terminated array of supported file extensions. */
-static const char *const s_apszVdiFileExtensions[] =
-{
-    "vdi",
-    NULL
+static const VDFILEEXTENSION s_aVdiFileExtensions[] =
+{
+    {"vdi", VDTYPE_HDD},
+    {NULL, VDTYPE_INVALID}
 };
 
@@ -999 +999 @@
 /** @copydoc VBOXHDDBACKEND::pfnCheckIfValid */
 static int vdiCheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,
-                           PVDINTERFACE pVDIfsImage)
+                           PVDINTERFACE pVDIfsImage, VDTYPE *penmType)
 {
     LogFlowFunc(("pszFilename=\"%s\"\n", pszFilename));
@@ -1028 +1028 @@
     RTMemFree(pImage);
 
+    if (RT_SUCCESS(rc))
+        *penmType = VDTYPE_HDD;
+
 out:
     LogFlowFunc(("returns %Rrc\n", rc));
@@ -1036 +1039 @@
 static int vdiOpen(const char *pszFilename, unsigned uOpenFlags,
                    PVDINTERFACE pVDIfsDisk, PVDINTERFACE pVDIfsImage,
-                   void **ppBackendData)
+                   VDTYPE enmType, void **ppBackendData)
 {
     LogFlowFunc(("pszFilename=\"%s\" uOpenFlags=%#x pVDIfsDisk=%#p pVDIfsImage=%#p ppBackendData=%#p\n", pszFilename, uOpenFlags, pVDIfsDisk, pVDIfsImage, ppBackendData));
@@ -1701 +1704 @@
     AssertPtr(pImage);
 
-    if (pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
-    {
-        rc = VERR_VD_IMAGE_READ_ONLY;
-        goto out;
-    }
-
     if (pImage)
     {
-        size_t cchComment = pszComment ? strlen(pszComment) : 0;
-        if (cchComment >= VDI_IMAGE_COMMENT_SIZE)
-        {
-            LogFunc(("pszComment is too long, %d bytes!\n", cchComment));
-            rc = VERR_VD_VDI_COMMENT_TOO_LONG;
-            goto out;
-        }
-
-        /* we don't support old style images */
-        if (GET_MAJOR_HEADER_VERSION(&pImage->Header) == 1)
-        {
-            /*
-             * Update the comment field, making sure to zero out all of the previous comment.
-             */
-            memset(pImage->Header.u.v1.szComment, '\0', VDI_IMAGE_COMMENT_SIZE);
-            memcpy(pImage->Header.u.v1.szComment, pszComment, cchComment);
-
-            /* write out new the header */
-            rc = vdiUpdateHeader(pImage);
-        }
+        if (pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
+            rc = VERR_VD_IMAGE_READ_ONLY;
         else
-            rc = VERR_VD_VDI_UNSUPPORTED_VERSION;
+        {
+            size_t cchComment = pszComment ? strlen(pszComment) : 0;
+            if (cchComment >= VDI_IMAGE_COMMENT_SIZE)
+            {
+                LogFunc(("pszComment is too long, %d bytes!\n", cchComment));
+                rc = VERR_VD_VDI_COMMENT_TOO_LONG;
+                goto out;
+            }
+
+            /* we don't support old style images */
+            if (GET_MAJOR_HEADER_VERSION(&pImage->Header) == 1)
+            {
+                /*
+                 * Update the comment field, making sure to zero out all of the previous comment.
+                 */
+                memset(pImage->Header.u.v1.szComment, '\0', VDI_IMAGE_COMMENT_SIZE);
+                memcpy(pImage->Header.u.v1.szComment, pszComment, cchComment);
+
+                /* write out new the header */
+                rc = vdiUpdateHeader(pImage);
+            }
+            else
+                rc = VERR_VD_VDI_UNSUPPORTED_VERSION;
+        }
     }
     else
@@ -2657 +2659 @@
       VD_CAP_UUID | VD_CAP_CREATE_FIXED | VD_CAP_CREATE_DYNAMIC
     | VD_CAP_DIFF | VD_CAP_FILE | VD_CAP_ASYNC | VD_CAP_VFS,
-    /* papszFileExtensions */
-    s_apszVdiFileExtensions,
+    /* paFileExtensions */
+    s_aVdiFileExtensions,
     /* paConfigInfo */
     NULL,

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

@@ -241 +241 @@
 
 /** NULL-terminated array of supported file extensions. */
-static const char *const s_apszVhdFileExtensions[] =
-{
-    "vhd",
-    NULL
+static const VDFILEEXTENSION s_aVhdFileExtensions[] =
+{
+    {"vhd", VDTYPE_HDD},
+    {NULL, VDTYPE_INVALID}
 };
 
@@ -1380 +1380 @@
 /** @copydoc VBOXHDDBACKEND::pfnCheckIfValid */
 static int vhdCheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,
-                           PVDINTERFACE pVDIfsImage)
+                           PVDINTERFACE pVDIfsImage, VDTYPE *penmType)
 {
     LogFlowFunc(("pszFilename=\"%s\" pVDIfsDisk=%#p pVDIfsImage=%#p\n", pszFilename, pVDIfsDisk, pVDIfsImage));
@@ -1416 +1416 @@
         rc = VERR_VD_VHD_INVALID_HEADER;
     else
+    {
+        *penmType = VDTYPE_HDD;
         rc = VINF_SUCCESS;
+    }
 
     pInterfaceIOCallbacks->pfnClose(pInterfaceIO->pvUser, pStorage);
@@ -1428 +1431 @@
 static int vhdOpen(const char *pszFilename, unsigned uOpenFlags,
                    PVDINTERFACE pVDIfsDisk, PVDINTERFACE pVDIfsImage,
-                   void **ppBackendData)
+                   VDTYPE enmType, void **ppBackendData)
 {
     LogFlowFunc(("pszFilename=\"%s\" uOpenFlags=%#x pVDIfsDisk=%#p pVDIfsImage=%#p ppBackendData=%#p\n", pszFilename, uOpenFlags, pVDIfsDisk, pVDIfsImage, ppBackendData));
@@ -2137 +2140 @@
     AssertPtr(pImage);
 
-    if (pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
-    {
-        rc = VERR_VD_IMAGE_READ_ONLY;
-        goto out;
-    }
-
     if (pImage)
-        rc = VERR_NOT_SUPPORTED;
+    {
+        if (pImage->uOpenFlags & VD_OPEN_FLAGS_READONLY)
+            rc = VERR_VD_IMAGE_READ_ONLY;
+        else
+            rc = VERR_NOT_SUPPORTED;
+    }
     else
         rc = VERR_VD_NOT_OPENED;
@@ -3020 +3022 @@
     VD_CAP_CREATE_FIXED | VD_CAP_CREATE_DYNAMIC |
     VD_CAP_ASYNC | VD_CAP_VFS,
-    /* papszFileExtensions */
-    s_apszVhdFileExtensions,
+    /* paFileExtensions */
+    s_aVhdFileExtensions,
     /* paConfigInfo */
     NULL,

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

@@ -514 +514 @@
 
 /** NULL-terminated array of supported file extensions. */
-static const char *const s_apszVmdkFileExtensions[] =
-{
-    "vmdk",
-    NULL
+static const VDFILEEXTENSION s_aVmdkFileExtensions[] =
+{
+    {"vmdk", VDTYPE_HDD},
+    {NULL, VDTYPE_INVALID}
 };
 
@@ -5704 +5704 @@
 /** @copydoc VBOXHDDBACKEND::pfnCheckIfValid */
 static int vmdkCheckIfValid(const char *pszFilename, PVDINTERFACE pVDIfsDisk,
-                            PVDINTERFACE pVDIfsImage)
-{
-    LogFlowFunc(("pszFilename=\"%s\"\n", pszFilename));
+                            PVDINTERFACE pVDIfsImage, VDTYPE *penmType)
+{
+    LogFlowFunc(("pszFilename=\"%s\" pVDIfsDisk=%#p pVDIfsImage=%#p penmType=%#p\n",
+                 pszFilename, pVDIfsDisk, pVDIfsImage, penmType));
     int rc = VINF_SUCCESS;
     PVMDKIMAGE pImage;
@@ -5738 +5739 @@
     RTMemFree(pImage);
 
+    if (RT_SUCCESS(rc))
+        *penmType = VDTYPE_HDD;
+
 out:
     LogFlowFunc(("returns %Rrc\n", rc));
@@ -5746 +5750 @@
 static int vmdkOpen(const char *pszFilename, unsigned uOpenFlags,
                     PVDINTERFACE pVDIfsDisk, PVDINTERFACE pVDIfsImage,
-                    void **ppBackendData)
+                    VDTYPE enmType, void **ppBackendData)
 {
     LogFlowFunc(("pszFilename=\"%s\" uOpenFlags=%#x pVDIfsDisk=%#p pVDIfsImage=%#p ppBackendData=%#p\n", pszFilename, uOpenFlags, pVDIfsDisk, pVDIfsImage, ppBackendData));
@@ -7322 +7326 @@
     | VD_CAP_CREATE_SPLIT_2G | VD_CAP_DIFF | VD_CAP_FILE | VD_CAP_ASYNC
     | VD_CAP_VFS,
-    /* papszFileExtensions */
-    s_apszVmdkFileExtensions,
+    /* paFileExtensions */
+    s_aVmdkFileExtensions,
     /* paConfigInfo */
     NULL,

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

@@ -86 +86 @@
 };
 
+static const char *tstVDDeviceType(VDTYPE enmType)
+{
+    switch (enmType)
+    {
+        case VDTYPE_HDD:
+            return "HardDisk";
+        case VDTYPE_DVD:
+            return "DVD";
+        case VDTYPE_FLOPPY:
+            return "Floppy";
+        default:
+            return "Unknown";
+    }
+}
+
 static int tstVDBackendInfo(void)
 {
@@ -108 +123 @@
         RTPrintf("Backend %u: name=%s capabilities=%#06x extensions=",
                  i, aVDInfo[i].pszBackend, aVDInfo[i].uBackendCaps);
-        if (aVDInfo[i].papszFileExtensions)
-        {
-            const char *const *papsz = aVDInfo[i].papszFileExtensions;
-            while (*papsz != NULL)
-            {
-                if (papsz != aVDInfo[i].papszFileExtensions)
+        if (aVDInfo[i].paFileExtensions)
+        {
+            PCVDFILEEXTENSION pa = aVDInfo[i].paFileExtensions;
+            while (pa->pszExtension != NULL)
+            {
+                if (pa != aVDInfo[i].paFileExtensions)
                     RTPrintf(",");
-                RTPrintf("%s", *papsz);
-                papsz++;
-            }
-            if (papsz == aVDInfo[i].papszFileExtensions)
+                RTPrintf("%s (%s)", pa->pszExtension, tstVDDeviceType(pa->enmType));
+                pa++;
+            }
+            if (pa == aVDInfo[i].paFileExtensions)
                 RTPrintf("<EMPTY>");
         }

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

@@ -92 +92 @@
     AssertRC(rc);
 
-    rc = VDCreate(&VDIError, &pVD);
+    rc = VDCreate(&VDIError, VDTYPE_HDD, &pVD);
     CHECK("VDCreate()");
 
@@ -150 +150 @@
     AssertRC(rc);
 
-    rc = VDCreate(&VDIError, &pVD);
+    rc = VDCreate(&VDIError, VDTYPE_HDD, &pVD);
     CHECK("VDCreate()");
 
@@ -505 +505 @@
     PVBOXHDD pVD = NULL;
     char *pszFormat;
+    VDTYPE enmType = VDTYPE_INVALID;
     VDGEOMETRY PCHS = { 0, 0, 0 };
     VDGEOMETRY LCHS = { 0, 0, 0 };
@@ -539 +540 @@
 
 
-    rc = VDCreate(&VDIError, &pVD);
+    rc = VDCreate(&VDIError, VDTYPE_HDD, &pVD);
     CHECK("VDCreate()");
 
@@ -548 +549 @@
         RTFileClose(File);
         rc = VDGetFormat(NULL /* pVDIfsDisk */, NULL /* pVDIfsImage */,
-                         pszBaseFilename, &pszFormat);
+                         pszBaseFilename, &pszFormat, &enmType);
         RTPrintf("VDGetFormat() pszFormat=%s rc=%Rrc\n", pszFormat, rc);
         if (RT_SUCCESS(rc) && strcmp(pszFormat, pszBackend))
@@ -664 +665 @@
 
 
-    rc = VDCreate(&VDIError, &pVD);
+    rc = VDCreate(&VDIError, VDTYPE_HDD, &pVD);
     CHECK("VDCreate()");
 
@@ -738 +739 @@
     AssertRC(rc);
 
-    rc = VDCreate(&VDIError, &pVD);
+    rc = VDCreate(&VDIError, VDTYPE_HDD, &pVD);
     CHECK("VDCreate()");
 
@@ -789 +790 @@
     AssertRC(rc);
 
-    rc = VDCreate(&VDIError, &pVD);
+    rc = VDCreate(&VDIError, VDTYPE_HDD, &pVD);
     CHECK("VDCreate()");
 

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

@@ -70 +70 @@
     char *pbBuf1 = NULL;
     char *pbBuf2 = NULL;
+    VDTYPE enmTypeVD1 = VDTYPE_INVALID;
+    VDTYPE enmTypeVD2 = VDTYPE_INVALID;
 
 #define CHECK(str) \
@@ -98 +100 @@
 
     rc = VDGetFormat(NULL /* pVDIfsDisk */, NULL /* pVDIfsImage */,
-                     argv[1], &pszVD1);
+                     argv[1], &pszVD1, &enmTypeVD1);
     CHECK("VDGetFormat() hdd1");
 
     rc = VDGetFormat(NULL /* pVDIfsDisk */, NULL /* pVDIfsImage */,
-                     argv[2], &pszVD2);
+                     argv[2], &pszVD2, &enmTypeVD2);
     CHECK("VDGetFormat() hdd2");
 
-    rc = VDCreate(&VDIError, &pVD1);
+    rc = VDCreate(&VDIError, VDTYPE_HDD, &pVD1);
     CHECK("VDCreate() hdd1");
 
-    rc = VDCreate(&VDIError, &pVD2);
+    rc = VDCreate(&VDIError, VDTYPE_HDD, &pVD2);
     CHECK("VDCreate() hdd1");
 

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

@@ -92 +92 @@
     AssertRC(rc);
 
-    rc = VDCreate(&VDIError, &pVD);
+    rc = VDCreate(&VDIError, VDTYPE_HDD, &pVD);
     CHECK("VDCreate()");
-    rc = VDCreate(&VDIError, &pVD2);
+    rc = VDCreate(&VDIError, VDTYPE_HDD, &pVD2);
     CHECK("VDCreate() #2");
 

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

@@ -276 +276 @@
 
 
-    rc = VDCreate(pVDIfs, &pVD);
+    rc = VDCreate(pVDIfs, VDTYPE_HDD, &pVD);
     CHECK("VDCreate()");
 

trunk/src/VBox/Devices/Storage/testcase/vbox-img.cpp

@@ -124 +124 @@
     const char *pszFilename = NULL;
     char *pszFormat = NULL;
+    VDTYPE enmType = VDTYPE_INVALID;
     RTUUID imageUuid;
     RTUUID parentUuid;
@@ -188 +189 @@
         /* Don't pass error interface, as that would triggers error messages
          * because some backends fail to open the image. */
-        rc = VDGetFormat(NULL, NULL, pszFilename, &pszFormat);
+        rc = VDGetFormat(NULL, NULL, pszFilename, &pszFormat, &enmType);
         if (RT_FAILURE(rc))
             return errorRuntime("Format autodetect failed: %Rrc\n", rc);
@@ -194 +195 @@
 
     PVBOXHDD pVD = NULL;
-    rc = VDCreate(pVDIfs, &pVD);
+    rc = VDCreate(pVDIfs, enmType, &pVD);
     if (RT_FAILURE(rc))
         return errorRuntime("Cannot create the virtual disk container: %Rrc\n", rc);
@@ -625 +626 @@
     bool fStdOut = false;
     const char *pszSrcFormat = NULL;
+    VDTYPE enmSrcType = VDTYPE_HDD;
     const char *pszDstFormat = NULL;
     const char *pszVariant = NULL;
@@ -788 +790 @@
         if (!pszSrcFormat)
         {
-            char *pszFormat;
-            rc = VDGetFormat(NULL, NULL, pszSrcFilename, &pszFormat);
+            char *pszFormat = NULL;
+            VDTYPE enmType = VDTYPE_INVALID;
+            rc = VDGetFormat(NULL, NULL, pszSrcFilename, &pszFormat, &enmType);
             if (RT_FAILURE(rc))
             {
@@ -796 +799 @@
             }
             pszSrcFormat = pszFormat;
-        }
-
-        rc = VDCreate(pVDIfs, &pSrcDisk);
+            enmSrcType = enmType;
+        }
+
+        rc = VDCreate(pVDIfs, enmSrcType, &pSrcDisk);
         if (RT_FAILURE(rc))
         {
@@ -814 +818 @@
         }
 
-        rc = VDCreate(pVDIfs, &pDstDisk);
+        rc = VDCreate(pVDIfs, VDTYPE_HDD, &pDstDisk);
         if (RT_FAILURE(rc))
         {
@@ -883 +887 @@
     /* just try it */
     char *pszFormat = NULL;
-    rc = VDGetFormat(NULL, NULL, pszFilename, &pszFormat);
+    VDTYPE enmType = VDTYPE_INVALID;
+    rc = VDGetFormat(NULL, NULL, pszFilename, &pszFormat, &enmType);
     if (RT_FAILURE(rc))
         return errorSyntax("Format autodetect failed: %Rrc\n", rc);
 
-    rc = VDCreate(pVDIfs, &pDisk);
+    rc = VDCreate(pVDIfs, enmType, &pDisk);
     if (RT_FAILURE(rc))
         return errorRuntime("Error while creating the virtual disk container: %Rrc\n", rc);
@@ -940 +945 @@
     /* just try it */
     char *pszFormat = NULL;
-    rc = VDGetFormat(NULL, NULL, pszFilename, &pszFormat);
+    VDTYPE enmType = VDTYPE_INVALID;
+    rc = VDGetFormat(NULL, NULL, pszFilename, &pszFormat, &enmType);
     if (RT_FAILURE(rc))
         return errorSyntax("Format autodetect failed: %Rrc\n", rc);
 
-    rc = VDCreate(pVDIfs, &pDisk);
+    rc = VDCreate(pVDIfs, enmType, &pDisk);
     if (RT_FAILURE(rc))
         return errorRuntime("Error while creating the virtual disk container: %Rrc\n", rc);

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

@@ -104 +104 @@
 
     PVBOXHDD hdd;
-    rc = VDCreate(NULL, &hdd);
+    rc = VDCreate(NULL, VDTYPE_HDD, &hdd);
     if (RT_FAILURE(rc))
         return PrintDone(rc);