Index: /trunk/src/VBox/Devices/VMMDev/VMMDev.cpp
===================================================================
--- /trunk/src/VBox/Devices/VMMDev/VMMDev.cpp	(revision 54747)
+++ /trunk/src/VBox/Devices/VMMDev/VMMDev.cpp	(revision 54748)
@@ -340,5 +340,5 @@
         pThis->fu32AdditionsOk = VBOX_GUEST_INTERFACE_VERSION_OK(pThis->guestInfo.interfaceVersion);
 
-        LogRel(("Guest Additions information report: Interface = 0x%08X osType = 0x%08X (%u-bit)\n",
+        LogRel(("VMMDev: Guest Additions information report: Interface = 0x%08X osType = 0x%08X (%u-bit)\n",
                 pThis->guestInfo.interfaceVersion, pThis->guestInfo.osType,
                 (pThis->guestInfo.osType & VBOXOSTYPE_x64) ? 64 : 32));
@@ -388,5 +388,5 @@
         if (pThis->fHasMissedHB)
         {
-            LogRel(("vmmDevReqHandler_GuestHeartBeat: guest is alive\n"));
+            LogRel(("VMMDev: GuestHeartBeat: Guest is alive\n"));
             ASMAtomicWriteBool(&pThis->fHasMissedHB, false);
         }
@@ -406,8 +406,9 @@
     if (pThis->fHBCheckEnabled)
     {
-        uint64_t interval = TMTimerGetNano(pTimer) - pThis->uLastHBTime;
-        if (!pThis->fHasMissedHB && interval >= pThis->u64HeartbeatInterval)
-        {
-            LogRel(("vmmDevHeartBeatCheckTimer: guest seems to be not responding, last heartbeat received %RU64 sec ago\n", interval / 1000000000));
+        uint64_t uIntervalNs = TMTimerGetNano(pTimer) - pThis->uLastHBTime;
+        if (!pThis->fHasMissedHB && uIntervalNs >= pThis->u64HeartbeatInterval)
+        {
+            LogRel(("VMMDev: HeartBeatCheckTimer: Guest seems to be unresponsive. Last heartbeat received %RU64 sec ago\n",
+                    uIntervalNs / RT_NS_1SEC_64));
             ASMAtomicWriteBool(&pThis->fHasMissedHB, true);
         }
@@ -440,18 +441,20 @@
             if (RT_SUCCESS(rc))
             {
-                LogRel(("Heartbeat checking timer has been set to trigger every %RU64 sec\n", pThis->u64HeartbeatInterval / 500000000));
+                /** @todo r=ramshankar: Why are we using 500000000 here? The comment in
+                 *        u64HeartbeatInterval doesn't indicate anything special.  */
+                LogRel(("VMMDev: Heartbeat checking timer set to trigger every %RU64 sec\n", pThis->u64HeartbeatInterval / 500000000));
             }
             else
-                LogRel(("Cannot create heartbeat check timer, rc=%Rrc\n", rc));
+                LogRel(("VMMDev: Cannot create heartbeat check timer, rc=%Rrc\n", rc));
         }
         else
         {
             rc = TMTimerStop(pThis->pHBCheckTimer);
-            LogRel(("Heartbeat checking timer has been stopped, rc=%Rrc\n", rc));
+            LogRel(("VMMDev: Heartbeat checking timer has been stopped, rc=%Rrc\n", rc));
         }
     }
     else
     {
-        LogRel(("vmmDevReqHandler_HeartbeatConfigure: enabled=%d\n", pThis->fHBCheckEnabled));
+        LogRel(("VMMDev: vmmDevReqHandler_HeartbeatConfigure: fHBCheckEnabled=%RTbool\n", pThis->fHBCheckEnabled));
         rc = VINF_SUCCESS;
     }
@@ -521,5 +524,5 @@
     VBoxGuestInfo2 const *pInfo2 = &((VMMDevReportGuestInfo2 *)pReqHdr)->guestInfo;
 
-    LogRel(("Guest Additions information report: Version %d.%d.%d r%d '%.*s'\n",
+    LogRel(("VMMDev: Guest Additions information report: Version %d.%d.%d r%d '%.*s'\n",
             pInfo2->additionsMajor, pInfo2->additionsMinor, pInfo2->additionsBuild,
             pInfo2->additionsRevision, sizeof(pInfo2->szName), pInfo2->szName));
@@ -589,5 +592,5 @@
 
             /* non-strict mode, just zap the extra stuff. */
-            LogRel(("ReportGuestInfo2: Ignoring unparsable version name bits: '%s' -> '%s'.\n", pszName, pszRelaxedName));
+            LogRel(("VMMDev: ReportGuestInfo2: Ignoring unparsable version name bits: '%s' -> '%s'.\n", pszName, pszRelaxedName));
             pszName = pszRelaxedName;
         }
@@ -744,5 +747,5 @@
         if (!pEntry)
         {
-            LogRelMax(10, ("VMM: Facility table is full - facility=%u status=%u.\n", pStatus->facility, pStatus->status));
+            LogRelMax(10, ("VMMDev: Facility table is full - facility=%u status=%u.\n", pStatus->facility, pStatus->status));
             return VERR_OUT_OF_RESOURCES;
         }
@@ -842,5 +845,5 @@
         pThis->guestCaps = fu32Caps;
 
-        LogRel(("Guest Additions capability report (legacy): (0x%x) seamless: %s, hostWindowMapping: %s, graphics: yes\n",
+        LogRel(("VMMDev: Guest Additions capability report (legacy): (0x%x) seamless: %s, hostWindowMapping: %s, graphics: yes\n",
                 fu32Caps,
                 fu32Caps & VMMDEV_GUEST_SUPPORTS_SEAMLESS ? "yes" : "no",
@@ -870,5 +873,5 @@
     fu32Caps &= ~pReq->u32NotMask;
 
-    LogRel(("Guest Additions capability report: (%#x -> %#x) seamless: %s, hostWindowMapping: %s, graphics: %s\n",
+    LogRel(("VMMDev: Guest Additions capability report: (%#x -> %#x) seamless: %s, hostWindowMapping: %s, graphics: %s\n",
             pThis->guestCaps, fu32Caps,
             fu32Caps & VMMDEV_GUEST_SUPPORTS_SEAMLESS ? "yes" : "no",
@@ -901,5 +904,5 @@
     pReq->pointerXPos   = pThis->mouseXAbs;
     pReq->pointerYPos   = pThis->mouseYAbs;
-    LogRel2(("VMMDevReq_GetMouseStatus: features = %#x, xAbs = %d, yAbs = %d\n",
+    LogRel2(("VMMDev: vmmdevReqHandler_GetMouseStatus: mouseFeatures=%#x, xAbs=%d, yAbs=%d\n",
              pReq->mouseFeatures, pReq->pointerXPos, pReq->pointerYPos));
     return VINF_SUCCESS;
@@ -919,5 +922,5 @@
     AssertMsgReturn(pReq->header.size == sizeof(*pReq), ("%u\n", pReq->header.size), VERR_INVALID_PARAMETER);
 
-    LogRelFlowFunc(("mouseFeatures = %#x\n", pReq->mouseFeatures));
+    LogRelFlow(("VMMDev: vmmdevReqHandler_SetMouseStatus: mouseFeatures=%#x\n", pReq->mouseFeatures));
 
     bool fNotify = false;
@@ -930,5 +933,5 @@
     pThis->mouseCapabilities |= (pReq->mouseFeatures & VMMDEV_MOUSE_GUEST_MASK);
 
-    LogRelFlowFunc(("new host capabilities: %#x\n", pThis->mouseCapabilities));
+    LogRelFlow(("VMMDev: vmmdevReqHandler_SetMouseStatus: New host capabilities: %#x\n", pThis->mouseCapabilities));
 
     /*
@@ -937,5 +940,5 @@
     if (fNotify)
     {
-        LogRelFlowFunc(("notifying connector\n"));
+        LogRelFlow(("VMMDev: vmmdevReqHandler_SetMouseStatus: Notifying connector\n"));
         pThis->pDrv->pfnUpdateMouseCapabilities(pThis->pDrv, pThis->mouseCapabilities);
     }
@@ -1080,6 +1083,6 @@
             /* new reservation */
             rc = PGMR3MappingsFix(pVM, pReq->hypervisorStart, pReq->hypervisorSize);
-            LogRel(("Guest reported fixed hypervisor window at 0%010x (size = %#x, rc = %Rrc)\n",
-                    pReq->hypervisorStart, pReq->hypervisorSize, rc));
+            LogRel(("VMMDev: Guest reported fixed hypervisor window at 0%010x (size = %#x, rc = %Rrc)\n", pReq->hypervisorStart,
+                    pReq->hypervisorSize, rc));
         }
         else if (RT_FAILURE(rc))
@@ -1138,5 +1141,5 @@
         case VMMDevPowerState_Pause:
         {
-            LogRel(("Guest requests the VM to be suspended (paused)\n"));
+            LogRel(("VMMDev: Guest requests the VM to be suspended (paused)\n"));
             return PDMDevHlpVMSuspend(pThis->pDevIns);
         }
@@ -1144,5 +1147,5 @@
         case VMMDevPowerState_PowerOff:
         {
-            LogRel(("Guest requests the VM to be turned off\n"));
+            LogRel(("VMMDev: Guest requests the VM to be turned off\n"));
             return PDMDevHlpVMPowerOff(pThis->pDevIns);
         }
@@ -1152,13 +1155,13 @@
             if (true /*pThis->fAllowGuestToSaveState*/)
             {
-                LogRel(("Guest requests the VM to be saved and powered off\n"));
+                LogRel(("VMMDev: Guest requests the VM to be saved and powered off\n"));
                 return PDMDevHlpVMSuspendSaveAndPowerOff(pThis->pDevIns);
             }
-            LogRel(("Guest requests the VM to be saved and powered off, declined\n"));
+            LogRel(("VMMDev: Guest requests the VM to be saved and powered off, declined\n"));
             return VERR_ACCESS_DENIED;
         }
 
         default:
-            AssertMsgFailed(("VMMDev invalid power state request: %d\n", pReq->powerState));
+            AssertMsgFailed(("VMMDev: Invalid power state request: %d\n", pReq->powerState));
             return VERR_INVALID_PARAMETER;
     }
@@ -1532,5 +1535,5 @@
     AssertMsgReturn(pReq->header.size == sizeof(*pReq), ("%u\n", pReq->header.size), VERR_INVALID_PARAMETER);
 
-    LogRelFlowFunc(("VMMDevCtlGuestFilterMask: or mask: %#x, not mask: %#x\n", pReq->u32OrMask, pReq->u32NotMask));
+    LogRelFlow(("VMMDev: vmmdevReqHandler_CtlGuestFilterMask: OR mask: %#x, NOT mask: %#x\n", pReq->u32OrMask, pReq->u32NotMask));
 
     /* HGCM event notification is enabled by the VMMDev device
@@ -2726,6 +2729,6 @@
         else
         {
-            LogRelMax(10, ("VMMDev: the guest has not yet reported to us -- refusing operation of request #%d\n",
-                        requestHeader.requestType));
+            LogRelMax(10, ("VMMDev: Guest has not yet reported to us -- refusing operation of request #%d\n",
+                           requestHeader.requestType));
             requestHeader.rc = VERR_NOT_SUPPORTED;
         }
@@ -2733,5 +2736,5 @@
     else
     {
-        LogRelMax(50, ("VMMDev: request packet too big (%x). Refusing operation.\n", requestHeader.size));
+        LogRelMax(50, ("VMMDev: Request packet too big (%x). Refusing operation.\n", requestHeader.size));
         requestHeader.rc = VERR_NOT_SUPPORTED;
     }
@@ -3066,5 +3069,6 @@
     bool fNotify = fOldCaps != pThis->mouseCapabilities;
 
-    LogRelFlowFunc(("fCapsAdded=0x%x, fCapsRemoved=0x%x, fNotify=%RTbool\n", fCapsAdded, fCapsRemoved, fNotify));
+    LogRelFlow(("VMMDev: vmmdevIPort_UpdateMouseCapabilities: fCapsAdded=0x%x, fCapsRemoved=0x%x, fNotify=%RTbool\n", fCapsAdded,
+                fCapsRemoved, fNotify));
 
     if (fNotify)
@@ -3465,5 +3469,5 @@
     SSMR3GetU32(pSSM, &pThis->u32HostEventFlags);
 
-//    SSMR3GetBool(pSSM, &pThis->pVMMDevRAMR3->fHaveEvents);
+    //SSMR3GetBool(pSSM, &pThis->pVMMDevRAMR3->fHaveEvents);
     // here be dragons (probably)
     SSMR3GetMem(pSSM, &pThis->pVMMDevRAMR3->V, sizeof (pThis->pVMMDevRAMR3->V));
@@ -3552,5 +3556,5 @@
     if (pThis->fu32AdditionsOk)
     {
-        LogRel(("Guest Additions information report: additionsVersion = 0x%08X, osType = 0x%08X (%u-bit)\n",
+        LogRel(("VMMDev: Guest Additions information report: additionsVersion = 0x%08X, osType = 0x%08X (%u-bit)\n",
                 pThis->guestInfo.interfaceVersion, pThis->guestInfo.osType,
                 (pThis->guestInfo.osType & VBOXOSTYPE_x64) ? 64 : 32));