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

Timestamp:

Apr 27, 2009 9:51:03 AM (16 years ago)

Author:

vboxsync

Message:

Storage/VDI: fix several bugs with compaction, deal with images which have no allocated data blocks, get the same block detection right and terminate the loop searching for a block to move into a bubble

File:

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

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

@@ -1892 +1892 @@
         AssertRCBreak(rc);
         unsigned cBlocksAllocated = (unsigned)((cbFile - pImage->offStartData - pImage->offStartBlockData) >> pImage->uShiftOffset2Index);
+        if (cBlocksAllocated == 0)
+        {
+            /* No data blocks in this image, no need to compact. */
+            rc = VINF_SUCCESS;
+            break;
+        }
 
         /* Allocate block array for back resolving. */
@@ -1965 +1971 @@
                     if (RT_FAILURE(rc))
                         break;
-                    if (memcmp(pvTmp, pvBuf, cbBlock))
+                    if (!memcmp(pvTmp, pvBuf, cbBlock))
                     {
                         pImage->paBlocks[i] = VDI_IMAGE_BLOCK_FREE;
@@ -1998 +2004 @@
             if (uBlock == VDI_IMAGE_BLOCK_FREE)
             {
-                unsigned uBlockData;
-                do {
+                unsigned uBlockData = VDI_IMAGE_BLOCK_FREE;
+                while (uBlockUsedPos > i && uBlockData == VDI_IMAGE_BLOCK_FREE)
+                {
                     uBlockUsedPos--;
                     uBlockData = paBlocks2[uBlockUsedPos];
-                } while (uBlockUsedPos > i && uBlockData == VDI_IMAGE_BLOCK_FREE);
+                }
                 /* Terminate early if there is no block which needs copying. */
                 if (uBlockUsedPos == i)