Changeset 40529 in vbox for trunk/src/VBox/Additions/common

Timestamp:

Mar 19, 2012 11:11:18 AM (13 years ago)

Author:

vboxsync

Message:

VBoxService: Removed logging prefixes.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxServiceControl.cpp (modified) (32 diffs)
• VBoxServiceControlThread.cpp (modified) (53 diffs)

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -118 +118 @@
         if (rc == VERR_HGCM_SERVICE_NOT_FOUND) /* Host service is not available. */
         {
-            VBoxServiceVerbose(0, "Control: Guest property service is not available, skipping\n");
+            VBoxServiceVerbose(0, "Guest property service is not available, skipping\n");
             rc = VINF_SUCCESS;
         }
         else
-            VBoxServiceError("Control: Failed to connect to the guest property service! Error: %Rrc\n", rc);
+            VBoxServiceError("Failed to connect to the guest property service! Error: %Rrc\n", rc);
     }
     else
@@ -186 +186 @@
     if (RT_SUCCESS(rc))
     {
-        VBoxServiceVerbose(3, "Control: Service client ID: %#x\n", g_uControlSvcClientID);
+        VBoxServiceVerbose(3, "Service client ID: %#x\n", g_uControlSvcClientID);
 
         /* Init thread lists. */
@@ -202 +202 @@
         if (rc == VERR_HGCM_SERVICE_NOT_FOUND) /* Host service is not available. */
         {
-            VBoxServiceVerbose(0, "Control: Guest control service is not available\n");
+            VBoxServiceVerbose(0, "Guest control service is not available\n");
             rc = VERR_SERVICE_DISABLED;
         }
         else
-            VBoxServiceError("Control: Failed to connect to the guest control service! Error: %Rrc\n", rc);
+            VBoxServiceError("Failed to connect to the guest control service! Error: %Rrc\n", rc);
         RTSemEventMultiDestroy(g_hControlEvent);
         g_hControlEvent = NIL_RTSEMEVENTMULTI;
@@ -233 +233 @@
     for (;;)
     {
-        VBoxServiceVerbose(3, "Control: Waiting for host msg ...\n");
+        VBoxServiceVerbose(3, "Waiting for host msg ...\n");
         uint32_t uMsg;
         uint32_t cParms;
@@ -239 +239 @@
         if (rc == VERR_TOO_MUCH_DATA)
         {
-            VBoxServiceVerbose(4, "Control: Message requires %ld parameters, but only 2 supplied -- retrying request (no error!)...\n", cParms);
+            VBoxServiceVerbose(4, "Message requires %ld parameters, but only 2 supplied -- retrying request (no error!)...\n", cParms);
             rc = VINF_SUCCESS; /* Try to get "real" message in next block below. */
         }
         else if (RT_FAILURE(rc))
-            VBoxServiceVerbose(3, "Control: Getting host message failed with %Rrc\n", rc); /* VERR_GEN_IO_FAILURE seems to be normal if ran into timeout. */
-        if (RT_SUCCESS(rc))
-        {
-            VBoxServiceVerbose(3, "Control: Msg=%u (%u parms) retrieved\n", uMsg, cParms);
+            VBoxServiceVerbose(3, "Getting host message failed with %Rrc\n", rc); /* VERR_GEN_IO_FAILURE seems to be normal if ran into timeout. */
+        if (RT_SUCCESS(rc))
+        {
+            VBoxServiceVerbose(3, "Msg=%u (%u parms) retrieved\n", uMsg, cParms);
             switch (uMsg)
             {
                 case HOST_CANCEL_PENDING_WAITS:
-                    VBoxServiceVerbose(3, "Control: Host asked us to quit ...\n");
+                    VBoxServiceVerbose(3, "Host asked us to quit ...\n");
                     break;
 
@@ -267 +267 @@
 
                 default:
-                    VBoxServiceVerbose(3, "Control: Unsupported message from host! Msg=%u\n", uMsg);
+                    VBoxServiceVerbose(3, "Unsupported message from host! Msg=%u\n", uMsg);
                     /* Don't terminate here; just wait for the next message. */
                     break;
@@ -325 +325 @@
         if (RT_SUCCESS(rc))
         {
-            VBoxServiceVerbose(3, "Control: Request to start process szCmd=%s, uFlags=0x%x, szArgs=%s, szEnv=%s, szUser=%s, uTimeout=%u\n",
+            VBoxServiceVerbose(3, "Request to start process szCmd=%s, uFlags=0x%x, szArgs=%s, szEnv=%s, szUser=%s, uTimeout=%u\n",
                                proc.szCmd, proc.uFlags,
                                proc.uNumArgs ? proc.szArgs : "<None>",
@@ -333 +333 @@
             rc = VBoxServiceControlReapThreads();
             if (RT_FAILURE(rc))
-                VBoxServiceError("Control: Reaping stopped processes failed with rc=%Rrc\n", rc);
+                VBoxServiceError("Reaping stopped processes failed with rc=%Rrc\n", rc);
             /* Keep going. */
 
@@ -354 +354 @@
     if (RT_FAILURE(rc))
     {
-        VBoxServiceError("Control: Starting process failed with rc=%Rrc\n", rc);
+        VBoxServiceError("Starting process failed with rc=%Rrc\n", rc);
 
         int rc2 = VbglR3GuestCtrlExecReportStatus(uClientID, uContextID, 0 /* PID, invalid. */,
@@ -361 +361 @@
         if (RT_FAILURE(rc2))
         {
-            VBoxServiceError("Control: Error sending start process status to host, rc=%Rrc\n", rc2);
+            VBoxServiceError("Error sending start process status to host, rc=%Rrc\n", rc2);
             if (RT_SUCCESS(rc))
                 rc = rc2;
@@ -445 +445 @@
     if (RT_SUCCESS(rc))
     {
-        VBoxServiceVerbose(3, "Control: Setting thread (PID %u) inactive\n",
-                           pThread->uPID);
+        VBoxServiceVerbose(3, "Setting thread (PID %u) to list %d\n",
+                           pThread->uPID, enmList);
 
         PRTLISTANCHOR pAnchor = NULL;
@@ -563 +563 @@
     if (RT_FAILURE(rc))
     {
-        VBoxServiceError("Control: [PID %u]: Failed to retrieve exec input command! Error: %Rrc\n",
+        VBoxServiceError("[PID %u]: Failed to retrieve exec input command! Error: %Rrc\n",
                          uPID, rc);
     }
     else if (cbSize > cbMaxBufSize)
     {
-        VBoxServiceError("Control: [PID %u]: Too much input received! cbSize=%u, cbMaxBufSize=%u\n",
+        VBoxServiceError("[PID %u]: Too much input received! cbSize=%u, cbMaxBufSize=%u\n",
                          uPID, cbSize, cbMaxBufSize);
         rc = VERR_INVALID_PARAMETER;
@@ -581 +581 @@
         {
             fPendingClose = true;
-            VBoxServiceVerbose(4, "Control: [PID %u]: Got last input block of size %u ...\n",
+            VBoxServiceVerbose(4, "[PID %u]: Got last input block of size %u ...\n",
                                uPID, cbSize);
         }
@@ -587 +587 @@
         rc = VBoxServiceControlSetInput(uPID, uContextID, fPendingClose, pabBuffer,
                                         cbSize, &cbWritten);
-        VBoxServiceVerbose(4, "Control: [PID %u]: Written input, CID=%u, rc=%Rrc, uFlags=0x%x, fPendingClose=%d, cbSize=%u, cbWritten=%u\n",
+        VBoxServiceVerbose(4, "[PID %u]: Written input, CID=%u, rc=%Rrc, uFlags=0x%x, fPendingClose=%d, cbSize=%u, cbWritten=%u\n",
                            uPID, uContextID, rc, uFlags, fPendingClose, cbSize, cbWritten);
         if (RT_SUCCESS(rc))
@@ -619 +619 @@
     Assert(uStatus > INPUT_STS_UNDEFINED);
 
-    VBoxServiceVerbose(3, "Control: [PID %u]: Input processed, CID=%u, uStatus=%u, uFlags=0x%x, cbWritten=%u\n",
+    VBoxServiceVerbose(3, "[PID %u]: Input processed, CID=%u, uStatus=%u, uFlags=0x%x, cbWritten=%u\n",
                        uPID, uContextID, uStatus, uFlags, cbWritten);
 
@@ -629 +629 @@
 
     if (RT_FAILURE(rc))
-        VBoxServiceError("Control: [PID %u]: Failed to report input status! Error: %Rrc\n",
+        VBoxServiceError("[PID %u]: Failed to report input status! Error: %Rrc\n",
                          uPID, rc);
     return rc;
@@ -659 +659 @@
             rc = VBoxServiceControlExecGetOutput(uPID, uContextID, uHandleID, RT_INDEFINITE_WAIT /* Timeout */,
                                                  pBuf, _64K /* cbSize */, &cbRead);
-            VBoxServiceVerbose(3, "Control: [PID %u]: Got output, rc=%Rrc, CID=%u, cbRead=%u, uHandle=%u, uFlags=%u\n",
+            VBoxServiceVerbose(3, "[PID %u]: Got output, rc=%Rrc, CID=%u, cbRead=%u, uHandle=%u, uFlags=%u\n",
                                uPID, rc, uContextID, cbRead, uHandleID, uFlags);
 
@@ -704 +704 @@
 
     if (RT_FAILURE(rc))
-        VBoxServiceError("Control: [PID %u]: Error handling output command! Error: %Rrc\n",
+        VBoxServiceError("[PID %u]: Error handling output command! Error: %Rrc\n",
                          uPID, rc);
     return rc;
@@ -713 +713 @@
 static DECLCALLBACK(void) VBoxServiceControlStop(void)
 {
-    VBoxServiceVerbose(3, "Control: Stopping ...\n");
+    VBoxServiceVerbose(3, "Stopping ...\n");
 
     /** @todo Later, figure what to do if we're in RTProcWait(). It's a very
@@ -726 +726 @@
     if (g_uControlSvcClientID)
     {
-        VBoxServiceVerbose(3, "Control: Cancelling pending waits (client ID=%u) ...\n",
+        VBoxServiceVerbose(3, "Cancelling pending waits (client ID=%u) ...\n",
                            g_uControlSvcClientID);
 
         int rc = VbglR3GuestCtrlCancelPendingWaits(g_uControlSvcClientID);
         if (RT_FAILURE(rc))
-            VBoxServiceError("Control: Cancelling pending waits failed; rc=%Rrc\n", rc);
+            VBoxServiceError("Cancelling pending waits failed; rc=%Rrc\n", rc);
     }
 }
@@ -761 +761 @@
                 if (RT_FAILURE(rc2))
                 {
-                    VBoxServiceError("Control: Stopping guest process thread failed with rc=%Rrc\n", rc2);
+                    VBoxServiceError("Stopping guest process thread failed with rc=%Rrc\n", rc2);
                     if (RT_SUCCESS(rc)) /* Keep original failure. */
                         rc = rc2;
@@ -767 +767 @@
             }
             else
-                VBoxServiceError("Control: Waiting on guest process thread failed with rc=%Rrc\n", rc2);
+                VBoxServiceError("Waiting on guest process thread failed with rc=%Rrc\n", rc2);
             /* Keep going. */
 
@@ -781 +781 @@
     }
 
-    VBoxServiceVerbose(4, "Control: Reaping threads returned with rc=%Rrc\n", rc);
+    VBoxServiceVerbose(4, "Reaping threads returned with rc=%Rrc\n", rc);
     return rc;
 }
@@ -791 +791 @@
 static void VBoxServiceControlShutdown(void)
 {
-    VBoxServiceVerbose(2, "Control: Shutting down ...\n");
+    VBoxServiceVerbose(2, "Shutting down ...\n");
 
     /* Signal all threads in the active list that we want to shutdown. */
@@ -808 +808 @@
                                                30 * 1000 /* Wait 30 seconds max. */);
         if (RT_FAILURE(rc2))
-            VBoxServiceError("Control: Guest process thread failed to stop; rc=%Rrc\n", rc2);
+            VBoxServiceError("Guest process thread failed to stop; rc=%Rrc\n", rc2);
 
         if (fLast)
@@ -818 +818 @@
     int rc2 = VBoxServiceControlReapThreads();
     if (RT_FAILURE(rc2))
-        VBoxServiceError("Control: Reaping inactive threads failed with rc=%Rrc\n", rc2);
+        VBoxServiceError("Reaping inactive threads failed with rc=%Rrc\n", rc2);
 
     AssertMsg(RTListIsEmpty(&g_lstControlThreadsActive),
@@ -828 +828 @@
     RTCritSectDelete(&g_csControlThreads);
 
-    VBoxServiceVerbose(2, "Control: Shutting down complete\n");
+    VBoxServiceVerbose(2, "Shutting down complete\n");
 }
 
@@ -835 +835 @@
 static DECLCALLBACK(void) VBoxServiceControlTerm(void)
 {
-    VBoxServiceVerbose(3, "Control: Terminating ...\n");
+    VBoxServiceVerbose(3, "Terminating ...\n");
 
     VBoxServiceControlShutdown();
 
-    VBoxServiceVerbose(3, "Control: Disconnecting client ID=%u ...\n",
+    VBoxServiceVerbose(3, "Disconnecting client ID=%u ...\n",
                        g_uControlSvcClientID);
     VbglR3GuestCtrlDisconnect(g_uControlSvcClientID);
@@ -879 +879 @@
                 uProcsRunning++;
 
-            VBoxServiceVerbose(3, "Control: Maximum served guest processes set to %u, running=%u\n",
+            VBoxServiceVerbose(3, "Maximum served guest processes set to %u, running=%u\n",
                                g_uControlProcsMaxKept, uProcsRunning);
 
@@ -885 +885 @@
             if (iProcsLeft < 0)
             {
-                VBoxServiceVerbose(3, "Control: Maximum running guest processes reached (%u)\n",
+                VBoxServiceVerbose(3, "Maximum running guest processes reached (%u)\n",
                                    g_uControlProcsMaxKept);
                 fLimitReached = true;
@@ -979 +979 @@
                     uint32_t uTriedPID = uPID;
                     uPID += 391939;
-                    VBoxServiceVerbose(2, "ControlThread: PID %u was used before, trying again with %u ...\n",
+                    VBoxServiceVerbose(2, "PID %u was used before, trying again with %u ...\n",
                                        uTriedPID, uPID);
                     fTryAgain = true;

trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlThread.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2011 Oracle Corporation
+ * Copyright (C) 2012 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -152 +152 @@
     AssertPtrReturn(pThread, VERR_INVALID_POINTER);
 
-    VBoxServiceVerbose(3, "ControlThread: [PID %u]: Freeing ...\n",
+    VBoxServiceVerbose(3, "[PID %u]: Freeing ...\n",
                        pThread->uPID);
 
@@ -170 +170 @@
         RTStrFree(pThread->pszPassword);
 
-        VBoxServiceVerbose(3, "ControlThread: [PID %u]: Setting stopped state\n",
+        VBoxServiceVerbose(3, "[PID %u]: Setting stopped state\n",
                            pThread->uPID);
 
@@ -204 +204 @@
     AssertPtrReturn(pThread, VERR_INVALID_POINTER);
 
-    VBoxServiceVerbose(3, "ControlThread: [PID %u]: Stopping ...\n",
+    VBoxServiceVerbose(3, "[PID %u]: Stopping ...\n",
                        pThread->uPID);
 
     int rc = vboxServiceControlThreadRequestCancel(pThread->pRequest);
     if (RT_FAILURE(rc))
-        VBoxServiceError("ControlThread: [PID %u]: Signalling request event failed, rc=%Rrc\n",
+        VBoxServiceError("[PID %u]: Signalling request event failed, rc=%Rrc\n",
                          pThread->uPID, rc);
 
@@ -221 +221 @@
         rc = VBoxServiceControlThreadPerform(pThread->uPID, pRequest);
         if (RT_FAILURE(rc))
-            VBoxServiceVerbose(3, "ControlThread: [PID %u]: Sending quit request failed with rc=%Rrc\n",
+            VBoxServiceVerbose(3, "[PID %u]: Sending quit request failed with rc=%Rrc\n",
                                pThread->uPID, rc);
 
@@ -245 +245 @@
         && ASMAtomicReadBool(&pThread->fStarted))
     {
-        VBoxServiceVerbose(2, "ControlThread: [PID %u]: Waiting for shutdown ...\n",
+        VBoxServiceVerbose(2, "[PID %u]: Waiting for shutdown ...\n",
                            pThread->uPID);
 
@@ -253 +253 @@
         if (RT_FAILURE(rc))
         {
-            VBoxServiceError("ControlThread: [PID %u]: Waiting for shutting down thread returned error rc=%Rrc\n",
+            VBoxServiceError("[PID %u]: Waiting for shutting down thread returned error rc=%Rrc\n",
                              pThread->uPID, rc);
         }
@@ -260 +260 @@
             if (RT_FAILURE(rcThread))
             {
-                VBoxServiceError("ControlThread: [PID %u]: Shutdown returned error rc=%Rrc\n",
+                VBoxServiceError("[PID %u]: Shutdown returned error rc=%Rrc\n",
                                  pThread->uPID, rcThread);
                 rc = rcThread;
@@ -328 +328 @@
 
 #ifdef DEBUG
-    VBoxServiceVerbose(4, "ControlThread: VBoxServiceControlThreadHandleOutputError: fPollEvt=0x%x, idPollHnd=%u\n",
+    VBoxServiceVerbose(4, "VBoxServiceControlThreadHandleOutputError: fPollEvt=0x%x, idPollHnd=%u\n",
                        fPollEvt, idPollHnd);
 #endif
@@ -344 +344 @@
         && cbReadable)
     {
-        VBoxServiceVerbose(3, "ControlThread: VBoxServiceControlThreadHandleOutputError: idPollHnd=%u has %ld bytes left, vetoing close\n",
+        VBoxServiceVerbose(3, "VBoxServiceControlThreadHandleOutputError: idPollHnd=%u has %ld bytes left, vetoing close\n",
                            idPollHnd, cbReadable);
 
@@ -353 +353 @@
     }
     else
-        VBoxServiceVerbose(3, "ControlThread: VBoxServiceControlThreadHandleOutputError: idPollHnd=%u will be closed\n",
+        VBoxServiceVerbose(3, "VBoxServiceControlThreadHandleOutputError: idPollHnd=%u will be closed\n",
                            idPollHnd);
 
@@ -382 +382 @@
 {
 #if 0
-    VBoxServiceVerbose(4, "ControlThread: VBoxServiceControlThreadHandleOutputEvent: fPollEvt=0x%x, idPollHnd=%u\n",
+    VBoxServiceVerbose(4, "VBoxServiceControlThreadHandleOutputEvent: fPollEvt=0x%x, idPollHnd=%u\n",
                        fPollEvt, idPollHnd);
 #endif
@@ -394 +394 @@
         && cbReadable)
     {
-        VBoxServiceVerbose(4, "ControlThread: VBoxServiceControlThreadHandleOutputEvent: cbReadable=%ld\n",
+        VBoxServiceVerbose(4, "VBoxServiceControlThreadHandleOutputEvent: cbReadable=%ld\n",
                            cbReadable);
     }
@@ -406 +406 @@
         rc = RTPipeRead(*phPipeR,
                         byData, sizeof(byData), &cbRead);
-        VBoxServiceVerbose(4, "ControlThread: VBoxServiceControlThreadHandleOutputEvent cbRead=%u, rc=%Rrc\n",
+        VBoxServiceVerbose(4, "VBoxServiceControlThreadHandleOutputEvent cbRead=%u, rc=%Rrc\n",
                            cbRead, rc);
 
@@ -436 +436 @@
     int rc = RTPipeRead(pThread->hNotificationPipeR, abBuf, sizeof(abBuf), &cbIgnore);
     if (RT_FAILURE(rc))
-        VBoxServiceError("ControlThread: Draining IPC notification pipe failed with rc=%Rrc\n", rc);
+        VBoxServiceError("Draining IPC notification pipe failed with rc=%Rrc\n", rc);
 
     int rcReq = VINF_SUCCESS; /* Actual request result. */
@@ -443 +443 @@
     if (!pRequest)
     {
-        VBoxServiceError("ControlThread: IPC request is invalid\n");
+        VBoxServiceError("IPC request is invalid\n");
         return VERR_INVALID_POINTER;
     }
@@ -532 +532 @@
                  ? rcReq : rc;
 
-    VBoxServiceVerbose(2, "ControlThread: [PID %u]: Handled req=%u, CID=%u, rc=%Rrc, cbData=%u\n",
+    VBoxServiceVerbose(2, "[PID %u]: Handled req=%u, CID=%u, rc=%Rrc, cbData=%u\n",
                        pThread->uPID, pRequest->enmType, pRequest->uCID, pRequest->rc, pRequest->cbData);
 
@@ -589 +589 @@
     if (RT_FAILURE(rc))
     {
-        VBoxServiceError("ControlThread: Unable to assign PID=%u, to new thread, rc=%Rrc\n",
+        VBoxServiceError("Unable to assign PID=%u, to new thread, rc=%Rrc\n",
                          hProcess, rc);
         return rc;
@@ -598 +598 @@
      * and that it's now OK to send input to the process.
      */
-    VBoxServiceVerbose(2, "ControlThread: [PID %u]: Process \"%s\" started, CID=%u, User=%s\n",
+    VBoxServiceVerbose(2, "[PID %u]: Process \"%s\" started, CID=%u, User=%s\n",
                        pThread->uPID, pThread->pszCmd, pThread->uContextID, pThread->pszUser);
     rc = VbglR3GuestCtrlExecReportStatus(pThread->uClientID, pThread->uContextID,
@@ -623 +623 @@
         if (RT_SUCCESS(rc2))
         {
-            /*VBoxServiceVerbose(4, "ControlThread: [PID %u}: RTPollNoResume idPollHnd=%u\n",
+            /*VBoxServiceVerbose(4, "[PID %u}: RTPollNoResume idPollHnd=%u\n",
                                  pThread->uPID, idPollHnd);*/
             switch (idPollHnd)
@@ -657 +657 @@
 
 #if 0
-        VBoxServiceVerbose(4, "ControlThread: [PID %u]: Polling done, pollRC=%Rrc, pollCnt=%u, rc=%Rrc, fShutdown=%RTbool\n",
+        VBoxServiceVerbose(4, "[PID %u]: Polling done, pollRC=%Rrc, pollCnt=%u, rc=%Rrc, fShutdown=%RTbool\n",
                            pThread->uPID, rc2, RTPollSetGetCount(hPollSet), rc, pThread->fShutdown);
 #endif
@@ -703 +703 @@
             if (cMsElapsed >= cMsTimeout)
             {
-                VBoxServiceVerbose(3, "ControlThread: [PID %u]: Timed out (%ums elapsed > %ums timeout), killing ...",
+                VBoxServiceVerbose(3, "[PID %u]: Timed out (%ums elapsed > %ums timeout), killing ...",
                                    pThread->uPID, cMsElapsed, cMsTimeout);
 
@@ -752 +752 @@
         if (MsProcessKilled == UINT64_MAX)
         {
-            VBoxServiceVerbose(3, "ControlThread: [PID %u]: Is still alive and not killed yet\n",
+            VBoxServiceVerbose(3, "[PID %u]: Is still alive and not killed yet\n",
                                pThread->uPID);
 
@@ -762 +762 @@
         for (size_t i = 0; i < 10; i++)
         {
-            VBoxServiceVerbose(4, "ControlThread: [PID %u]: Kill attempt %d/10: Waiting to exit ...\n",
+            VBoxServiceVerbose(4, "[PID %u]: Kill attempt %d/10: Waiting to exit ...\n",
                                pThread->uPID, i + 1);
             rc2 = RTProcWait(hProcess, RTPROCWAIT_FLAGS_NOBLOCK, &ProcessStatus);
             if (RT_SUCCESS(rc2))
             {
-                VBoxServiceVerbose(4, "ControlThread: [PID %u]: Kill attempt %d/10: Exited\n",
+                VBoxServiceVerbose(4, "[PID %u]: Kill attempt %d/10: Exited\n",
                                    pThread->uPID, i + 1);
                 fProcessAlive = false;
@@ -774 +774 @@
             if (i >= 5)
             {
-                VBoxServiceVerbose(4, "ControlThread: [PID %u]: Kill attempt %d/10: Trying to terminate ...\n",
+                VBoxServiceVerbose(4, "[PID %u]: Kill attempt %d/10: Trying to terminate ...\n",
                                    pThread->uPID, i + 1);
                 RTProcTerminate(hProcess);
@@ -782 +782 @@
 
         if (fProcessAlive)
-            VBoxServiceVerbose(3, "ControlThread: [PID %u]: Could not be killed\n", pThread->uPID);
+            VBoxServiceVerbose(3, "[PID %u]: Could not be killed\n", pThread->uPID);
     }
 
@@ -796 +796 @@
         if (     fProcessTimedOut  && !fProcessAlive && MsProcessKilled != UINT64_MAX)
         {
-            VBoxServiceVerbose(3, "ControlThread: [PID %u]: Timed out and got killed\n",
+            VBoxServiceVerbose(3, "[PID %u]: Timed out and got killed\n",
                                pThread->uPID);
             uStatus = PROC_STS_TOK;
@@ -802 +802 @@
         else if (fProcessTimedOut  &&  fProcessAlive && MsProcessKilled != UINT64_MAX)
         {
-            VBoxServiceVerbose(3, "ControlThread: [PID %u]: Timed out and did *not* get killed\n",
+            VBoxServiceVerbose(3, "[PID %u]: Timed out and did *not* get killed\n",
                                pThread->uPID);
             uStatus = PROC_STS_TOA;
@@ -808 +808 @@
         else if (pThread->fShutdown && (fProcessAlive || MsProcessKilled != UINT64_MAX))
         {
-            VBoxServiceVerbose(3, "ControlThread: [PID %u]: Got terminated because system/service is about to shutdown\n",
+            VBoxServiceVerbose(3, "[PID %u]: Got terminated because system/service is about to shutdown\n",
                                pThread->uPID);
             uStatus = PROC_STS_DWN; /* Service is stopping, process was killed. */
@@ -815 +815 @@
         else if (fProcessAlive)
         {
-            VBoxServiceError("ControlThread: [PID %u]: Is alive when it should not!\n",
+            VBoxServiceError("[PID %u]: Is alive when it should not!\n",
                              pThread->uPID);
         }
         else if (MsProcessKilled != UINT64_MAX)
         {
-            VBoxServiceError("ControlThread: [PID %u]: Has been killed when it should not!\n",
+            VBoxServiceError("[PID %u]: Has been killed when it should not!\n",
                              pThread->uPID);
         }
         else if (ProcessStatus.enmReason == RTPROCEXITREASON_NORMAL)
         {
-            VBoxServiceVerbose(3, "ControlThread: [PID %u]: Ended with RTPROCEXITREASON_NORMAL (Exit code: %u)\n",
+            VBoxServiceVerbose(3, "[PID %u]: Ended with RTPROCEXITREASON_NORMAL (Exit code: %u)\n",
                                pThread->uPID, ProcessStatus.iStatus);
 
@@ -833 +833 @@
         else if (ProcessStatus.enmReason == RTPROCEXITREASON_SIGNAL)
         {
-            VBoxServiceVerbose(3, "ControlThread: [PID %u]: Ended with RTPROCEXITREASON_SIGNAL (Signal: %u)\n",
+            VBoxServiceVerbose(3, "[PID %u]: Ended with RTPROCEXITREASON_SIGNAL (Signal: %u)\n",
                                pThread->uPID, ProcessStatus.iStatus);
 
@@ -842 +842 @@
         {
             /* ProcessStatus.iStatus will be undefined. */
-            VBoxServiceVerbose(3, "ControlThread: [PID %u]: Ended with RTPROCEXITREASON_ABEND\n",
+            VBoxServiceVerbose(3, "[PID %u]: Ended with RTPROCEXITREASON_ABEND\n",
                                pThread->uPID);
 
@@ -849 +849 @@
         }
         else
-            VBoxServiceVerbose(1, "ControlThread: [PID %u]: Handling process status %u not implemented\n",
+            VBoxServiceVerbose(1, "[PID %u]: Handling process status %u not implemented\n",
                                pThread->uPID, ProcessStatus.enmReason);
 
-        VBoxServiceVerbose(2, "ControlThread: [PID %u]: Ended, ClientID=%u, CID=%u, Status=%u, Flags=0x%x\n",
+        VBoxServiceVerbose(2, "[PID %u]: Ended, ClientID=%u, CID=%u, Status=%u, Flags=0x%x\n",
                            pThread->uPID, pThread->uClientID, pThread->uContextID, uStatus, uFlags);
         rc = VbglR3GuestCtrlExecReportStatus(pThread->uClientID, pThread->uContextID,
@@ -858 +858 @@
                                              NULL /* pvData */, 0 /* cbData */);
         if (RT_FAILURE(rc))
-            VBoxServiceError("ControlThread: [PID %u]: Error reporting final status to host; rc=%Rrc\n",
+            VBoxServiceError("[PID %u]: Error reporting final status to host; rc=%Rrc\n",
                              pThread->uPID, rc);
 
-        VBoxServiceVerbose(3, "ControlThread: [PID %u]: Process loop ended with rc=%Rrc\n",
+        VBoxServiceVerbose(3, "[PID %u]: Process loop ended with rc=%Rrc\n",
                            pThread->uPID, rc);
     }
     else
-        VBoxServiceError("ControlThread: [PID %u]: Loop failed with rc=%Rrc\n",
+        VBoxServiceError("[PID %u]: Loop failed with rc=%Rrc\n",
                          pThread->uPID, rc);
     return rc;
@@ -970 +970 @@
         return VINF_SUCCESS;
 
-    VBoxServiceVerbose(4, "ControlThread: Cancelling request=0x%p\n", pReq);
+    VBoxServiceVerbose(4, "Cancelling request=0x%p\n", pReq);
 
     return RTSemEventMultiSignal(pReq->Event);
@@ -986 +986 @@
     AssertPtrReturnVoid(pReq);
 
-    VBoxServiceVerbose(4, "ControlThread: Freeing request=0x%p (event=%RTsem)\n",
+    VBoxServiceVerbose(4, "Freeing request=0x%p (event=%RTsem)\n",
                        pReq, &pReq->Event);
 
@@ -1011 +1011 @@
     if (RT_SUCCESS(rc))
     {
-        VBoxServiceVerbose(4, "ControlThread: Performed request with rc=%Rrc, cbData=%u\n",
+        VBoxServiceVerbose(4, "Performed request with rc=%Rrc, cbData=%u\n",
                            pReq->rc, pReq->cbData);
 
@@ -1018 +1018 @@
     }
     else
-        VBoxServiceError("ControlThread: Waiting for request failed, rc=%Rrc\n", rc);
+        VBoxServiceError("Waiting for request failed, rc=%Rrc\n", rc);
 
     return rc;
@@ -1118 +1118 @@
 #endif
 #ifdef DEBUG
-    VBoxServiceVerbose(3, "ControlThread: VBoxServiceControlExecMakeFullPath: %s -> %s\n",
+    VBoxServiceVerbose(3, "VBoxServiceControlExecMakeFullPath: %s -> %s\n",
                        pszPath, pszExpanded);
 #endif
@@ -1127 +1127 @@
 /**
  * Resolves the full path of a specified executable name. This function also
- * resolves internal VBoxService tools to its appropriate executable path + name.
+ * resolves internal VBoxService tools to its appropriate executable path + name if
+ * VBOXSERVICE_NAME is specified as pszFileName.
  *
  * @return  IPRT status code.
@@ -1170 +1171 @@
  *
  * @return IPRT status code.
- * @param  pszArgv0         First argument (argv0), either original or modified version.
+ * @param  pszArgv0         First argument (argv0), either original or modified version.  Optional.
  * @param  papszArgs        Original argv command line from the host, starting at argv[1].
  * @param  ppapszArgv       Pointer to a pointer with the new argv command line.
@@ -1208 +1209 @@
                                     pszNewArgs ? pszNewArgs : "", NULL /* Use standard separators. */);
     }
+
+#ifdef DEBUG
+    VBoxServiceVerbose(3, "Arguments argv0=%s, new arguments=%s\n",
+                       pszArgv0 ? pszArgv0 : "<NULL>", pszNewArgs);
+#endif
 
     if (pszNewArgs)
@@ -1326 +1332 @@
                 uProcFlags |= RTPROC_FLAGS_SERVICE;
 #ifdef DEBUG
-            VBoxServiceVerbose(3, "ControlThread: Command: %s\n", szExecExp);
+            VBoxServiceVerbose(3, "Command: %s\n", szExecExp);
             for (size_t i = 0; papszArgsExp[i]; i++)
-                VBoxServiceVerbose(3, "ControlThread:\targv[%ld]: %s\n", i, papszArgsExp[i]);
+                VBoxServiceVerbose(3, "\targv[%ld]: %s\n", i, papszArgsExp[i]);
 #endif
             /* Do normal execution. */
@@ -1351 +1357 @@
 {
     AssertPtrReturn(pThread, VERR_INVALID_POINTER);
-    VBoxServiceVerbose(3, "ControlThread: Thread of process \"%s\" started\n", pThread->pszCmd);
+    VBoxServiceVerbose(3, "Thread of process \"%s\" started\n", pThread->pszCmd);
 
     int rc = VBoxServiceControlListSet(VBOXSERVICECTRLTHREADLIST_RUNNING, pThread);
@@ -1359 +1365 @@
     if (RT_FAILURE(rc))
     {
-        VBoxServiceError("ControlThread: Thread failed to connect to the guest control service, aborted! Error: %Rrc\n", rc);
+        VBoxServiceError("Thread failed to connect to the guest control service, aborted! Error: %Rrc\n", rc);
         RTThreadUserSignal(RTThreadSelf());
         return rc;
     }
-    VBoxServiceVerbose(3, "ControlThread: Guest process \"%s\" got client ID=%u, flags=0x%x\n",
+    VBoxServiceVerbose(3, "Guest process \"%s\" got client ID=%u, flags=0x%x\n",
                        pThread->pszCmd, pThread->uClientID, pThread->uFlags);
 
@@ -1448 +1454 @@
                                                                            &hProcess);
                                 if (RT_FAILURE(rc))
-                                    VBoxServiceError("ControlThread: Error starting process, rc=%Rrc\n", rc);
+                                    VBoxServiceError("Error starting process, rc=%Rrc\n", rc);
                                 /*
                                  * Tell the control thread that it can continue
@@ -1535 +1541 @@
                                                   NULL /* pvData */, 0 /* cbData */);
             if (RT_FAILURE(rc2))
-                VBoxServiceError("ControlThread: Could not report process failure error; rc=%Rrc (process error %Rrc)\n",
+                VBoxServiceError("Could not report process failure error; rc=%Rrc (process error %Rrc)\n",
                                  rc2, rc);
         }
 
-        VBoxServiceVerbose(3, "ControlThread: [PID %u]: Cancelling pending host requests (client ID=%u)\n",
+        VBoxServiceVerbose(3, "[PID %u]: Cancelling pending host requests (client ID=%u)\n",
                            pThread->uPID, pThread->uClientID);
         rc2 = VbglR3GuestCtrlCancelPendingWaits(pThread->uClientID);
         if (RT_FAILURE(rc2))
         {
-            VBoxServiceError("ControlThread: [PID %u]: Cancelling pending host requests failed; rc=%Rrc\n",
+            VBoxServiceError("[PID %u]: Cancelling pending host requests failed; rc=%Rrc\n",
                              pThread->uPID, rc2);
             if (RT_SUCCESS(rc))
@@ -1551 +1557 @@
 
         /* Disconnect from guest control service. */
-        VBoxServiceVerbose(3, "ControlThread: [PID %u]: Disconnecting (client ID=%u) ...\n",
+        VBoxServiceVerbose(3, "[PID %u]: Disconnecting (client ID=%u) ...\n",
                            pThread->uPID, pThread->uClientID);
         VbglR3GuestCtrlDisconnect(pThread->uClientID);
@@ -1557 +1563 @@
     }
 
-    VBoxServiceVerbose(3, "ControlThread: [PID %u]: Thread of process \"%s\" ended with rc=%Rrc\n",
+    VBoxServiceVerbose(3, "[PID %u]: Thread of process \"%s\" ended with rc=%Rrc\n",
                        pThread->uPID, pThread->pszCmd, rc);
 
@@ -1622 +1628 @@
         if (RT_FAILURE(rc))
         {
-            VBoxServiceError("ControlThread: RTThreadCreate failed, rc=%Rrc\n, pThread=%p\n",
+            VBoxServiceError("RTThreadCreate failed, rc=%Rrc\n, pThread=%p\n",
                              rc, pThread);
         }
         else
         {
-            VBoxServiceVerbose(4, "ControlThread: Waiting for thread to initialize ...\n");
+            VBoxServiceVerbose(4, "Waiting for thread to initialize ...\n");
 
             /* Wait for the thread to initialize. */
@@ -1635 +1641 @@
                 || RT_FAILURE(rc))
             {
-                VBoxServiceError("ControlThread: Thread for process \"%s\" failed to start, rc=%Rrc\n",
+                VBoxServiceError("Thread for process \"%s\" failed to start, rc=%Rrc\n",
                                  pProcess->szCmd, rc);
             }
@@ -1691 +1697 @@
                 && cbWritten)
             {
-                VBoxServiceVerbose(3, "ControlThread: [PID %u]: Waiting for response on enmType=%u, pvData=0x%p, cbData=%u\n",
+                VBoxServiceVerbose(3, "[PID %u]: Waiting for response on enmType=%u, pvData=0x%p, cbData=%u\n",
                                    uPID, pRequest->enmType, pRequest->pvData, pRequest->cbData);
 
@@ -1703 +1709 @@
         rc = VERR_NOT_FOUND;
 
-    VBoxServiceVerbose(3, "ControlThread: [PID %u]: Performed enmType=%u, uCID=%u, pvData=0x%p, cbData=%u, rc=%Rrc\n",
+    VBoxServiceVerbose(3, "[PID %u]: Performed enmType=%u, uCID=%u, pvData=0x%p, cbData=%u, rc=%Rrc\n",
                        uPID, pRequest->enmType, pRequest->uCID, pRequest->pvData, pRequest->cbData, rc);
     return rc;