Changeset 26631 in vbox for trunk

Timestamp:

Feb 18, 2010 4:34:03 PM (15 years ago)

Author:

vboxsync

Message:

Additions/solaris: logging and some fixes.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp (modified) (4 diffs)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest.cpp

@@ -357 +357 @@
     if (RT_FAILURE(rc))
     {
-        Log(("VBoxGuestInitDevExt: failed to spinlock, rc=%d!\n", rc));
+        LogRel(("VBoxGuestInitDevExt: failed to spinlock, rc=%d!\n", rc));
         if (pDevExt->EventSpinlock != NIL_RTSPINLOCK)
             RTSpinlockDestroy(pDevExt->EventSpinlock);
@@ -394 +394 @@
                         return VINF_SUCCESS;
                     }
+                    else
+                        LogRel(("VBoxGuestInitDevExt: VBoxGuestSetGuestCapabilities failed, rc=%Rrc\n", rc));
                 }
+                else
+                    LogRel(("VBoxGuestInitDevExt: vboxGuestSetFilterMask failed, rc=%Rrc\n", rc));
             }
-
-            /* failure cleanup */
+            else
+                LogRel(("VBoxGuestInitDevExt: vboxGuestInitReportGuestInfo failed, rc=%Rrc\n", rc));
+
+            VbglGRFree((VMMDevRequestHeader *)pDevExt->pIrqAckEvents);
         }
         else
-            Log(("VBoxGuestInitDevExt: VBoxGRAlloc failed, rc=%Rrc\n", rc));
+            LogRel(("VBoxGuestInitDevExt: VBoxGRAlloc failed, rc=%Rrc\n", rc));
 
         VbglTerminate();
     }
     else
-        Log(("VBoxGuestInitDevExt: VbglInit failed, rc=%Rrc\n", rc));
+        LogRel(("VBoxGuestInitDevExt: VbglInit failed, rc=%Rrc\n", rc));
 
     rc2 = RTSpinlockDestroy(pDevExt->EventSpinlock); AssertRC(rc2);
@@ -901 +907 @@
     {
         pInfo->u32Result = VBOXGUEST_WAITEVENT_INTERRUPTED;
-        rc == VERR_INTERRUPTED;
+        rc = VERR_INTERRUPTED;
         Log(("VBoxGuestCommonIOCtl: WAITEVENT: returns VERR_INTERRUPTED\n"));
     }
@@ -954 +960 @@
                 &&  pWait->fResEvents != UINT32_MAX)
             {
-                RTSEMEVENTMULTI     hEvent;
+                RTSEMEVENTMULTI hEvent = pWait->Event;
                 pWait->fResEvents = UINT32_MAX;
                 RTSpinlockReleaseNoInts(pDevExt->EventSpinlock, &Tmp);