Changeset 24095 in vbox for trunk

Timestamp:

Oct 26, 2009 10:31:42 PM (15 years ago)

Author:

vboxsync

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

53980

Message:

DevVGA_VBVA: shut up annoying reset assertion (DEBUG_bird only). Assert(RT_SUCCESS(rc)) -> AssertRC(rc).

File:

• trunk/src/VBox/Devices/Graphics/DevVGA_VBVA.cpp (modified) (8 diffs)

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

@@ -886 +886 @@
     RTSEMEVENT hComplEvent;
     int rc = RTSemEventCreate(&hComplEvent);
-    Assert(RT_SUCCESS(rc));
+    AssertRC(rc);
     if(RT_SUCCESS(rc))
     {
@@ -902 +902 @@
         }
 
-        Assert(RT_SUCCESS(rc));
+        AssertRC(rc);
         if(RT_SUCCESS(rc))
         {
@@ -927 +927 @@
 
         int rc = vbvaVHWAHHCommandPost(pVGAState, pCmd);
-        Assert(RT_SUCCESS(rc));
+        AssertRC(rc);
         if(RT_SUCCESS(rc))
         {
             rc = pCmd->rc;
-            Assert(RT_SUCCESS(rc) || rc == VERR_NOT_IMPLEMENTED);
+            AssertMsg(RT_SUCCESS(rc) || rc == VERR_NOT_IMPLEMENTED, ("%Rrc\n", rc));
             vbvaVHWAHHCommandRelease(pCmd);
             if(rc == VERR_NOT_IMPLEMENTED)
@@ -953 +953 @@
     {
         int rc = vbvaVHWAHHCommandPost(pVGAState, pCmd);
-        Assert(RT_SUCCESS(rc));
+        AssertRC(rc);
         if(RT_SUCCESS(rc))
         {
             rc = pCmd->rc;
-            Assert(RT_SUCCESS(rc));
+#ifdef DEBUG_bird /** @todo the assertion below hits when booting dsl here and resetting during early boot... */
+            AssertMsg(RT_SUCCESS(rc) || rc == VERR_NOT_IMPLEMENTED, ("%Rrc\n", rc));
+            if (rc == VERR_NOT_IMPLEMENTED)
+                rc = VINF_SUCCESS;
+#else
+            AssertRC(rc);
+#endif
             vbvaVHWAHHCommandRelease(pCmd);
         }
@@ -973 +979 @@
     {
         int rc = vbvaVHWAHHCommandPost(pVGAState, pCmd);
-        Assert(RT_SUCCESS(rc));
+        AssertRC(rc);
         if(RT_SUCCESS(rc))
         {
             rc = pCmd->rc;
-            Assert(RT_SUCCESS(rc) || rc == VERR_NOT_IMPLEMENTED);
+            AssertMsg(RT_SUCCESS(rc) || rc == VERR_NOT_IMPLEMENTED, ("%Rrc\n", rc));
             vbvaVHWAHHCommandRelease(pCmd);
             if(rc == VERR_NOT_IMPLEMENTED)
@@ -1016 +1022 @@
                                           HGSMI_CH_VBVA,
                                           VBVAHG_EVENT);
-            Assert(RT_SUCCESS(rc));
+            AssertRC(rc);
             if(RT_SUCCESS(rc))
             {
@@ -1037 +1043 @@
                                           HGSMI_CH_VBVA,
                                           VBVAHG_DISPLAY_CUSTOM);
-                Assert(RT_SUCCESS(rc));
+                AssertRC(rc);
                 if(RT_SUCCESS(rc))
                 {
@@ -1056 +1062 @@
         {
             rc = HGSMIHostCommandProcessAndFreeAsynch(pIns, pHostCmd, (pCmd->Flags & VBOXVHWACMD_FLAG_GH_ASYNCH_IRQ) != 0);
-            Assert(RT_SUCCESS(rc));
+            AssertRC(rc);
             if(RT_SUCCESS(rc))
             {