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

Timestamp:

Jul 30, 2010 6:26:09 PM (15 years ago)

Author:

vboxsync

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

64274

Message:

Main/Medium+Storage/VBoxHDD: fix incorrect handling of diff media in VirtualBox::OpenHardDisk

File:

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

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

@@ -3383 +3383 @@
             }
         }
+
+        /* Ensure we always get correct diff information, even if the backend
+         * doesn't actually have a stored flag for this. It must not return
+         * bogus information for the parent UUID if it is not a diff image. */
+        RTUUID parentUuid;
+        RTUuidClear(&parentUuid);
+        rc2 = pImage->Backend->pfnGetParentUuid(pImage->pvBackendData, &parentUuid);
+        if (RT_SUCCESS(rc2) && !RTUuidIsNull(&parentUuid))
+            uImageFlags |= VD_IMAGE_FLAGS_DIFF;
+
         pImage->uImageFlags = uImageFlags;
 
@@ -5766 +5776 @@
         AssertPtrBreakStmt(pImage, rc = VERR_VD_IMAGE_NOT_FOUND);
 
-        *puImageFlags = pImage->Backend->pfnGetImageFlags(pImage->pvBackendData);
+        *puImageFlags = pImage->uImageFlags;
     } while (0);