Changeset 65485 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 27, 2017 2:22:36 PM (8 years ago)

Author:

vboxsync

Message:

DrvDiskIntegrity,DrvRamDisk: Build fixes after enabling them

Location:

trunk/src/VBox/Devices/Storage

Files:

• DrvDiskIntegrity.cpp (modified) (7 diffs)
• DrvRamDisk.cpp (modified) (1 diff)

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

@@ -309 +309 @@
                 pSeg->cbSeg         = cbRange;
                 pSeg->pbSeg         = (uint8_t *)RTMemAllocZ(cbRange);
-                pSeg->cIoLogEntries = cbRange / 512;
+                pSeg->cIoLogEntries = (uint32_t)cbRange / 512;
                 if (!pSeg->pbSeg)
                     RTMemFree(pSeg);
@@ -447 +447 @@
             {
                 /* Corrupted disk, print I/O log entry of the last write which accessed this range. */
-                uint32_t cSector = (offSeg + cbOff) / 512;
+                uint32_t cSector = (offSeg + (uint32_t)cbOff) / 512;
                 AssertMsg(cSector < pSeg->cIoLogEntries, ("Internal bug!\n"));
 
@@ -538 +538 @@
                     LogFlowFunc(("Realloc segment pSeg=%#p\n", pSeg));
                     pSeg->pbSeg = (uint8_t *)RTMemRealloc(pSeg->pbSeg, cbPreLeft);
-                    for (unsigned idx = cbPreLeft / 512; idx < pSeg->cIoLogEntries; idx++)
+                    for (unsigned idx = (uint32_t)(cbPreLeft / 512); idx < pSeg->cIoLogEntries; idx++)
                         drvdiskintIoLogEntryRelease(pSeg->apIoLog[idx]);
                     pSeg = (PDRVDISKSEGMENT)RTMemRealloc(pSeg, RT_OFFSETOF(DRVDISKSEGMENT, apIoLog[cbPreLeft / 512]));
                     pSeg->Core.KeyLast = pSeg->Core.Key + cbPreLeft - 1;
                     pSeg->cbSeg = cbPreLeft;
-                    pSeg->cIoLogEntries = cbPreLeft / 512;
+                    pSeg->cIoLogEntries = (uint32_t)(cbPreLeft / 512);
                     bool fInserted = RTAvlrFileOffsetInsert(pThis->pTreeSegments, &pSeg->Core);
                     Assert(fInserted); RT_NOREF(fInserted);
@@ -560 +560 @@
                     pSeg->Core.Key += cbRange;
                     pSeg->cbSeg = cbPostLeft;
-                    pSeg->cIoLogEntries = cbPostLeft / 512;
+                    pSeg->cIoLogEntries = (uint32_t)(cbPostLeft / 512);
                     bool fInserted = RTAvlrFileOffsetInsert(pThis->pTreeSegments, &pSeg->Core);
                     Assert(fInserted); RT_NOREF(fInserted);
@@ -575 +575 @@
                         pSegPost->cbSeg         = cbPostLeft;
                         pSegPost->pbSeg         = (uint8_t *)RTMemAllocZ(cbPostLeft);
-                        pSegPost->cIoLogEntries = cbPostLeft / 512;
+                        pSegPost->cIoLogEntries = (uint32_t)(cbPostLeft / 512);
                         if (!pSegPost->pbSeg)
                             RTMemFree(pSegPost);
@@ -581 +581 @@
                         {
                             memcpy(pSegPost->pbSeg, pSeg->pbSeg + cbPreLeft + cbRange, cbPostLeft);
-                            for (unsigned idx = 0; idx < cbPostLeft / 512; idx++)
+                            for (unsigned idx = 0; idx < (uint32_t)(cbPostLeft / 512); idx++)
                                 pSegPost->apIoLog[idx] = pSeg->apIoLog[((cbPreLeft + cbRange) / 512) + idx];
 
@@ -591 +591 @@
                     /* Shrink the current segment. */
                     pSeg->pbSeg = (uint8_t *)RTMemRealloc(pSeg->pbSeg, cbPreLeft);
-                    for (unsigned idx = cbPreLeft / 512; idx < (cbPreLeft + cbRange) / 512; idx++)
+                    for (unsigned idx = (uint32_t)(cbPreLeft / 512); idx < (uint32_t)((cbPreLeft + cbRange) / 512); idx++)
                         drvdiskintIoLogEntryRelease(pSeg->apIoLog[idx]);
                     pSeg = (PDRVDISKSEGMENT)RTMemRealloc(pSeg, RT_OFFSETOF(DRVDISKSEGMENT, apIoLog[cbPreLeft / 512]));
                     pSeg->Core.KeyLast = pSeg->Core.Key + cbPreLeft - 1;
                     pSeg->cbSeg = cbPreLeft;
-                    pSeg->cIoLogEntries = cbPreLeft / 512;
+                    pSeg->cIoLogEntries = (uint32_t)(cbPreLeft / 512);
                     bool fInserted = RTAvlrFileOffsetInsert(pThis->pTreeSegments, &pSeg->Core);
                     Assert(fInserted); RT_NOREF(fInserted);

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

@@ -703 +703 @@
     if (fToIoBuf)
         rc = pThis->pDrvMediaExPort->pfnIoReqCopyToBuf(pThis->pDrvMediaExPort, pIoReq, &pIoReq->abAlloc[0],
-                                                       pIoReq->ReadWrite.cbReq - pIoReq->ReadWrite.cbReqLeft,
+                                                       (uint32_t)(pIoReq->ReadWrite.cbReq - pIoReq->ReadWrite.cbReqLeft),
                                                        &pIoReq->ReadWrite.IoBuf.SgBuf,
                                                        RT_MIN(pIoReq->ReadWrite.cbIoBuf, pIoReq->ReadWrite.cbReqLeft));
     else
         rc = pThis->pDrvMediaExPort->pfnIoReqCopyFromBuf(pThis->pDrvMediaExPort, pIoReq, &pIoReq->abAlloc[0],
-                                                         pIoReq->ReadWrite.cbReq - pIoReq->ReadWrite.cbReqLeft,
+                                                         (uint32_t)(pIoReq->ReadWrite.cbReq - pIoReq->ReadWrite.cbReqLeft),
                                                          &pIoReq->ReadWrite.IoBuf.SgBuf,
                                                          RT_MIN(pIoReq->ReadWrite.cbIoBuf, pIoReq->ReadWrite.cbReqLeft));