Changeset 15566 in vbox for trunk/src/VBox/Devices/Storage/VBoxHDD-new.cpp

Timestamp:

Dec 16, 2008 9:46:22 AM (16 years ago)

Author:

vboxsync

Message:

Storage/VBoxHDD-new: eradicate copy/paste bug in VDCopy, the UUIDs need to go into the destination image of course.

File:

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

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

@@ -46 +46 @@
 
 /** Buffer size used for merging images. */
-#define VD_MERGE_BUFFER_SIZE    (1024 * 1024)
+#define VD_MERGE_BUFFER_SIZE    (16 * _1M)
 
 /**
@@ -1971 +1971 @@
             rc = pImageFrom->Backend->pfnGetUuid(pImageFrom->pvBackendData, &ImageUuid);
             if (RT_FAILURE(rc))
-                RTUuidClear(&ImageUuid);
+                RTUuidCreate(&ImageUuid);
         }
         rc = pImageFrom->Backend->pfnGetModificationUuid(pImageFrom->pvBackendData, &ImageModificationUuid);
@@ -2007 +2007 @@
                               NULL, uOpenFlagsFrom & ~VD_OPEN_FLAGS_READONLY, NULL, NULL);
             if (!RTUuidIsNull(&ImageUuid))
-                 pImageFrom->Backend->pfnSetUuid(pImageFrom->pvBackendData, &ImageUuid);
+                 pDiskTo->pLast->Backend->pfnSetUuid(pDiskTo->pLast->pvBackendData, &ImageUuid);
         }
         if (RT_FAILURE(rc))
@@ -2064 +2064 @@
         if (RT_SUCCESS(rc))
         {
-            pImageFrom->Backend->pfnSetModificationUuid(pImageFrom->pvBackendData, &ImageModificationUuid);
-            pImageFrom->Backend->pfnGetParentUuid(pImageFrom->pvBackendData, &ParentUuid);
-            pImageFrom->Backend->pfnGetParentModificationUuid(pImageFrom->pvBackendData, &ParentModificationUuid);
+            pImageTo->Backend->pfnSetModificationUuid(pImageTo->pvBackendData, &ImageModificationUuid);
+            pImageTo->Backend->pfnGetParentUuid(pImageTo->pvBackendData, &ParentUuid);
+            pImageTo->Backend->pfnGetParentModificationUuid(pImageTo->pvBackendData, &ParentModificationUuid);
         }
     } while (0);