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

Timestamp:

May 14, 2009 10:20:15 AM (16 years ago)

Author:

vboxsync

Message:

.vhd: nitpicking, logging fixes

File:

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

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

@@ -36 +36 @@
 #include <iprt/string.h>
 #include <iprt/rand.h>
+#include <iprt/stream.h>
 
 #define VHD_RELATIVE_MAX_PATH 512
@@ -41 +42 @@
 
 #define VHD_SECTOR_SIZE 512
-#define VHD_BLOCK_SIZE  0x00200000
+#define VHD_BLOCK_SIZE  (2 * _1M)
 
 /* This is common to all VHD disk types and is located at the end of the image */
 #pragma pack(1)
-typedef struct VHDFooter {
+typedef struct VHDFooter
+{
     char     Cookie[8];
     uint32_t Features;
@@ -325 +327 @@
     }
     rc = RTFileWriteAt(pImage->File, RT_BE2H_U64(pLocator->u64DataOffset), pvBuf,
-        RT_BE2H_U32(pLocator->u32DataSpace) * VHD_SECTOR_SIZE, NULL);
+                       RT_BE2H_U32(pLocator->u32DataSpace) * VHD_SECTOR_SIZE, NULL);
 
 out:
@@ -348 +350 @@
         return rc;
     if (memcmp(ddh.Cookie, VHD_DYNAMIC_DISK_HEADER_COOKIE, VHD_DYNAMIC_DISK_HEADER_COOKIE_SIZE) != 0)
-    {
         return VERR_VD_VHD_INVALID_HEADER;
-    }
+
     uint32_t u32Checksum = RT_BE2H_U32(ddh.Checksum);
     ddh.Checksum = 0;
     if (u32Checksum != vhdChecksum(&ddh, sizeof(ddh)))
-    {
         return VERR_VD_VHD_INVALID_HEADER;
-    }
+
     /* Update parent's timestamp. */
     ddh.ParentTimeStamp = RT_H2BE_U32(pImage->u32ParentTimeStamp);
@@ -420 +420 @@
 
     rc = RTFileReadAt(File, pImage->uCurrentEndOfFile, &vhdFooter, sizeof(VHDFooter), NULL);
-    if (memcmp(vhdFooter.Cookie, VHD_FOOTER_COOKIE, VHD_FOOTER_COOKIE_SIZE) != 0) {
+    if (memcmp(vhdFooter.Cookie, VHD_FOOTER_COOKIE, VHD_FOOTER_COOKIE_SIZE) != 0)
         return VERR_VD_VHD_INVALID_HEADER;
-    }
 
     switch (RT_BE2H_U32(vhdFooter.DiskType))
@@ -526 +525 @@
     pImage->cBlockAllocationTableEntries = RT_BE2H_U32(vhdDynamicDiskHeader.MaxTableEntries);
     LogFlowFunc(("MaxTableEntries=%lu\n", pImage->cBlockAllocationTableEntries));
-    AssertMsg(!(pImage->cbDataBlock % 512), ("%s: Data block size is not a multiple of 512!!\n", __FUNCTION__));
-
-    pImage->cSectorsPerDataBlock = pImage->cbDataBlock / 512;
+    AssertMsg(!(pImage->cbDataBlock % VHD_SECTOR_SIZE), ("%s: Data block size is not a multiple of %!\n", __FUNCTION__, VHD_SECTOR_SIZE));
+
+    pImage->cSectorsPerDataBlock = pImage->cbDataBlock / VHD_SECTOR_SIZE;
     LogFlowFunc(("SectorsPerDataBlock=%u\n", pImage->cSectorsPerDataBlock));
 
@@ -536 +535 @@
      */
     pImage->cbDataBlockBitmap = pImage->cSectorsPerDataBlock / 8;
-    pImage->cDataBlockBitmapSectors = pImage->cbDataBlockBitmap / 512;
+    pImage->cDataBlockBitmapSectors = pImage->cbDataBlockBitmap / VHD_SECTOR_SIZE;
     LogFlowFunc(("cbDataBlockBitmap=%u\n", pImage->cbDataBlockBitmap));
 
@@ -566 +565 @@
 
     for (i = 0; i < pImage->cBlockAllocationTableEntries; i++)
-    {
         pImage->pBlockAllocationTable[i] = RT_BE2H_U32(pBlockAllocationTable[i]);
-    }
 
     RTMemFree(pBlockAllocationTable);
@@ -747 +744 @@
         uOpenFlags = 0;
 
-    LogFlowFunc(("returned %d\n", uOpenFlags));
+    LogFlowFunc(("returned %#x\n", uOpenFlags));
     return uOpenFlags;
 }
@@ -849 +846 @@
     /* Freeing a never allocated image (e.g. because the open failed) is
      * not signalled as an error. After all nothing bad happens. */
-    if (pImage) {
+    if (pImage)
+    {
         vhdFlush(pImage);
         RTFileClose(pImage->File);
@@ -866 +864 @@
     /* Freeing a never allocated image (e.g. because the open failed) is
      * not signalled as an error. After all nothing bad happens. */
-    if (pImage) {
+    if (pImage)
+    {
         if (fDelete)
         {
@@ -900 +899 @@
          * Get the data block first.
          */
-        uint32_t cBlockAllocationTableEntry = (uOffset / 512) / pImage->cSectorsPerDataBlock;
-        uint32_t cBATEntryIndex = (uOffset / 512) % pImage->cSectorsPerDataBlock;
+        uint32_t cBlockAllocationTableEntry = (uOffset / VHD_SECTOR_SIZE) / pImage->cSectorsPerDataBlock;
+        uint32_t cBATEntryIndex = (uOffset / VHD_SECTOR_SIZE) % pImage->cSectorsPerDataBlock;
         uint64_t uVhdOffset;
 
@@ -917 +916 @@
         }
 
-        uVhdOffset = ((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry] + pImage->cDataBlockBitmapSectors + cBATEntryIndex) * 512;
+        uVhdOffset = ((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry] + pImage->cDataBlockBitmapSectors + cBATEntryIndex) * VHD_SECTOR_SIZE;
         LogFlowFunc(("uVhdOffset=%llu cbRead=%u\n", uVhdOffset, cbRead));
 
@@ -923 +922 @@
          * Clip read range to remain in this data block.
          */
-        cbRead = RT_MIN(cbRead, (pImage->cbDataBlock - (cBATEntryIndex * 512)));
+        cbRead = RT_MIN(cbRead, (pImage->cbDataBlock - (cBATEntryIndex * VHD_SECTOR_SIZE)));
 
         /* Read in the block's bitmap. */
         rc = RTFileReadAt(pImage->File,
-            ((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry]) * VHD_SECTOR_SIZE,
-            pImage->pu8Bitmap, pImage->cbDataBlockBitmap, NULL);
+                          ((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry]) * VHD_SECTOR_SIZE,
+                          pImage->pu8Bitmap, pImage->cbDataBlockBitmap, NULL);
         if (RT_SUCCESS(rc))
         {
@@ -1026 +1025 @@
 
     LogFlowFunc(("pBackendData=%p uOffset=%llu pvBuf=%p cbToWrite=%u pcbWriteProcess=%p pcbPreRead=%p pcbPostRead=%p fWrite=%u\n",
-             pBackendData, uOffset, pvBuf, cbToWrite, pcbPreRead, pcbPostRead, fWrite));
-
-    AssertPtr(pImage);
-    Assert(uOffset % 512 == 0);
-    Assert(cbToWrite % 512 == 0);
+             pBackendData, uOffset, pvBuf, cbToWrite, pcbWriteProcess, pcbPreRead, pcbPostRead, fWrite));
+
+    AssertPtr(pImage);
+    Assert(uOffset % VHD_SECTOR_SIZE == 0);
+    Assert(cbToWrite % VHD_SECTOR_SIZE == 0);
 
     if (pImage->pBlockAllocationTable)
@@ -1037 +1036 @@
          * Get the data block first.
          */
-        uint32_t cSector = uOffset / 512;
+        uint32_t cSector = uOffset / VHD_SECTOR_SIZE;
         uint32_t cBlockAllocationTableEntry = cSector / pImage->cSectorsPerDataBlock;
         uint32_t cBATEntryIndex = cSector % pImage->cSectorsPerDataBlock;
@@ -1066 +1065 @@
              * Set the new end of the file and link the new block into the BAT.
              */
-            pImage->pBlockAllocationTable[cBlockAllocationTableEntry] = pImage->uCurrentEndOfFile / 512;
+            pImage->pBlockAllocationTable[cBlockAllocationTableEntry] = pImage->uCurrentEndOfFile / VHD_SECTOR_SIZE;
             pImage->uCurrentEndOfFile += cbNewBlock;
             RTMemFree(pNewBlock);
@@ -1074 +1073 @@
          * Calculate the real offset in the file.
          */
-        uVhdOffset = ((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry] + pImage->cDataBlockBitmapSectors + cBATEntryIndex) * 512;
+        uVhdOffset = ((uint64_t)pImage->pBlockAllocationTable[cBlockAllocationTableEntry] + pImage->cDataBlockBitmapSectors + cBATEntryIndex) * VHD_SECTOR_SIZE;
 
         /*
          * Clip write range.
          */
-        cbToWrite = RT_MIN(cbToWrite, (pImage->cbDataBlock - (cBATEntryIndex * 512)));
+        cbToWrite = RT_MIN(cbToWrite, (pImage->cbDataBlock - (cBATEntryIndex * VHD_SECTOR_SIZE)));
         RTFileWriteAt(pImage->File, uVhdOffset, pvBuf, cbToWrite, NULL);
 
@@ -1142 +1141 @@
          * The BAT entries have to be stored in big endian format.
          */
-        unsigned i = 0;
-        for (i = 0; i < pImage->cBlockAllocationTableEntries; i++)
-        {
+        for (unsigned i = 0; i < pImage->cBlockAllocationTableEntries; i++)
             pBlockAllocationTableToWrite[i] = RT_H2BE_U32(pImage->pBlockAllocationTable[i]);
-        }
 
         /*
@@ -1390 +1386 @@
 static void vhdSetDiskGeometry(PVHDIMAGE pImage, uint64_t cbSize)
 {
-    uint64_t u64TotalSectors = cbSize / 512;
+    uint64_t u64TotalSectors = cbSize / VHD_SECTOR_SIZE;
     uint32_t u32CylinderTimesHeads, u32Heads, u32SectorsPerTrack;