Changeset 61390 in vbox for trunk/src/VBox

Timestamp:

Jun 2, 2016 12:18:30 AM (9 years ago)

Author:

vboxsync

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

107704

Message:

csamR3CalcPageHash: Shut up annoying assertion on VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS with bs3kit guest.

File:

• trunk/src/VBox/VMM/VMMR3/CSAM.cpp (modified) (1 diff)

trunk/src/VBox/VMM/VMMR3/CSAM.cpp

@@ -1772 +1772 @@
 
     rc = PGMPhysSimpleReadGCPtr(pVCpu, &val[0], pInstr, sizeof(val[0]));
-    AssertMsg(RT_SUCCESS(rc) || rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT, ("rc = %Rrc\n", rc));
-    if (rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT)
-    {
-        Log(("csamR3CalcPageHash: page %RRv not present!!\n", pInstr));
-        return ~0ULL;
+    if (RT_SUCCESS(rc))
+    { /* likely */ }
+    else
+    {
+        if (rc == VERR_PAGE_NOT_PRESENT || rc == VERR_PAGE_TABLE_NOT_PRESENT || rc == VERR_PGM_INVALID_GC_PHYSICAL_ADDRESS)
+        {
+            Log(("csamR3CalcPageHash: page %RRv not present!!\n", pInstr));
+            return ~0ULL;
+        }
+        AssertMsgFailed(("rc = %Rrc\n", rc));
     }