Changeset 13063 in vbox for trunk/src/VBox/VMM/VMMAll

Timestamp:

Oct 8, 2008 8:52:54 AM (16 years ago)

Author:

vboxsync

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

37535

Message:

Corrected return value checks for PGMShwGetLongModePDPtr & PGMShwSyncLongModePDPtr.

File:

• trunk/src/VBox/VMM/VMMAll/PGMAllBth.h (modified) (7 diffs)

trunk/src/VBox/VMM/VMMAll/PGMAllBth.h

@@ -166 +166 @@
 
     rc = PGMShwSyncLongModePDPtr(pVM, (RTGCUINTPTR)pvFault, pPml4eSrc, &PdpeSrc, &pPDDst);
-    AssertReturn(rc == VINF_SUCCESS /* *must* test for VINF_SUCCESS!! */, rc);
+    if (rc != VINF_SUCCESS)
+    {
+        AssertRC(rc);
+        return rc;
+    }
     Assert(pPDDst);
 # elif PGM_SHW_TYPE == PGM_TYPE_EPT
@@ -1583 +1587 @@
 
     int rc = PGMShwGetLongModePDPtr(pVM, GCPtrPage, &pPdptDst, &pPDDst);
-    AssertRCReturn(rc, rc);
+    AssertRCSuccessReturn(rc, rc);
     Assert(pPDDst && pPdptDst);
     PdeDst = pPDDst->a[iPDDst];
@@ -1848 +1852 @@
 
     int rc = PGMShwGetLongModePDPtr(pVM, GCPtrPage, &pPdptDst, &pPDDst);
-    AssertRCReturn(rc, rc);
+    AssertRCSuccessReturn(rc, rc);
     Assert(pPDDst && pPdptDst);
     PdeDst = pPDDst->a[iPDDst];
@@ -2306 +2310 @@
     PX86PDPT        pPdptDst;
     rc = PGMShwGetLongModePDPtr(pVM, GCPtrPage, &pPdptDst, &pPDDst);
-    AssertRCReturn(rc, rc);
+    AssertRCSuccessReturn(rc, rc);
     Assert(pPDDst);
 # endif
@@ -2693 +2697 @@
     PX86PDPT        pPdptDst;
     rc = PGMShwGetLongModePDPtr(pVM, GCPtrPage, &pPdptDst, &pPDDst);
-    AssertRCReturn(rc, rc);
+    AssertRCSuccessReturn(rc, rc);
     Assert(pPDDst);
 
@@ -2842 +2846 @@
 
         int rc = PGMShwSyncLongModePDPtr(pVM, GCPtrPage, pPml4eSrc, &PdpeSrc, &pPDDst);
-        AssertReturn(rc == VINF_SUCCESS /* *must* test for VINF_SUCCESS!! */, rc);
+        if (rc != VINF_SUCCESS)
+        {
+            AssertRC(rc);
+            return rc;
+        }
         Assert(pPDDst);
         PdeDst = pPDDst->a[iPDDst];
@@ -2957 +2965 @@
 
     rc = PGMShwSyncLongModePDPtr(pVM, GCPtrPage, pPml4eSrc, &PdpeSrc, &pPDDst);
-    AssertReturn(rc == VINF_SUCCESS /* *must* test for VINF_SUCCESS!! */, rc);
+    if (rc != VINF_SUCCESS)
+    {
+        AssertRC(rc);
+        return rc;
+    }
     Assert(pPDDst);
     pPdeDst = &pPDDst->a[iPDDst];