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

Timestamp:

Jun 9, 2008 10:12:30 AM (17 years ago)

Author:

vboxsync

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

31806

Message:

fixes in setparentuuid and read/write to support diff images.

Location:

trunk/src/VBox/Devices/Storage

Files:

• VBoxHDD-new.cpp (modified) (1 diff)
• VDIHDDCore.cpp (modified) (1 diff)
• VmdkHDDCore.cpp (modified) (1 diff)
• testcase/tstVD.cpp (modified) (8 diffs)

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

@@ -1484 +1484 @@
         pImage->uOpenFlags = uOpenFlags & VD_OPEN_FLAGS_HONOR_SAME;
         rc = pImage->Backend->pfnCreate(pImage->pszFilename,
-                                        VD_IMAGE_TYPE_NORMAL, pDisk->cbSize,
+                                        VD_IMAGE_TYPE_DIFF, pDisk->cbSize,
                                         uImageFlags, pszComment,
                                         &pDisk->PCHSGeometry,

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

@@ -812 +812 @@
     if (   !VALID_PTR(pszFilename)
         || !*pszFilename
-        || (enmType != VD_IMAGE_TYPE_NORMAL && enmType != VD_IMAGE_TYPE_FIXED)
+        || (enmType != VD_IMAGE_TYPE_NORMAL && enmType != VD_IMAGE_TYPE_FIXED
+            && enmType != VD_IMAGE_TYPE_DIFF)
         || cbSize < VDI_IMAGE_DEFAULT_BLOCK_SIZE
         || !VALID_PTR(pPCHSGeometry)

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

@@ -3588 +3588 @@
         goto out;
     }
+
+    /* @todo A quick hack to support differencing images in VMDK. */
+    if (enmType == VD_IMAGE_TYPE_DIFF)
+        enmType = VD_IMAGE_TYPE_NORMAL;
 
     /* Check remaining arguments. */

trunk/src/VBox/Devices/Storage/testcase/tstVD.cpp

@@ -393 +393 @@
                 if (((uint8_t*)pvBuf)[i] != pSegment->u8Value)
                 {
-                    RTPrintf("ERROR: Segment at %Lx of %d bytes is corrupt at offset %x (found %x instead of %x)\n",
+                    RTPrintf("ERROR: Segment at %Lx of %x bytes is corrupt at offset %x (found %x instead of %x)\n",
                              pSegment->u64Offset, pSegment->u32Length, i, ((uint8_t*)pvBuf)[i],
                              pSegment->u8Value);
-                    RTLogPrintf("ERROR: Segment at %Lx of %d bytes is corrupt at offset %x (found %x instead of %x)\n",
+                    RTLogPrintf("ERROR: Segment at %Lx of %x bytes is corrupt at offset %x (found %x instead of %x)\n",
                              pSegment->u64Offset, pSegment->u32Length, i, ((uint8_t*)pvBuf)[i],
                              pSegment->u8Value);
@@ -476 +476 @@
     generateRandomSegments(&ctx, paDiffSegments, nSegments, _1M, u64DiskSize, u32SectorSize, 128u, 255u);
 
-    /*PSEGMENT pSegment;
-    RTPrintf("Base segments:\n");
+    PSEGMENT pSegment;
+    /*RTPrintf("Base segments:\n");
     for (pSegment = paBaseSegments; pSegment->u32Length; pSegment++)
-        RTPrintf("off: %08Lx len: %04x val: %02x\n", pSegment->u64Offset, pSegment->u32Length, pSegment->u8Value);*/
+        RTPrintf("off: %08Lx len: %05x val: %02x\n", pSegment->u64Offset, pSegment->u32Length, pSegment->u8Value);*/
     writeSegmentsToDisk(pVD, pvBuf, paBaseSegments);
 
@@ -489 +489 @@
     /*RTPrintf("\nDiff segments:\n");
     for (pSegment = paDiffSegments; pSegment->u32Length; pSegment++)
-        RTPrintf("off: %08Lx len: %04x val: %02x\n", pSegment->u64Offset, pSegment->u32Length, pSegment->u8Value);*/
+        RTPrintf("off: %08Lx len: %05x val: %02x\n", pSegment->u64Offset, pSegment->u32Length, pSegment->u8Value);*/
     writeSegmentsToDisk(pVD, pvBuf, paDiffSegments);
 
@@ -501 +501 @@
     /*RTPrintf("\nMerged segments:\n");
     for (pSegment = paMergeSegments; pSegment->u32Length; pSegment++)
-        RTPrintf("off: %08Lx len: %04x val: %02x\n", pSegment->u64Offset, pSegment->u32Length, pSegment->u8Value);*/
+        RTPrintf("off: %08Lx len: %05x val: %02x\n", pSegment->u64Offset, pSegment->u32Length, pSegment->u8Value);*/
     rc = readAndCompareSegments(pVD, pvBuf, paMergeSegments);
     CHECK("readAndCompareSegments()");
@@ -565 +565 @@
     initializeRandomGenerator(&ctx, u32Seed);
     generateRandomSegments(&ctx, paSegments, nSegments, _1M, u64DiskSize, u32SectorSize, 0u, 127u);
+    /*for (PSEGMENT pSegment = paSegments; pSegment->u32Length; pSegment++)
+        RTPrintf("off: %08Lx len: %05x val: %02x\n", pSegment->u64Offset, pSegment->u32Length, pSegment->u8Value);*/
 
     writeSegmentsToDisk(pVD, pvBuf, paSegments);
@@ -611 +613 @@
     RTFileDelete("tmpVDBase.vhd");
     RTFileDelete("tmpVDDiff.vhd");
-
+#if 1
     rc = tstVDCreateDelete("VDI", "tmpVDCreate.vdi", 2 * _4G,
                            VD_IMAGE_TYPE_NORMAL, VD_IMAGE_FLAGS_NONE,
@@ -708 +710 @@
         g_cErrors++;
     }
-#if 0
+#endif
+
     rc = tstVDOpenCreateWriteMerge("VHD", "tmpVDBase.vhd", "tmpVDDiff.vhd", u32Seed);
     if (VBOX_FAILURE(rc))
@@ -715 +718 @@
         g_cErrors++;
     }
-#endif
+
     /*
      * Clean up any leftovers.