Changeset 20723 in vbox for trunk

Timestamp:

Jun 19, 2009 1:14:16 PM (16 years ago)

Author:

vboxsync

Message:

Deal better with fatal assertions & the vga lock.

File:

• trunk/src/VBox/Devices/Graphics/DevVGA.cpp (modified) (1 diff)

trunk/src/VBox/Devices/Graphics/DevVGA.cpp

@@ -3813 +3813 @@
 #ifndef IN_RING3
         rc = PGMShwModifyPage(PDMDevHlpGetVMCPU(pThis->CTX_SUFF(pDevIns)), GCPtr, 1, X86_PTE_RW, ~(uint64_t)X86_PTE_RW);
+        PDMCritSectLeave(&pThis->lock);
         if (RT_SUCCESS(rc))
-        {
-            PDMCritSectLeave(&pThis->lock);
             return VINF_SUCCESS;
-        }
-        else
-            AssertMsgFailed(("PGMShwModifyPage -> rc=%d\n", rc));
+
+        AssertMsgFailed(("PGMShwModifyPage -> rc=%d\n", rc));
 #else /* IN_RING3 : We don't have any virtual page address of the access here. */
+        PDMCritSectLeave(&pThis->lock);
         Assert(GCPtr == 0);
+        return VINF_SUCCESS;
+#endif
+    }
+    else
+    {
         PDMCritSectLeave(&pThis->lock);
-        return VINF_SUCCESS;
-#endif
-    }
-    else
         AssertMsgFailed(("PGMHandlerPhysicalPageTempOff -> rc=%d\n", rc));
-
-    PDMCritSectLeave(&pThis->lock);
+    }
     return rc;
 }