Changeset 90042 in vbox for trunk

Timestamp:

Jul 6, 2021 4:59:11 AM (4 years ago)

Author:

vboxsync

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

145536

Message:

AMD IOMMU: bugref:9654 Adjusted assertion in PDMAllIommu.cpp.

File:

• trunk/src/VBox/VMM/VMMAll/PDMAllIommu.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/VMMAll/PDMAllIommu.cpp

@@ -132 +132 @@
             if (RT_SUCCESS(rc))
             {
+                Assert(cbContig > 0 && cbContig <= cbRead);
                 /** @todo Handle strict return codes from PGMPhysRead. */
                 rc = pDevIns->CTX_SUFF(pHlp)->pfnPhysRead(pDevIns, GCPhysOut, pvBuf, cbContig, fFlags);
                 if (RT_SUCCESS(rc))
                 {
-                    Assert(cbContig <= cbRead);
                     cbRead -= cbContig;
                     pvBuf   = (void *)((uintptr_t)pvBuf + cbContig);
@@ -200 +200 @@
             if (RT_SUCCESS(rc))
             {
+                Assert(cbContig > 0 && cbContig <= cbWrite);
                 /** @todo Handle strict return codes from PGMPhysWrite. */
                 rc = pDevIns->CTX_SUFF(pHlp)->pfnPhysWrite(pDevIns, GCPhysOut, pvBuf, cbContig, fFlags);
                 if (RT_SUCCESS(rc))
                 {
-                    Assert(cbContig <= cbWrite);
                     cbWrite -= cbContig;
                     pvBuf    = (const void *)((uintptr_t)pvBuf + cbContig);
@@ -214 +214 @@
             else
             {
-                LogFunc(("IOMMU memory write failed. idDevice=%#x GCPhys=%#RGp cb=%zu rc=%Rrc\n", idDevice, GCPhys, cbWrite,
-                         rc));
+                LogFunc(("IOMMU memory write failed. idDevice=%#x GCPhys=%#RGp cb=%zu rc=%Rrc\n", idDevice, GCPhys, cbWrite, rc));
                 break;
             }