Changeset 17970 in vbox for trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp

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.

File:

• trunk/src/VBox/Devices/Storage/VDIHDDCore.cpp (modified) (17 diffs)

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,