Changeset 54241 in vbox

Timestamp:

Feb 17, 2015 3:47:27 PM (10 years ago)

Author:

vboxsync

Message:

VBoxGuest-win.cpp: Cleaned up the 'logging' change of r92875, returning a number of LogFlow statements (error paths, useful stuff) into Log statements.

File:

• trunk/src/VBox/Additions/common/VBoxGuest/VBoxGuest-win.cpp (modified) (28 diffs)

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

@@ -283 +283 @@
             else
             {
-                LogFlowFunc(("IoAttachDeviceToDeviceStack did not give a nextLowerDriver!\n"));
+                LogFunc(("IoAttachDeviceToDeviceStack did not give a nextLowerDriver!\n"));
                 rc = STATUS_DEVICE_NOT_CONNECTED;
             }
@@ -291 +291 @@
         }
         else
-            LogFlowFunc(("IoCreateSymbolicLink failed with rc=%#x!\n", rc));
+            LogFunc(("IoCreateSymbolicLink failed with rc=%#x!\n", rc));
         IoDeleteDevice(pDeviceObject);
     }
     else
-        LogFlowFunc(("IoCreateDevice failed with rc=%#x!\n", rc));
-
-    LogFlowFunc(("Returning with rc=0x%x\n", rc));
+        LogFunc(("IoCreateDevice failed with rc=%#x!\n", rc));
+
+    LogFunc(("Returning with rc=0x%x\n", rc));
     return rc;
 }
@@ -331 +331 @@
         };
 
-        LogFlowFunc(("Type=%s",
-                     uType < RT_ELEMENTS(s_apszName) ? s_apszName[uType] : "Unknown"));
+        LogFunc(("Type=%s", uType < RT_ELEMENTS(s_apszName) ? s_apszName[uType] : "Unknown"));
 
         switch (uType)
@@ -338 +337 @@
             case CmResourceTypePort:
             case CmResourceTypeMemory:
-                LogFlowFunc(("Start %8X%8.8lX, length=%X\n",
-                             pResource->u.Port.Start.HighPart, pResource->u.Port.Start.LowPart,
-                             pResource->u.Port.Length));
+                LogFunc(("Start %8X%8.8lX, length=%X\n",
+                         pResource->u.Port.Start.HighPart, pResource->u.Port.Start.LowPart,
+                         pResource->u.Port.Length));
                 break;
 
             case CmResourceTypeInterrupt:
-                LogFlowFunc(("Level=%X, vector=%X, affinity=%X\n",
-                             pResource->u.Interrupt.Level, pResource->u.Interrupt.Vector,
-                             pResource->u.Interrupt.Affinity));
+                LogFunc(("Level=%X, vector=%X, affinity=%X\n",
+                         pResource->u.Interrupt.Level, pResource->u.Interrupt.Vector,
+                         pResource->u.Interrupt.Affinity));
                 break;
 
             case CmResourceTypeDma:
-                LogFlowFunc(("Channel %d, Port %X\n",
-                             pResource->u.Dma.Channel, pResource->u.Dma.Port));
+                LogFunc(("Channel %d, Port %X\n",
+                         pResource->u.Dma.Channel, pResource->u.Dma.Port));
                 break;
 
             default:
-                LogFlowFunc(("\n"));
+                LogFunc(("\n"));
                 break;
         }
@@ -382 +381 @@
     LogFlowFuncEnter();
 
-    int rc = STATUS_SUCCESS;
+    int rc = STATUS_SUCCESS; /** @todo r=bird: s/rc/rcNt/ and s/int/NTSTATUS/. gee. */
 #ifdef TARGET_NT4
     /*
@@ -424 +423 @@
             pDevExt->Core.pVMMDevMemory = (VMMDevMemory *)pvMMIOBase;
 
-            LogFlowFunc(("pvMMIOBase=0x%p, pDevExt=0x%p, pDevExt->Core.pVMMDevMemory=0x%p\n",
-                         pvMMIOBase, pDevExt, pDevExt ? pDevExt->Core.pVMMDevMemory : NULL));
+            LogFunc(("pvMMIOBase=0x%p, pDevExt=0x%p, pDevExt->Core.pVMMDevMemory=0x%p\n",
+                     pvMMIOBase, pDevExt, pDevExt ? pDevExt->Core.pVMMDevMemory : NULL));
 
             int vrc = VBoxGuestInitDevExt(&pDevExt->Core,
@@ -434 +433 @@
             if (RT_FAILURE(vrc))
             {
-                LogFlowFunc(("Could not init device extension, rc=%Rrc\n", vrc));
+                LogFunc(("Could not init device extension, rc=%Rrc\n", vrc));
                 rc = STATUS_DEVICE_CONFIGURATION_ERROR;
             }
         }
         else
-            LogFlowFunc(("Could not map physical address of VMMDev, rc=0x%x\n", rc));
+            LogFunc(("Could not map physical address of VMMDev, rc=0x%x\n", rc));
     }
 
@@ -448 +447 @@
         if (RT_FAILURE(vrc))
         {
-            LogFlowFunc(("Alloc for pPowerStateRequest failed, rc=%Rrc\n", vrc));
+            LogFunc(("Alloc for pPowerStateRequest failed, rc=%Rrc\n", vrc));
             rc = STATUS_UNSUCCESSFUL;
         }
@@ -483 +482 @@
         }
         else
-            LogFlowFunc(("Device does not provide an interrupt!\n"));
+            LogFunc(("Device does not provide an interrupt!\n"));
 #endif
         if (pDevExt->interruptVector)
@@ -507 +506 @@
                                     FALSE);                                     /* Don't save FPU stack. */
             if (NT_ERROR(rc))
-                LogFlowFunc(("Could not connect interrupt, rc=0x%x\n", rc));
+                LogFunc(("Could not connect interrupt, rc=0x%x\n", rc));
         }
         else
-            LogFlowFunc(("No interrupt vector found!\n"));
+            LogFunc(("No interrupt vector found!\n"));
     }
 
@@ -519 +518 @@
     if (RT_FAILURE(vrc))
     {
-        LogFlowFunc(("Failed to allocated kernel session data, rc=%Rrc\n", rc));
+        LogFunc(("Failed to allocated kernel session data, rc=%Rrc\n", rc));
         rc = STATUS_UNSUCCESSFUL;
     }
@@ -546 +545 @@
      *        whole bunch of things... */
 
-    LogFlowFunc(("Returned with rc=0x%x\n", rc));
+    LogFunc(("Returned with rc=0x%x\n", rc));
     return rc;
 }
@@ -647 +646 @@
     if (pDevExt->devState != WORKING)
     {
-        LogFlowFunc(("Device is not working currently, state=%d\n", pDevExt->devState));
+        LogFunc(("Device is not working currently, state=%d\n", pDevExt->devState));
         rc = STATUS_UNSUCCESSFUL;
     }
@@ -760 +759 @@
     if (pSession == NULL)
     {
-        LogFlowFunc(("Using kernel session data ...\n"));
+        LogFunc(("XXX: BUGBUG: FIXME: Using ugly kernel session data hack ...\n"));
+#ifdef DEBUG_andy
+        RTLogBackdoorPrintf("XXX: BUGBUG: FIXME: Using ugly kernel session data hack ... Please don't forget to fix this one, Andy!\n");
+#endif
         pSession = pDevExt->pKernelSession;
     }
@@ -781 +783 @@
                             || cbDataReturned > pStack->Parameters.DeviceIoControl.OutputBufferLength))
             {
-                LogFlowFunc(("Too much output data %u - expected %u!\n", cbDataReturned, cbData));
+                LogFunc(("Too much output data %u - expected %u!\n", cbDataReturned, cbData));
                 cbDataReturned = cbData;
                 Status = STATUS_BUFFER_TOO_SMALL;
@@ -801 +803 @@
     else
     {
-        LogFlowFunc(("Not buffered request (%#x) - not supported\n",
-                     pStack->Parameters.DeviceIoControl.IoControlCode));
+        LogFunc(("Not buffered request (%#x) - not supported\n", pStack->Parameters.DeviceIoControl.IoControlCode));
         Status = STATUS_NOT_SUPPORTED;
     }
@@ -920 +921 @@
         int rc = VbglGRPerform(&pReq->header);
         if (RT_FAILURE(rc))
-            LogFlowFunc(("Error performing request to VMMDev, rc=%Rrc\n", rc));
+            LogFunc(("Error performing request to VMMDev, rc=%Rrc\n", rc));
     }
 
@@ -957 +958 @@
 {
     PVBOXGUESTDEVEXTWIN pDevExt = (PVBOXGUESTDEVEXTWIN)pDevObj->DeviceExtension;
-#ifndef DEBUG_andy
-    LogFlowFunc(("pDevExt=0x%p\n", pDevExt));
-#endif
+    Log3Func(("pDevExt=0x%p\n", pDevExt));
 
     /* Test & reset the counter. */
@@ -994 +993 @@
         return FALSE;
 
-    /*LogFlowFunc(("pDevExt=0x%p, pVMMDevMemory=0x%p\n",
-                   pDevExt, pDevExt ? pDevExt->pVMMDevMemory : NULL));*/
+    /*Log3Func(("pDevExt=0x%p, pVMMDevMemory=0x%p\n", pDevExt, pDevExt ? pDevExt->pVMMDevMemory : NULL));*/
 
     /* Enter the common ISR routine and do the actual work. */
@@ -1004 +1002 @@
     if (fIRQTaken)
     {
-#ifndef DEBUG_andy
-        LogFlowFunc(("IRQ was taken! pInterrupt=0x%p, pDevExt=0x%p\n",
-                     pInterrupt, pDevExt));
-#endif
+        Log3Func(("IRQ was taken! pInterrupt=0x%p, pDevExt=0x%p\n", pInterrupt, pDevExt));
         if (ASMAtomicUoReadU32(   &pDevExt->Core.u32MousePosChangedSeq)
                                || !RTListIsEmpty(&pDevExt->Core.WakeUpList))
         {
-#ifndef DEBUG_andy
-            LogFlowFunc(("Requesting DPC ...\n"));
-#endif
+            Log3Func(("Requesting DPC ...\n"));
             IoRequestDpc(pDevExt->pDeviceObject, pDevExt->pCurrentIrp, NULL);
         }
@@ -1114 +1107 @@
                     pBaseAddress->ResourceMapped = FALSE;
 
-                    LogFlowFunc(("I/O range for VMMDev found! Base=%08x:%08x, length=%08x\n",
-                                 pPartialData->u.Port.Start.HighPart,
-                                 pPartialData->u.Port.Start.LowPart,
-                                 pPartialData->u.Port.Length));
+                    LogFunc(("I/O range for VMMDev found! Base=%08x:%08x, length=%08x\n",
+                             pPartialData->u.Port.Start.HighPart,
+                             pPartialData->u.Port.Start.LowPart,
+                             pPartialData->u.Port.Length));
 
                     /* Next item ... */
@@ -1127 +1120 @@
             case CmResourceTypeInterrupt:
             {
-                LogFlowFunc(("Interrupt: Level=%x, vector=%x, mode=%x\n",
-                             pPartialData->u.Interrupt.Level,
-                             pPartialData->u.Interrupt.Vector,
-                             pPartialData->Flags));
+                LogFunc(("Interrupt: Level=%x, vector=%x, mode=%x\n",
+                         pPartialData->u.Interrupt.Level,
+                         pPartialData->u.Interrupt.Vector,
+                         pPartialData->Flags));
 
                 /* Save information. */
@@ -1170 +1163 @@
                         pBaseAddress->ResourceMapped = FALSE;
 
-                        LogFlowFunc(("Memory range for VMMDev found! Base = %08x:%08x, Length = %08x\n",
-                                     pPartialData->u.Memory.Start.HighPart,
-                                     pPartialData->u.Memory.Start.LowPart,
-                                     pPartialData->u.Memory.Length));
+                        LogFunc(("Memory range for VMMDev found! Base = %08x:%08x, Length = %08x\n",
+                                 pPartialData->u.Memory.Start.HighPart,
+                                 pPartialData->u.Memory.Start.LowPart,
+                                 pPartialData->u.Memory.Length));
 
                         /* Next item ... */
@@ -1179 +1172 @@
                     }
                     else
-                        LogFlowFunc(("Ignoring memory: Flags=%08x\n", pPartialData->Flags));
+                        LogFunc(("Ignoring memory: Flags=%08x\n", pPartialData->Flags));
                 }
                 break;
@@ -1186 +1179 @@
             default:
             {
-                LogFlowFunc(("Unhandled resource found, type=%d\n", pPartialData->Type));
+                LogFunc(("Unhandled resource found, type=%d\n", pPartialData->Type));
                 break;
             }
@@ -1223 +1216 @@
          if (pVMMDevMemory)
          {
-             LogFlowFunc(("VMMDevMemory: Version = 0x%x, Size = %d\n",
-                          pVMMDevMemory->u32Version, pVMMDevMemory->u32Size));
+             LogFunc(("VMMDevMemory: Version = 0x%x, Size = %d\n", pVMMDevMemory->u32Version, pVMMDevMemory->u32Size));
 
              /* Check version of the structure; do we have the right memory version? */
@@ -1234 +1226 @@
                      *pcbMMIO = pVMMDevMemory->u32Size;
 
-                 LogFlowFunc(("VMMDevMemory found and mapped! pvMMIOBase = 0x%p\n",
-                              *ppvMMIOBase));
+                 LogFlowFunc(("VMMDevMemory found and mapped! pvMMIOBase = 0x%p\n", *ppvMMIOBase));
              }
              else
              {
                  /* Not our version, refuse operation and unmap the memory. */
-                 LogFlowFunc(("Wrong version (%u), refusing operation!\n", pVMMDevMemory->u32Version));
+                 LogFunc(("Wrong version (%u), refusing operation!\n", pVMMDevMemory->u32Version));
 
                  vbgdNtUnmapVMMDevMemory(pDevExt);
@@ -1548 +1539 @@
     return VINF_SUCCESS;
 }
+
 #endif /* VBOX_WITH_DPC_LATENCY_CHECKER */