Changeset 43739 in vbox for trunk/src/VBox/Storage

Timestamp:

Oct 25, 2012 1:51:28 PM (12 years ago)

Author:

vboxsync

Message:

Storage/VD: workaround for bug related to UUID handling of images which have no UUID, e.g. iSCSI

File:

• trunk/src/VBox/Storage/VD.cpp (modified) (3 diffs)

trunk/src/VBox/Storage/VD.cpp

@@ -6854 +6854 @@
         fLockWrite = true;
 
-        /* Update parent UUID so that image chain is consistent. */
+        /* Update parent UUID so that image chain is consistent.
+         * The two attempts work around the problem that some backends
+         * (e.g. iSCSI) do not support UUIDs, so we exploit the fact that
+         * so far there can only be one such image in the chain. */
+        /** @todo needs a better long-term solution, passing the UUID
+         * knowledge from the caller or some such */
         RTUUID Uuid;
         PVDIMAGE pImageChild = NULL;
@@ -6861 +6866 @@
             if (pImageFrom->pPrev)
             {
+                /* plan A: ask the parent itself for its UUID */
                 rc = pImageFrom->pPrev->Backend->pfnGetUuid(pImageFrom->pPrev->pBackendData,
                                                             &Uuid);
+                if (RT_FAILURE(rc))
+                {
+                    /* plan B: ask the child of the parent for parent UUID */
+                    rc = pImageFrom->Backend->pfnGetParentUuid(pImageFrom->pBackendData,
+                                                               &Uuid);
+                }
                 AssertRC(rc);
             }
@@ -6876 +6888 @@
             if (pImageFrom->pNext)
             {
+                /* plan A: ask the parent itself for its UUID */
                 rc = pImageTo->Backend->pfnGetUuid(pImageTo->pBackendData,
                                                    &Uuid);
+                if (RT_FAILURE(rc))
+                {
+                    /* plan B: ask the child of the parent for parent UUID */
+                    rc = pImageTo->pNext->Backend->pfnGetParentUuid(pImageTo->pNext->pBackendData,
+                                                                    &Uuid);
+                }
                 AssertRC(rc);