Changeset 13571 in vbox

Timestamp:

Oct 26, 2008 10:02:50 PM (16 years ago)

Author:

vboxsync

Message:

VHD: Backout r38444. Caused another problem and #3263 will be fixed in another way.

File:

• trunk/src/VBox/Devices/Storage/VHDHDDCore.cpp (modified) (10 diffs)

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

@@ -879 +879 @@
          * Get the data block first.
          */
-        uint64_t uOffsetSectorAligned       = uOffset & ~0x1ff;
-        uint32_t cbOffsetDifference         = uOffset - uOffsetSectorAligned;
-        uint32_t cBlockAllocationTableEntry = (uOffsetSectorAligned / VHD_SECTOR_SIZE) / pImage->cSectorsPerDataBlock;
-        uint32_t cSectorsToRead             = (cbRead / VHD_SECTOR_SIZE) + (cbOffsetDifference ? 1 : 0);
-        uint32_t cBATEntryIndex             = (uOffsetSectorAligned / VHD_SECTOR_SIZE) % pImage->cSectorsPerDataBlock;
+        uint32_t cBlockAllocationTableEntry = (uOffset / 512) / pImage->cSectorsPerDataBlock;
+        uint32_t cBATEntryIndex = (uOffset / 512) % pImage->cSectorsPerDataBlock;
         uint64_t uVhdOffset;
 
@@ -899 +896 @@
         }
 
-        uVhdOffset = (((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry] + pImage->cDataBlockBitmapSectors + cBATEntryIndex) * VHD_SECTOR_SIZE) + cbOffsetDifference;
+        uVhdOffset = ((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry] + pImage->cDataBlockBitmapSectors + cBATEntryIndex) * 512;
         Log(("%s: uVhdOffset=%llu cbRead=%u\n", __FUNCTION__, uVhdOffset, cbRead));
 
@@ -905 +902 @@
          * Clip read range to remain in this data block.
          */
-        cbRead = RT_MIN(cbRead, (pImage->cbDataBlock - (cBATEntryIndex * VHD_SECTOR_SIZE) - cbOffsetDifference));
+        cbRead = RT_MIN(cbRead, (pImage->cbDataBlock - (cBATEntryIndex * 512)));
 
         /* Read in the block's bitmap. */
@@ -947 +944 @@
 
                     iBATEntryIndexCurr++;
-                } while (cSectors < cSectorsToRead);
-
-                cbRead = RT_MIN(cbRead, cSectors * VHD_SECTOR_SIZE);
+                } while (cSectors < (cbRead / VHD_SECTOR_SIZE));
+
+                cbRead = cSectors * VHD_SECTOR_SIZE;
 
                 Log(("%s: uVhdOffset=%llu cbRead=%u\n", __FUNCTION__, uVhdOffset, cbRead));
@@ -977 +974 @@
 
                     iBATEntryIndexCurr++;
-                } while (cSectors < cSectorsToRead);
-
-                cbRead = RT_MIN(cbRead, cSectors * VHD_SECTOR_SIZE);
+                } while (cSectors < (cbRead / VHD_SECTOR_SIZE));
+
+                cbRead = cSectors * VHD_SECTOR_SIZE;
                 Log(("%s: Sectors free: uVhdOffset=%llu cbRead=%u\n", __FUNCTION__, uVhdOffset, cbRead));
                 rc = VERR_VDI_BLOCK_FREE;
@@ -1010 +1007 @@
              __FUNCTION__, pBackendData, uOffset, pvBuf, cbWrite, pcbPreRead, pcbPostRead, fWrite));
 
+    Assert(uOffset % 512 == 0);
+    Assert(cbWrite % 512 == 0);
+
     if (pImage->pBlockAllocationTable)
     {
@@ -1015 +1015 @@
          * Get the data block first.
          */
-        uint64_t uOffsetSectorAligned       = uOffset & ~0x1ff;
-        uint32_t cbOffsetDifference         = uOffset - uOffsetSectorAligned;
-        uint32_t cSector                    = uOffsetSectorAligned / VHD_SECTOR_SIZE;
-        uint32_t cSectorsToWrite            = (cbWrite / VHD_SECTOR_SIZE) + (cbOffsetDifference ? 1 : 0);
+        uint32_t cSector = uOffset / 512;
         uint32_t cBlockAllocationTableEntry = cSector / pImage->cSectorsPerDataBlock;
-        uint32_t cBATEntryIndex             = cSector % pImage->cSectorsPerDataBlock;
+        uint32_t cBATEntryIndex = cSector % pImage->cSectorsPerDataBlock;
         uint64_t uVhdOffset;
 
@@ -1043 +1040 @@
              * Set the new end of the file and link the new block into the BAT.
              */
-            pImage->pBlockAllocationTable[cBlockAllocationTableEntry] = pImage->uCurrentEndOfFile / VHD_SECTOR_SIZE;
+            pImage->pBlockAllocationTable[cBlockAllocationTableEntry] = pImage->uCurrentEndOfFile / 512;
             pImage->uCurrentEndOfFile += cbNewBlock;
             RTMemFree(pNewBlock);
@@ -1051 +1048 @@
          * Calculate the real offset in the file.
          */
-        uVhdOffset = (((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry] + pImage->cDataBlockBitmapSectors + cBATEntryIndex) * VHD_SECTOR_SIZE) + cbOffsetDifference;
+        uVhdOffset = ((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry] + pImage->cDataBlockBitmapSectors + cBATEntryIndex) * 512;
 
         /*
          * Clip write range.
          */
-        cbWrite = RT_MIN(cbWrite, (pImage->cbDataBlock - (cBATEntryIndex * VHD_SECTOR_SIZE) - cbOffsetDifference));
+        cbWrite = RT_MIN(cbWrite, (pImage->cbDataBlock - (cBATEntryIndex * 512)));
         RTFileWriteAt(pImage->File, uVhdOffset, pvBuf, cbWrite, NULL);
 
@@ -1066 +1063 @@
         {
             /* Set the bits for all sectors having been written. */
-            for (uint32_t iSector = 0; iSector < cSectorsToWrite; iSector++)
+            for (uint32_t iSector = 0; iSector < (cbWrite / VHD_SECTOR_SIZE); iSector++)
             {
                 uint32_t iBitmap    = cBATEntryIndex / 8; /* Byte in the block bitmap. */