Changeset 28118 in vbox for trunk

Timestamp:

Apr 8, 2010 9:39:01 PM (15 years ago)

Author:

vboxsync

Message:

DrvDiskIntegrity: Use the advanced S/G buffer compare method to get the exact offset

File:

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

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

@@ -326 +326 @@
             RTSGSEG Seg;
             RTSGBUF SgBufCmp;
+            size_t cbOff = 0;
 
             Seg.cbSeg = cbRange;
@@ -331 +332 @@
 
             RTSgBufInit(&SgBufCmp, &Seg, 1);
-            if (RTSgBufCmp(&SgBuf, &SgBufCmp, cbRange))
+            if (RTSgBufCmpEx(&SgBuf, &SgBufCmp, cbRange, &cbOff, true))
             {
-                unsigned offWrong = 0;
-#if 0
-                for (offWrong = 0; offWrong < cbRange; offWrong++)
-                    if (pbBuf[offWrong] != pSeg->pbSeg[offSeg + offWrong])
-#endif
-                    {
-                        /* Corrupted disk, print I/O log entry of the last write which accessed this range. */
-                        uint32_t cSector = (offSeg + offWrong) / 512;
-                        AssertMsg(cSector < pSeg->cIoLogEntries, ("Internal bug!\n"));
-
-                        RTMsgError("Corrupted disk at offset %llu (%u bytes in the current read buffer)!\n",
-                                   offCurr + offWrong, offWrong);
-                        RTMsgError("Last write to this sector started at offset %llu with %u bytes (%u references to this log entry)\n",
-                                   pSeg->apIoLog[cSector]->off,
-                                   pSeg->apIoLog[cSector]->cbWrite,
-                                   pSeg->apIoLog[cSector]->cRefs);
-                        RTAssertDebugBreak();
-                    }
+                /* Corrupted disk, print I/O log entry of the last write which accessed this range. */
+                uint32_t cSector = (offSeg + cbOff) / 512;
+                AssertMsg(cSector < pSeg->cIoLogEntries, ("Internal bug!\n"));
+
+                RTMsgError("Corrupted disk at offset %llu (%u bytes in the current read buffer)!\n",
+                           offCurr + cbOff, cbOff);
+                RTMsgError("Last write to this sector started at offset %llu with %u bytes (%u references to this log entry)\n",
+                           pSeg->apIoLog[cSector]->off,
+                           pSeg->apIoLog[cSector]->cbWrite,
+                           pSeg->apIoLog[cSector]->cRefs);
+                RTAssertDebugBreak();
             }
         }
@@ -356 +350 @@
         offCurr += cbRange;
         cbLeft  -= cbRange;
-        RTSgBufAdvance(&SgBuf, cbRange);
     }