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

Timestamp:

Jun 10, 2008 11:39:40 AM (17 years ago)

Author:

vboxsync

Message:

Fix incorrect check verifying disk type. Also make the API for getting the disk type return an error if the cached value is invalid.

File:

• trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp (modified) (2 diffs)

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

@@ -1108 +1108 @@
          * diff images. Some image formats don't distinguish between normal
          * and diff images, so this must be corrected here. */
+        if (VBOX_FAILURE(rc))
+            enmImageType = VD_IMAGE_TYPE_INVALID;
         if (    VBOX_SUCCESS(rc)
             &&  !(uOpenFlags & VD_OPEN_FLAGS_INFO))
         {
-            rc = VERR_VDI_INVALID_TYPE;
-            break;
-        }
-        if (    pDisk->cImages == 0
-            &&  (   enmImageType != VD_IMAGE_TYPE_FIXED
-                 || enmImageType != VD_IMAGE_TYPE_NORMAL))
-        {
-            rc = VERR_VDI_INVALID_TYPE;
-            break;
-        }
-        else if (pDisk->cImages != 0)
-        {
-            if (    enmImageType != VD_IMAGE_TYPE_NORMAL
-                ||  enmImageType != VD_IMAGE_TYPE_DIFF)
+            if (    pDisk->cImages == 0
+                &&  (   enmImageType != VD_IMAGE_TYPE_FIXED
+                     || enmImageType != VD_IMAGE_TYPE_NORMAL))
             {
                 rc = VERR_VDI_INVALID_TYPE;
                 break;
             }
-            else
-                enmImageType = VD_IMAGE_TYPE_DIFF;
+            else if (pDisk->cImages != 0)
+            {
+                if (    enmImageType != VD_IMAGE_TYPE_NORMAL
+                    ||  enmImageType != VD_IMAGE_TYPE_DIFF)
+                {
+                    rc = VERR_VDI_INVALID_TYPE;
+                    break;
+                }
+                else
+                    enmImageType = VD_IMAGE_TYPE_DIFF;
+            }
         }
         pImage->enmImageType = enmImageType;
@@ -2777 +2777 @@
         AssertPtrBreakStmt(pImage, rc = VERR_VDI_IMAGE_NOT_FOUND);
 
-        *penmType = pImage->enmImageType;
+        if (    pImage->enmImageType >= VD_IMAGE_TYPE_FIRST
+            &&  pImage->enmImageType <= VD_IMAGE_TYPE_DIFF)
+        {
+            *penmType = pImage->enmImageType;
+            rc = VINF_SUCCESS;
+        }
+        else
+            rc = VERR_VDI_INVALID_TYPE;
     } while (0);