儲存庫 vbox 的更動 40843

時間撮記:

2012-4-10 上午08:53:19 (13 年 以前)

作者:

vboxsync

訊息:

Storage: Miscellaneous bug fixes to make the library work on big endian machines

位置:

trunk/src/VBox/Storage

檔案:

• QED.cpp (修改) (2 筆差異)
• VCICache.cpp (修改) (3 筆差異)
• VHD.cpp (修改) (1 筆差異)
• VMDK.cpp (修改) (3 筆差異)

trunk/src/VBox/Storage/QED.cpp

@@ -94 +94 @@
  */
 /** Image uses a backing file to provide data for unallocated clusters. */
-#define QED_FEATURE_BACKING_FILE             RT_BIT(0)
+#define QED_FEATURE_BACKING_FILE             RT_BIT_64(0)
 /** Image needs checking before use. */
-#define QED_FEATURE_NEED_CHECK               RT_BIT(1)
+#define QED_FEATURE_NEED_CHECK               RT_BIT_64(1)
 /** Don't probe for format of the backing file, treat as raw image. */
-#define QED_FEATURE_BACKING_FILE_NO_PROBE    RT_BIT(2)
+#define QED_FEATURE_BACKING_FILE_NO_PROBE    RT_BIT_64(2)
 /** Mask of valid features. */
 #define QED_FEATURE_MASK (QED_FEATURE_BACKING_FILE | QED_FEATURE_NEED_CHECK | QED_FEATURE_BACKING_FILE_NO_PROBE)
@@ -313 +313 @@
     pHeader->u32TableSize             = RT_H2LE_U32(pImage->cbTable / pImage->cbCluster);
     pHeader->u32HeaderSize            = RT_H2LE_U32(1);
-    pHeader->u64FeatureFlags          = RT_H2LE_U64(pImage->pszBackingFilename ? QED_FEATURE_BACKING_FILE : 0);
-    pHeader->u64CompatFeatureFlags    = RT_H2LE_U64(0);
-    pHeader->u64AutoresetFeatureFlags = RT_H2LE_U64(0);
+    pHeader->u64FeatureFlags          = RT_H2LE_U64(pImage->pszBackingFilename ? QED_FEATURE_BACKING_FILE : UINT64_C(0));
+    pHeader->u64CompatFeatureFlags    = RT_H2LE_U64(UINT64_C(0));
+    pHeader->u64AutoresetFeatureFlags = RT_H2LE_U64(UINT64_C(0));
     pHeader->u64OffL1Table            = RT_H2LE_U64(pImage->offL1Table);
     pHeader->u64Size                  = RT_H2LE_U64(pImage->cbSize);

trunk/src/VBox/Storage/VCICache.cpp

@@ -1242 +1242 @@
     Hdr.offTreeRoot  = RT_LE2H_U64(Hdr.offTreeRoot);
     Hdr.offBlkMap    = RT_LE2H_U64(Hdr.offBlkMap);
-    Hdr.cBlkMap      = RT_LE2H_U64(Hdr.cBlkMap);
+    Hdr.cBlkMap      = RT_LE2H_U32(Hdr.cBlkMap);
 
     if (   Hdr.u32Signature == VCI_HDR_SIGNATURE
@@ -1391 +1391 @@
         Hdr.offTreeRoot      = RT_H2LE_U64(offTreeRoot);
         Hdr.offBlkMap        = RT_H2LE_U64(offBlkMap);
-        Hdr.cBlkMap          = RT_H2LE_U64(cBlkMap);
+        Hdr.cBlkMap          = RT_H2LE_U32(cBlkMap);
 
         rc = vdIfIoIntFileWriteSync(pCache->pIfIo, pCache->pStorage, offHdr, &Hdr,
@@ -1480 +1480 @@
     Hdr.offTreeRoot  = RT_LE2H_U64(Hdr.offTreeRoot);
     Hdr.offBlkMap    = RT_LE2H_U64(Hdr.offBlkMap);
-    Hdr.cBlkMap      = RT_LE2H_U64(Hdr.cBlkMap);
+    Hdr.cBlkMap      = RT_LE2H_U32(Hdr.cBlkMap);
 
     if (   Hdr.u32Signature == VCI_HDR_SIGNATURE

trunk/src/VBox/Storage/VHD.cpp

@@ -2144 +2144 @@
     if (pImage)
     {
-        vdIfErrorMessage(pImage->pIfError, "Header: Geometry PCHS=%u/%u/%u LCHS=%u/%u/%u cbSector=%llu\n",
+        vdIfErrorMessage(pImage->pIfError, "Header: Geometry PCHS=%u/%u/%u LCHS=%u/%u/%u cbSector=%u\n",
                          pImage->PCHSGeometry.cCylinders, pImage->PCHSGeometry.cHeads, pImage->PCHSGeometry.cSectors,
                          pImage->LCHSGeometry.cCylinders, pImage->LCHSGeometry.cHeads, pImage->LCHSGeometry.cSectors,

trunk/src/VBox/Storage/VMDK.cpp

@@ -2525 +2525 @@
         goto out;
 
-    if (    RT_LE2H_U32(Header.flags & RT_BIT(17))
+    if (    (RT_LE2H_U32(Header.flags) & RT_BIT(17))
         &&  RT_LE2H_U64(Header.gdOffset) == VMDK_GD_AT_END)
         pExtent->fFooter = true;
@@ -4233 +4233 @@
     PVMDKMARKER pMarker = (PVMDKMARKER)&aMarker[0];
     memset(pMarker, '\0', sizeof(aMarker));
-    pMarker->uSector = RT_H2LE_U64(VMDK_BYTE2SECTOR(pExtent->cGTEntries * sizeof(uint32_t)));
+    pMarker->uSector = RT_H2LE_U64(VMDK_BYTE2SECTOR((uint64_t)pExtent->cGTEntries * sizeof(uint32_t)));
     pMarker->uType = RT_H2LE_U32(VMDK_MARKER_GT);
     rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage, uFileOffset,
@@ -4341 +4341 @@
                 PVMDKMARKER pMarker = (PVMDKMARKER)&aMarker[0];
                 memset(pMarker, '\0', sizeof(aMarker));
-                pMarker->uSector = VMDK_BYTE2SECTOR(RT_ALIGN_64(RT_H2LE_U64(pExtent->cGDEntries * sizeof(uint32_t)), 512));
+                pMarker->uSector = VMDK_BYTE2SECTOR(RT_ALIGN_64(RT_H2LE_U64((uint64_t)pExtent->cGDEntries * sizeof(uint32_t)), 512));
                 pMarker->uType = RT_H2LE_U32(VMDK_MARKER_GD);
                 rc = vdIfIoIntFileWriteSync(pImage->pIfIo, pExtent->pFile->pStorage, uFileOffset,