Changeset 64156 in vbox for trunk/src/VBox/GuestHost

Timestamp:

Oct 5, 2016 1:43:52 PM (9 years ago)

Author:

vboxsync

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

111134

Message:

bugref:8614: Additions/common/VBoxVideo: make the code more self-contained: disable all logging statements (comment them out, do not remove them) so as not to pull in the logging sub-system. Added a note suggesting that we give callers the information they need to do any logging.

File:

• trunk/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp (modified) (9 diffs)

trunk/src/VBox/GuestHost/HGSMI/HGSMICommon.cpp

@@ -17 +17 @@
 
 #define LOG_DISABLED /* Maybe we can enabled it all the time now? */
+/** @note commented out all logging statements to avoid pulling the logging
+ * sub-system into places like the Linux kernel driver.  Perhaps the best
+ * thing would be to use return enough information for callers to log what
+ * is needed. */
 #define LOG_GROUP LOG_GROUP_HGSMI
 #include <iprt/heap.h>
@@ -22 +26 @@
 
 #include <VBox/HGSMI/HGSMI.h>
-#include <VBox/log.h>
+// #include <VBox/log.h>
 
 
@@ -272 +276 @@
                              HGSMIBUFFERCONTEXT *pBufferContext)
 {
-    LogFlowFunc(("buffer 0x%x, area %p %x [0x%x;0x%x]\n",
-                 offBuffer, pArea->pu8Base, pArea->cbArea, pArea->offBase, pArea->offLast));
+    // LogFlowFunc(("buffer 0x%x, area %p %x [0x%x;0x%x]\n",
+    //              offBuffer, pArea->pu8Base, pArea->cbArea, pArea->offBase, pArea->offLast));
 
     int rc = VINF_SUCCESS;
@@ -280 +284 @@
         || offBuffer > pArea->offLast)
     {
-        LogFunc(("offset 0x%x is outside the area [0x%x;0x%x]!!!\n",
-                 offBuffer, pArea->offBase, pArea->offLast));
+        // LogFunc(("offset 0x%x is outside the area [0x%x;0x%x]!!!\n",
+        //          offBuffer, pArea->offBase, pArea->offLast));
         rc = VERR_INVALID_PARAMETER;
         HGSMI_STRICT_ASSERT_FAILED();
@@ -293 +297 @@
          * data size for the buffer at this offset.
          */
-        LogFlowFunc(("datasize check: header.u32DataSize = 0x%x pArea->offLast - offBuffer = 0x%x\n",
-                     header.u32DataSize, pArea->offLast - offBuffer));
+        // LogFlowFunc(("datasize check: header.u32DataSize = 0x%x pArea->offLast - offBuffer = 0x%x\n",
+        //              header.u32DataSize, pArea->offLast - offBuffer));
 
         if (header.u32DataSize <= pArea->offLast - offBuffer)
@@ -302 +306 @@
             /* At least both header and tail structures are in the area. Check the checksum. */
             uint32_t u32Checksum = HGSMIChecksum(offBuffer, &header, &tail);
-            LogFlowFunc(("checksum check: u32Checksum = 0x%x pTail->u32Checksum = 0x%x\n",
-                         u32Checksum, tail.u32Checksum));
+            // LogFlowFunc(("checksum check: u32Checksum = 0x%x pTail->u32Checksum = 0x%x\n",
+            //              u32Checksum, tail.u32Checksum));
             if (u32Checksum == tail.u32Checksum)
             {
@@ -313 +317 @@
             else
             {
-                LogFunc(("invalid checksum 0x%x, expected 0x%x!!!\n",
-                         u32Checksum, tail.u32Checksum));
+                // LogFunc(("invalid checksum 0x%x, expected 0x%x!!!\n",
+                //          u32Checksum, tail.u32Checksum));
                 rc = VERR_INVALID_STATE;
                 HGSMI_STRICT_ASSERT_FAILED();
@@ -321 +325 @@
         else
         {
-            LogFunc(("invalid data size 0x%x, maximum is 0x%x!!!\n",
-                     header.u32DataSize, pArea->offLast - offBuffer));
+            // LogFunc(("invalid data size 0x%x, maximum is 0x%x!!!\n",
+            //          header.u32DataSize, pArea->offLast - offBuffer));
             rc = VERR_TOO_MUCH_DATA;
             HGSMI_STRICT_ASSERT_FAILED();
@@ -362 +366 @@
                        HGSMIOFFSET offBuffer)
 {
-    LogFlowFunc(("pArea %p, offBuffer 0x%x\n", pArea, offBuffer));
+    // LogFlowFunc(("pArea %p, offBuffer 0x%x\n", pArea, offBuffer));
 
     AssertPtrReturn(pArea, VERR_INVALID_PARAMETER);