Changeset 39518 in vbox for trunk/src/VBox

Timestamp:

Dec 2, 2011 9:10:13 PM (13 years ago)

Author:

vboxsync

Message:

DrvDiskIntegrity: Fix building

File:

• trunk/src/VBox/Devices/Storage/DrvDiskIntegrity.cpp (modified) (7 diffs)

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

@@ -489 +489 @@
  * @param   cRanges  Number of ranges in the array.
  */
-static int drvdiskintDiscardRecords(PDRVDISKINTEGRITY pThis, PPDMRANGE paRanges, unsigned cRanges)
+static int drvdiskintDiscardRecords(PDRVDISKINTEGRITY pThis, PCRTRANGE paRanges, unsigned cRanges)
 {
     int rc = VINF_SUCCESS;
@@ -809 +809 @@
                                              size_t cbRead, void *pvUser)
 {
-     LogFlow(("%s: uOffset=%#llx paSeg=%#p cSeg=%u cbRead=%d pvUser=%#p\n", __FUNCTION__,
+     LogFlow(("%s: uOffset=%llu paSeg=%#p cSeg=%u cbRead=%d pvUser=%#p\n", __FUNCTION__,
              uOffset, paSeg, cSeg, cbRead, pvUser));
     PDRVDISKINTEGRITY pThis = PDMIMEDIAASYNC_2_DRVDISKINTEGRITY(pInterface);
@@ -948 +948 @@
 
 /** @copydoc PDMIMEDIAASYNC::pfnStartDiscard */
-static DECLCALLBACK(int) drvdiskintStartDiscard(PPDMIMEDIA pInterface, PPDMRANGE paRanges, unsigned cRanges, void *pvUser)
+static DECLCALLBACK(int) drvdiskintStartDiscard(PPDMIMEDIAASYNC pInterface, PCRTRANGE paRanges, unsigned cRanges, void *pvUser)
 {
     int rc = VINF_SUCCESS;
@@ -961 +961 @@
     if (pThis->hIoLogger)
     {
-        rc = VDDbgIoLogStartDiscard(pThis->hIoLogger, true, (PVDRANGE)paRanges, cRanges, &hIoLogEntry);
+        rc = VDDbgIoLogStartDiscard(pThis->hIoLogger, true, paRanges, cRanges, &hIoLogEntry);
         AssertRC(rc);
     }
 
-    rc = pThis->pDrvMedia->pfnStartDiscard(pThis->pDrvMedia, paRanges, cRanges, pIoReq);
+    rc = pThis->pDrvMediaAsync->pfnStartDiscard(pThis->pDrvMediaAsync, paRanges, cRanges, pIoReq);
 
     if (rc == VINF_VD_ASYNC_IO_FINISHED)
@@ -1062 +1062 @@
 
 /** @copydoc PDMIMEDIA::pfnDiscard */
-static DECLCALLBACK(int) drvdiskintDiscard(PPDMIMEDIA pInterface, PPDMRANGE paRanges, unsigned cRanges)
+static DECLCALLBACK(int) drvdiskintDiscard(PPDMIMEDIA pInterface, PCRTRANGE paRanges, unsigned cRanges)
 {
     int rc = VINF_SUCCESS;
@@ -1070 +1070 @@
     if (pThis->hIoLogger)
     {
-        rc = VDDbgIoLogStartDiscard(pThis->hIoLogger, false, (PVDRANGE)paRanges, cRanges, &hIoLogEntry);
+        rc = VDDbgIoLogStartDiscard(pThis->hIoLogger, false, paRanges, cRanges, &hIoLogEntry);
         AssertRC(rc);
     }
@@ -1112 +1112 @@
             rc = drvdiskintWriteRecord(pThis, pIoReq->paSeg, pIoReq->cSeg, pIoReq->off, pIoReq->cbTransfer);
         else if (pIoReq->enmTxDir == DRVDISKAIOTXDIR_DISCARD)
-            rc = drvdiskintDiscardRecords(pThis, paRanges, cRanges);
+            rc = drvdiskintDiscardRecords(pThis, pIoReq->paRanges, pIoReq->cRanges);
         else
             AssertMsg(pIoReq->enmTxDir == DRVDISKAIOTXDIR_FLUSH, ("Huh?\n"));