Changeset 72312 in vbox

Timestamp:

May 24, 2018 7:57:55 AM (7 years ago)

Author:

vboxsync

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

122765

Message:

Build fix attempt for 32bit Windows

File:

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

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

@@ -759 +759 @@
  * @param   cbRead   Amount of bytes to read.
  */
-DECLINLINE(void) drvdiskintTraceLogFireEvtRead(PDRVDISKINTEGRITY pThis, RTTRACELOGEVTGRPID uGrp, uint64_t off, size_t cbRead)
+DECLINLINE(void) drvdiskintTraceLogFireEvtRead(PDRVDISKINTEGRITY pThis, uintptr_t uGrp, uint64_t off, size_t cbRead)
 {
     if (pThis->hIoLogger)
     {
-        int rc = RTTraceLogWrEvtAddL(pThis->hIoLogger, &g_EvtRead, RTTRACELOG_WR_ADD_EVT_F_GRP_START, uGrp, 0, off, cbRead);
+        int rc = RTTraceLogWrEvtAddL(pThis->hIoLogger, &g_EvtRead, RTTRACELOG_WR_ADD_EVT_F_GRP_START,
+                                     (RTTRACELOGEVTGRPID)uGrp, 0, off, cbRead);
         AssertRC(rc);
     }
@@ -778 +779 @@
  * @param   cbWrite  Amount of bytes to write.
  */
-DECLINLINE(void) drvdiskintTraceLogFireEvtWrite(PDRVDISKINTEGRITY pThis, RTTRACELOGEVTGRPID uGrp, uint64_t off, size_t cbWrite)
+DECLINLINE(void) drvdiskintTraceLogFireEvtWrite(PDRVDISKINTEGRITY pThis, uintptr_t uGrp, uint64_t off, size_t cbWrite)
 {
     if (pThis->hIoLogger)
     {
-        int rc = RTTraceLogWrEvtAddL(pThis->hIoLogger, &g_EvtWrite, RTTRACELOG_WR_ADD_EVT_F_GRP_START, uGrp, 0, off, cbWrite);
+        int rc = RTTraceLogWrEvtAddL(pThis->hIoLogger, &g_EvtWrite, RTTRACELOG_WR_ADD_EVT_F_GRP_START,
+                                     (RTTRACELOGEVTGRPID)uGrp, 0, off, cbWrite);
         AssertRC(rc);
     }
@@ -795 +797 @@
  * @param   uGrp     The group ID.
  */
-DECLINLINE(void) drvdiskintTraceLogFireEvtFlush(PDRVDISKINTEGRITY pThis, RTTRACELOGEVTGRPID uGrp)
+DECLINLINE(void) drvdiskintTraceLogFireEvtFlush(PDRVDISKINTEGRITY pThis, uintptr_t uGrp)
 {
     if (pThis->hIoLogger)
     {
-        int rc = RTTraceLogWrEvtAddL(pThis->hIoLogger, &g_EvtFlush, RTTRACELOG_WR_ADD_EVT_F_GRP_START, uGrp, 0);
+        int rc = RTTraceLogWrEvtAddL(pThis->hIoLogger, &g_EvtFlush, RTTRACELOG_WR_ADD_EVT_F_GRP_START,
+                                     (RTTRACELOGEVTGRPID)uGrp, 0);
         AssertRC(rc);
     }
@@ -814 +817 @@
  * @param   pSgBuf   The S/G buffer holding the data.
  */
-DECLINLINE(void) drvdiskintTraceLogFireEvtComplete(PDRVDISKINTEGRITY pThis, RTTRACELOGEVTGRPID uGrp, int rcReq, PRTSGBUF pSgBuf)
+DECLINLINE(void) drvdiskintTraceLogFireEvtComplete(PDRVDISKINTEGRITY pThis, uintptr_t uGrp, int rcReq, PRTSGBUF pSgBuf)
 {
     RT_NOREF(pSgBuf);
@@ -820 +823 @@
     if (pThis->hIoLogger)
     {
-        int rc = RTTraceLogWrEvtAddL(pThis->hIoLogger, &g_EvtComplete, RTTRACELOG_WR_ADD_EVT_F_GRP_FINISH, uGrp, 0, rcReq);
+        int rc = RTTraceLogWrEvtAddL(pThis->hIoLogger, &g_EvtComplete, RTTRACELOG_WR_ADD_EVT_F_GRP_FINISH,
+                                     (RTTRACELOGEVTGRPID)uGrp, 0, rcReq);
         AssertRC(rc);
     }
@@ -844 +848 @@
     PDRVDISKINTEGRITY pThis = PDMIMEDIA_2_DRVDISKINTEGRITY(pInterface);
 
-    drvdiskintTraceLogFireEvtRead(pThis, (RTTRACELOGEVTGRPID)pvBuf, off, cbRead);
+    drvdiskintTraceLogFireEvtRead(pThis, (uintptr_t)pvBuf, off, cbRead);
     rc = pThis->pDrvMedia->pfnRead(pThis->pDrvMedia, off, pvBuf, cbRead);
 
@@ -855 +859 @@
         Seg.cbSeg = cbRead;
         RTSgBufInit(&SgBuf, &Seg, 1);
-        drvdiskintTraceLogFireEvtComplete(pThis, (RTTRACELOGEVTGRPID)pvBuf, rc, &SgBuf);
+        drvdiskintTraceLogFireEvtComplete(pThis, (uintptr_t)pvBuf, rc, &SgBuf);
     }
 
@@ -881 +885 @@
     PDRVDISKINTEGRITY pThis = PDMIMEDIA_2_DRVDISKINTEGRITY(pInterface);
 
-    drvdiskintTraceLogFireEvtWrite(pThis, (RTTRACELOGEVTGRPID)pvBuf, off, cbWrite);
+    drvdiskintTraceLogFireEvtWrite(pThis, (uintptr_t)pvBuf, off, cbWrite);
 
     if (pThis->fRecordWriteBeforeCompletion)
@@ -896 +900 @@
     rc = pThis->pDrvMedia->pfnWrite(pThis->pDrvMedia, off, pvBuf, cbWrite);
 
-    drvdiskintTraceLogFireEvtComplete(pThis, (RTTRACELOGEVTGRPID)pvBuf, rc, NULL);
+    drvdiskintTraceLogFireEvtComplete(pThis, (uintptr_t)pvBuf, rc, NULL);
     if (RT_FAILURE(rc))
         return rc;
@@ -1007 +1011 @@
 
     rc = pThis->pDrvMedia->pfnDiscard(pThis->pDrvMedia, paRanges, cRanges);
-    drvdiskintTraceLogFireEvtComplete(pThis, (RTTRACELOGEVTGRPID)paRanges, rc, NULL);
+    drvdiskintTraceLogFireEvtComplete(pThis, (uintptr_t)paRanges, rc, NULL);
 
     if (pThis->fCheckConsistency)
@@ -1119 +1123 @@
         if (pIoReq->enmTxDir == DRVDISKAIOTXDIR_READ)
             RTSgBufInit(&SgBuf, &pIoReq->IoSeg, 1);
-        drvdiskintTraceLogFireEvtComplete(pThis, (RTTRACELOGEVTGRPID)hIoReq, rcReq, &SgBuf);
+        drvdiskintTraceLogFireEvtComplete(pThis, (uintptr_t)hIoReq, rcReq, &SgBuf);
     }
 
@@ -1417 +1421 @@
         drvdiskintIoReqAdd(pThis, pIoReq);
 
-    drvdiskintTraceLogFireEvtRead(pThis, (RTTRACELOGEVTGRPID)hIoReq, off, cbRead);
+    drvdiskintTraceLogFireEvtRead(pThis, (uintptr_t)hIoReq, off, cbRead);
     int rc = pThis->pDrvMediaEx->pfnIoReqRead(pThis->pDrvMediaEx, hIoReq, off, cbRead);
     if (rc == VINF_SUCCESS)
@@ -1433 +1437 @@
 
             RTSgBufInit(&SgBuf, &pIoReq->IoSeg, 1);
-            drvdiskintTraceLogFireEvtComplete(pThis, (RTTRACELOGEVTGRPID)hIoReq, rc, &SgBuf);
+            drvdiskintTraceLogFireEvtComplete(pThis, (uintptr_t)hIoReq, rc, &SgBuf);
         }
 
@@ -1440 +1444 @@
     }
     else if (rc != VINF_PDM_MEDIAEX_IOREQ_IN_PROGRESS)
-        drvdiskintTraceLogFireEvtComplete(pThis, (RTTRACELOGEVTGRPID)hIoReq, rc, NULL);
+        drvdiskintTraceLogFireEvtComplete(pThis, (uintptr_t)hIoReq, rc, NULL);
 
     LogFlowFunc(("returns %Rrc\n", rc));
@@ -1485 +1489 @@
         drvdiskintIoReqAdd(pThis, pIoReq);
 
-    drvdiskintTraceLogFireEvtWrite(pThis, (RTTRACELOGEVTGRPID)hIoReq, off, cbWrite);
+    drvdiskintTraceLogFireEvtWrite(pThis, (uintptr_t)hIoReq, off, cbWrite);
     if (pThis->fRecordWriteBeforeCompletion)
     {
@@ -1506 +1510 @@
         RTSGBUF SgBuf;
         RTSgBufInit(&SgBuf, &pIoReq->IoSeg, 1);
-        drvdiskintTraceLogFireEvtComplete(pThis, (RTTRACELOGEVTGRPID)hIoReq, rc, &SgBuf);
+        drvdiskintTraceLogFireEvtComplete(pThis, (uintptr_t)hIoReq, rc, &SgBuf);
         if (pThis->fTraceRequests)
             drvdiskintIoReqRemove(pThis, pIoReq);
     }
     else if (rc != VINF_PDM_MEDIAEX_IOREQ_IN_PROGRESS)
-        drvdiskintTraceLogFireEvtComplete(pThis, (RTTRACELOGEVTGRPID)hIoReq, rc, NULL);
+        drvdiskintTraceLogFireEvtComplete(pThis, (uintptr_t)hIoReq, rc, NULL);
 
     LogFlowFunc(("returns %Rrc\n", rc));
@@ -1532 +1536 @@
         drvdiskintIoReqAdd(pThis, pIoReq);
 
-    drvdiskintTraceLogFireEvtFlush(pThis, (RTTRACELOGEVTGRPID)hIoReq);
+    drvdiskintTraceLogFireEvtFlush(pThis, (uintptr_t)hIoReq);
     int rc = pThis->pDrvMediaEx->pfnIoReqFlush(pThis->pDrvMediaEx, hIoReq);
     if (rc == VINF_SUCCESS)
-        drvdiskintTraceLogFireEvtComplete(pThis, (RTTRACELOGEVTGRPID)hIoReq, rc, NULL);
+        drvdiskintTraceLogFireEvtComplete(pThis, (uintptr_t)hIoReq, rc, NULL);
     else if (rc != VINF_PDM_MEDIAEX_IOREQ_IN_PROGRESS)
-        drvdiskintTraceLogFireEvtComplete(pThis, (RTTRACELOGEVTGRPID)hIoReq, rc, NULL);
+        drvdiskintTraceLogFireEvtComplete(pThis, (uintptr_t)hIoReq, rc, NULL);
 
     LogFlowFunc(("returns %Rrc\n", rc));