Changeset 26358 in vbox for trunk/src/VBox/Additions

Timestamp:

Feb 9, 2010 12:30:39 PM (15 years ago)

Author:

vboxsync

Message:

Additions/common, Additions/Solaris: Fix logging.

Location:

trunk/src/VBox/Additions/common

Files:

• VBoxGuest/VBoxGuest-solaris.c (modified) (4 diffs)
• VBoxGuest/VBoxGuest.cpp (modified) (2 diffs)
• VBoxGuestLib/HGCMInternal.cpp (modified) (1 diff)

trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-solaris.c

@@ -603 +603 @@
     if (RT_UNLIKELY(rc))
     {
-        LogRel((DEVICE_NAME "::IOCtl: ddi_copyin failed to read header pArg=%p Cmd=%d. rc=%d.\n", pArg, Cmd, rc));
+        LogRel((DEVICE_NAME "::IOCtl: ddi_copyin failed to read header pArg=%p Cmd=%d. rc=%#x.\n", pArg, Cmd, rc));
         return EINVAL;
     }
@@ -609 +609 @@
     if (ReqWrap.u32Magic != VBGLBIGREQ_MAGIC)
     {
-        LogRel((DEVICE_NAME "::IOCtl: bad magic %#x; pArg=%p Cmd=%d.\n", ReqWrap.u32Magic, pArg, Cmd));
+        LogRel((DEVICE_NAME "::IOCtl: bad magic %#x; pArg=%p Cmd=%#x.\n", ReqWrap.u32Magic, pArg, Cmd));
         return EINVAL;
     }
@@ -615 +615 @@
                     || ReqWrap.cbData > _1M*16))
     {
-        LogRel((DEVICE_NAME "::IOCtl: bad size %#x; pArg=%p Cmd=%d.\n", ReqWrap.cbData, pArg, Cmd));
+        LogRel((DEVICE_NAME "::IOCtl: bad size %#x; pArg=%p Cmd=%#x.\n", ReqWrap.cbData, pArg, Cmd));
         return EINVAL;
     }
@@ -671 +671 @@
     else
     {
-        LogRel((DEVICE_NAME "::IOCtl: VBoxGuestCommonIOCtl failed. rc=%d\n", rc));
+        if (rc != VERR_INTERRUPTED)
+            LogRel((DEVICE_NAME "::IOCtl: VBoxGuestCommonIOCtl failed. rc=%d\n", rc));
+        else
+            Log((DEVICE_NAME "::IOCtl: VBoxGuestCommonIOCtl failed. rc=%d\n", rc));
         rc = RTErrConvertToErrno(rc);
     }

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

@@ -156 +156 @@
             {
                 pDevExt->hGuestMappings = hFictive != NIL_RTR0MEMOBJ ? hFictive : hObj;
-                LogRel(("VBoxGuest: %p LB %#x; uAlignment=%#x iTry=%u hGuestMappings=%p (%s)\n",
+                Log(("VBoxGuest: %p LB %#x; uAlignment=%#x iTry=%u hGuestMappings=%p (%s)\n",
                         RTR0MemObjAddress(pDevExt->hGuestMappings),
                         RTR0MemObjSize(pDevExt->hGuestMappings),
@@ -1376 +1376 @@
     }
     else
-        LogRel(("VBoxGuestCommonIOCtl: HGCM_CALL: %s Failed. rc=%Rrc.\n", f32bit ? "32" : "64", rc));
+    {
+        if (rc != VERR_INTERRUPTED)
+            LogRel(("VBoxGuestCommonIOCtl: HGCM_CALL: %s Failed. rc=%Rrc.\n", f32bit ? "32" : "64", rc));
+        else
+            Log(("VBoxGuestCommonIOCtl: HGCM_CALL: %s Failed. rc=%Rrc.\n", f32bit ? "32" : "64", rc));
+    }
     return rc;
 }

trunk/src/VBox/Additions/common/VBoxGuestLib/HGCMInternal.cpp

@@ -896 +896 @@
             }
             else
-                LogRel(("VbglR0HGCMInternalCall: vbglR0HGCMInternalDoCall failed. rc=%Rrc\n", rc));
+            {
+                if (rc != VERR_INTERRUPTED)
+                    LogRel(("VbglR0HGCMInternalCall: vbglR0HGCMInternalDoCall failed. rc=%Rrc\n", rc));
+            }
 
             if (!fLeakIt)