Changeset 10752 in vbox for trunk

Timestamp:

Jul 18, 2008 5:08:47 PM (16 years ago)

Author:

vboxsync

Message:

Modify HCustomImage to accept images which do not have a UUID

File:

• trunk/src/VBox/Main/HardDiskImpl.cpp (modified) (2 diffs)

trunk/src/VBox/Main/HardDiskImpl.cpp

@@ -4935 +4935 @@
 
         vrc = VDGetUuid (mContainer, 0, id.ptr());
-        if (VBOX_FAILURE (vrc))
+        if (VBOX_FAILURE (vrc) && vrc != VERR_NOT_SUPPORTED)
             break;
-        vrc = VDGetParentUuid (mContainer, 0, parentId.ptr());
-        if (VBOX_FAILURE (vrc))
-            break;
 
         if (!mId.isEmpty())
         {
             /* check that the actual UUID of the image matches the stored UUID */
-            if (mId != id)
+            if (VBOX_SUCCESS(vrc) && (mId != id))
             {
                 errMsg = Utf8StrFmt (
@@ -4955 +4952 @@
         else
         {
-            /* assgn an UUID read from the image file */
-            mId = id;
-        }
+            /* assign an UUID read from the image file */
+            if (VBOX_SUCCESS(vrc))
+                mId = id;
+            else
+            {
+                /* Create a UUID on our own. */
+                vrc = RTUuidCreate(mId.ptr());
+                if (VBOX_FAILURE(vrc))
+                    break;
+            }
+        }
+
+
+        vrc = VDGetParentUuid (mContainer, 0, parentId.ptr());
+        if (VBOX_FAILURE (vrc))
+            break;
 
         if (mParent)