Changeset 48851 in vbox for trunk

Timestamp:

Oct 3, 2013 8:02:34 PM (11 years ago)

Author:

vboxsync

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

89520

Message:

Storage: Addressing 64-bit windows warnings.

Location:

trunk/src/VBox/Storage

Files:

• ISCSI.cpp (modified) (1 diff)
• QCOW.cpp (modified) (1 diff)
• QED.cpp (modified) (1 diff)
• VDI.cpp (modified) (2 diffs)
• VHD.cpp (modified) (1 diff)
• VHDX.cpp (modified) (4 diffs)
• VMDK.cpp (modified) (2 diffs)

trunk/src/VBox/Storage/ISCSI.cpp

@@ -2683 +2683 @@
     paReqBHS[3] = RT_H2N_U32(pImage->LUN & 0xffffffff);
     paReqBHS[4] = pIScsiCmd->Itt;
-    paReqBHS[5] = RT_H2N_U32(cbData);
+    paReqBHS[5] = RT_H2N_U32((uint32_t)cbData); Assert((uint32_t)cbData == cbData);
     paReqBHS[6] = RT_H2N_U32(pImage->CmdSN);
     paReqBHS[7] = RT_H2N_U32(pImage->ExpStatSN);

trunk/src/VBox/Storage/QCOW.cpp

@@ -2438 +2438 @@
                     Assert((offData & UINT32_MAX) == offData);
                     pImage->offBackingFilename = (uint32_t)offData;
-                    pImage->cbBackingFilename  = strlen(pszParentFilename);
+                    pImage->cbBackingFilename  = (uint32_t)strlen(pszParentFilename);
                     rc = vdIfIoIntFileSetSize(pImage->pIfIo, pImage->pStorage,
                                               offData + pImage->cbCluster);

trunk/src/VBox/Storage/QED.cpp

@@ -2526 +2526 @@
                     Assert((offData & UINT32_MAX) == offData);
                     pImage->offBackingFilename = (uint32_t)offData;
-                    pImage->cbBackingFilename  = strlen(pszParentFilename);
+                    pImage->cbBackingFilename  = (uint32_t)strlen(pszParentFilename);
                     rc = vdIfIoIntFileSetSize(pImage->pIfIo, pImage->pStorage,
                                               offData + pImage->cbCluster);

trunk/src/VBox/Storage/VDI.cpp

@@ -1240 +1240 @@
 static void *vdiAllocationBitmapCreate(void *pvData, size_t cbData)
 {
-    unsigned cSectors = cbData / 512;
-    unsigned uSectorCur = 0;
+    Assert(cbData <= UINT32_MAX / 8);
+    uint32_t cSectors = (uint32_t)(cbData / 512);
+    uint32_t uSectorCur = 0;
     void *pbmAllocationBitmap = NULL;
 
@@ -1253 +1254 @@
     while (uSectorCur < cSectors)
     {
-        int idxSet = ASMBitFirstSet((uint8_t *)pvData + uSectorCur * 512, cbData * 8);
+        int idxSet = ASMBitFirstSet((uint8_t *)pvData + uSectorCur * 512, (uint32_t)cbData * 8);
 
         if (idxSet != -1)

trunk/src/VBox/Storage/VHD.cpp

@@ -3086 +3086 @@
 
                     if (   paBat[i] != UINT32_C(0xffffffff)
-                        && ASMBitTestAndSet(pu32BlockBitmap, (paBat[i] - idxMinBlock) / (cbBlock / VHD_SECTOR_SIZE)))
+                        && ASMBitTestAndSet(pu32BlockBitmap, (uint32_t)((paBat[i] - idxMinBlock) / (cbBlock / VHD_SECTOR_SIZE))))
                     {
                         vdIfErrorMessage(pIfError, "Entry %u points to an already referenced data block, clearing\n",

trunk/src/VBox/Storage/VHDX.cpp

@@ -511 +511 @@
 {
     /** Image name. */
-    const char          *pszFilename;
+    const char         *pszFilename;
     /** Storage handle. */
-    PVDIOSTORAGE         pStorage;
+    PVDIOSTORAGE        pStorage;
 
     /** Pointer to the per-disk VD interface list. */
-    PVDINTERFACE         pVDIfsDisk;
+    PVDINTERFACE        pVDIfsDisk;
     /** Pointer to the per-image VD interface list. */
-    PVDINTERFACE         pVDIfsImage;
+    PVDINTERFACE        pVDIfsImage;
     /** Error interface. */
-    PVDINTERFACEERROR    pIfError;
+    PVDINTERFACEERROR   pIfError;
     /** I/O interface. */
-    PVDINTERFACEIOINT    pIfIo;
+    PVDINTERFACEIOINT   pIfIo;
 
     /** Open flags passed by VBoxHD layer. */
-    unsigned             uOpenFlags;
+    unsigned            uOpenFlags;
     /** Image flags defined during creation or determined during open. */
-    unsigned             uImageFlags;
+    unsigned            uImageFlags;
     /** Version of the VHDX image format. */
-    unsigned             uVersion;
+    unsigned            uVersion;
     /** Total size of the image. */
-    uint64_t             cbSize;
+    uint64_t            cbSize;
     /** Logical sector size of the image. */
-    size_t               cbLogicalSector;
+    uint32_t            cbLogicalSector;
     /** Block size of the image. */
-    size_t               cbBlock;
+    size_t              cbBlock;
     /** Physical geometry of this image. */
-    VDGEOMETRY           PCHSGeometry;
+    VDGEOMETRY          PCHSGeometry;
     /** Logical geometry of this image. */
-    VDGEOMETRY           LCHSGeometry;
+    VDGEOMETRY          LCHSGeometry;
 
     /** The BAT. */
-    PVhdxBatEntry        paBat;
+    PVhdxBatEntry       paBat;
     /** Chunk ratio. */
-    uint32_t             uChunkRatio;
+    uint32_t            uChunkRatio;
 
 } VHDXIMAGE, *PVHDXIMAGE;
@@ -1144 +1144 @@
 
     /* Calculate required values first. */
-    uChunkRatio = (RT_BIT_64(23) * pImage->cbLogicalSector) / pImage->cbBlock;
-    cDataBlocks = pImage->cbSize / pImage->cbBlock;
+    uint64_t uChunkRatio64 = (RT_BIT_64(23) * pImage->cbLogicalSector) / pImage->cbBlock;
+    uChunkRatio = (uint32_t)uChunkRatio64; Assert(uChunkRatio == uChunkRatio64);
+    uint64_t cDataBlocks64 = pImage->cbSize / pImage->cbBlock;
+    cDataBlocks = (uint32_t)cDataBlocks64; Assert(cDataBlocks == cDataBlocks64);
+
     if (pImage->cbSize % pImage->cbBlock)
         cDataBlocks++;
@@ -1895 +1898 @@
     else
     {
-        uint32_t idxBat = uOffset / pImage->cbBlock;
+        uint32_t idxBat = (uint32_t)(uOffset / pImage->cbBlock); Assert(idxBat == uOffset / pImage->cbBlock);
         uint32_t offRead = uOffset % pImage->cbBlock;
         uint64_t uBatEntry;
@@ -2419 +2422 @@
     if (pImage)
     {
-        vdIfErrorMessage(pImage->pIfError, "Header: Geometry PCHS=%u/%u/%u LCHS=%u/%u/%u cbSector=%zu\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

@@ -1035 +1035 @@
 {
     int rc = VINF_SUCCESS;
-    unsigned i;
+    size_t i;
     uint32_t *pGDTmp, *pRGDTmp;
     size_t cbGD = pExtent->cGDEntries * sizeof(uint32_t);
@@ -2351 +2351 @@
     size_t cbDescriptor = cbLimit ? cbLimit : 4 * _1K;
     char *pszDescriptor = (char *)RTMemAllocZ(cbDescriptor);
-    unsigned offDescriptor = 0;
+    size_t offDescriptor = 0;
 
     if (!pszDescriptor)