Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp	(revision 60490)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp	(revision 60491)
@@ -5,5 +5,5 @@
 
 /*
- * Copyright (C) 2010-2015 Oracle Corporation
+ * Copyright (C) 2010-2016 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -907,5 +907,5 @@
      * Create a guest session.
      */
-    if (pCtx->cVerbose > 1)
+    if (pCtx->cVerbose)
         RTPrintf("Creating guest session as user '%s'...\n", pCtx->strUsername.c_str());
     try
@@ -927,5 +927,5 @@
          * Wait for guest session to start.
          */
-        if (pCtx->cVerbose > 1)
+        if (pCtx->cVerbose)
             RTPrintf("Waiting for guest session to start...\n");
         GuestSessionWaitResult_T enmWaitResult;
@@ -955,5 +955,5 @@
                 if (SUCCEEDED(rc))
                 {
-                    if (pCtx->cVerbose > 1)
+                    if (pCtx->cVerbose)
                         RTPrintf("Successfully started guest session (ID %RU32)\n", pCtx->uSessionID);
                     RTStrFree(pszSessionName);
@@ -1064,5 +1064,5 @@
             && !pCtx->fDetachGuestSession)
         {
-            if (pCtx->cVerbose > 1)
+            if (pCtx->cVerbose)
                 RTPrintf("Closing guest session ...\n");
 
@@ -1070,5 +1070,5 @@
         }
         else if (   pCtx->fDetachGuestSession
-                 && pCtx->cVerbose > 1)
+                 && pCtx->cVerbose)
             RTPrintf("Guest session detached\n");
 
@@ -1498,5 +1498,5 @@
              * Create the process.
              */
-            if (pCtx->cVerbose > 1)
+            if (pCtx->cVerbose)
             {
                 if (cMsTimeout == 0)
@@ -1524,5 +1524,5 @@
             ULONG uPID = 0;
             CHECK_ERROR_BREAK(pProcess, COMGETTER(PID)(&uPID));
-            if (fRunCmd && pCtx->cVerbose > 1)
+            if (fRunCmd && pCtx->cVerbose)
                 RTPrintf("Process '%s' (PID %RU32) started\n", pszImage, uPID);
             else if (!fRunCmd && pCtx->cVerbose)
@@ -1562,5 +1562,5 @@
                         break;
                     case ProcessWaitResult_Terminate:
-                        if (pCtx->cVerbose > 1)
+                        if (pCtx->cVerbose)
                             RTPrintf("Process terminated\n");
                         /* Process terminated, we're done. */
@@ -1637,5 +1637,5 @@
             if (g_fGuestCtrlCanceled)
             {
-                if (pCtx->cVerbose > 1)
+                if (pCtx->cVerbose)
                     RTPrintf("Process execution aborted!\n");
                 rcExit = EXITCODEEXEC_CANCELED;
@@ -1643,5 +1643,5 @@
             else if (fCompletedStartCmd)
             {
-                if (pCtx->cVerbose > 1)
+                if (pCtx->cVerbose)
                     RTPrintf("Process successfully started!\n");
                 rcExit = RTEXITCODE_SUCCESS;
@@ -1657,5 +1657,5 @@
                     LONG lExitCode;
                     CHECK_ERROR_BREAK(pProcess, COMGETTER(ExitCode)(&lExitCode));
-                    if (pCtx->cVerbose > 1)
+                    if (pCtx->cVerbose)
                         RTPrintf("Exit code=%u (Status=%u [%s])\n",
                                  lExitCode, procStatus, gctlProcessStatusToText(procStatus));
@@ -1666,5 +1666,5 @@
                          || procStatus == ProcessStatus_TimedOutAbnormally)
                 {
-                    if (pCtx->cVerbose > 1)
+                    if (pCtx->cVerbose)
                         RTPrintf("Process timed out (guest side) and %s\n",
                                  procStatus == ProcessStatus_TimedOutAbnormally
@@ -1674,5 +1674,5 @@
                 else
                 {
-                    if (pCtx->cVerbose > 1)
+                    if (pCtx->cVerbose)
                         RTPrintf("Process now is in status [%s] (unexpected)\n", gctlProcessStatusToText(procStatus));
                     rcExit = RTEXITCODE_FAILURE;
@@ -1681,5 +1681,5 @@
             else if (RT_FAILURE_NP(vrc))
             {
-                if (pCtx->cVerbose > 1)
+                if (pCtx->cVerbose)
                     RTPrintf("Process monitor loop quit with vrc=%Rrc\n", vrc);
                 rcExit = RTEXITCODE_FAILURE;
@@ -1687,5 +1687,5 @@
             else
             {
-                if (pCtx->cVerbose > 1)
+                if (pCtx->cVerbose)
                     RTPrintf("Process monitor loop timed out\n");
                 rcExit = EXITCODEEXEC_TIMEOUT;
@@ -1941,5 +1941,5 @@
         && fDirExists)
     {
-        if (pContext->pCmdCtx->cVerbose > 1)
+        if (pContext->pCmdCtx->cVerbose)
             RTPrintf("Directory \"%s\" already exists\n", pszDir);
         return VINF_SUCCESS;
@@ -1951,5 +1951,5 @@
         return vrc;
 
-    if (pContext->pCmdCtx->cVerbose > 1)
+    if (pContext->pCmdCtx->cVerbose)
         RTPrintf("Creating directory \"%s\" ...\n", pszDir);
 
@@ -2127,7 +2127,6 @@
     AssertReturn(enmFlags == kGctlCopyFlags_None, VERR_INVALID_PARAMETER); /* No flags supported yet. */
 
-    if (pContext->pCmdCtx->cVerbose > 1)
-        RTPrintf("Copying \"%s\" to \"%s\" ...\n",
-                 pszFileSource, pszFileDest);
+    if (pContext->pCmdCtx->cVerbose)
+        RTPrintf("Copying \"%s\" to \"%s\" ...\n", pszFileSource, pszFileDest);
 
     if (pContext->fDryRun)
@@ -2158,5 +2157,5 @@
     else
     {
-        if (pContext->pCmdCtx->cVerbose > 1)
+        if (pContext->pCmdCtx->cVerbose)
             rc = showProgress(pProgress);
         else
@@ -2201,5 +2200,5 @@
         vrc = RTPathAppend(szCurDir, sizeof(szCurDir), pszSubDir);
 
-    if (pContext->pCmdCtx->cVerbose > 1)
+    if (pContext->pCmdCtx->cVerbose)
         RTPrintf("Processing host directory: %s\n", szCurDir);
 
@@ -2246,5 +2245,5 @@
                         break;
 
-                    if (pContext->pCmdCtx->cVerbose > 1)
+                    if (pContext->pCmdCtx->cVerbose)
                         RTPrintf("Directory: %s\n", DirEntry.szName);
 
@@ -2290,5 +2289,5 @@
                     }
 
-                    if (pContext->pCmdCtx->cVerbose > 1)
+                    if (pContext->pCmdCtx->cVerbose)
                         RTPrintf("File: %s\n", DirEntry.szName);
 
@@ -2373,5 +2372,5 @@
         return vrc;
 
-    if (pContext->pCmdCtx->cVerbose > 1)
+    if (pContext->pCmdCtx->cVerbose)
         RTPrintf("Processing guest directory: %s\n", szCurDir);
 
@@ -2410,5 +2409,5 @@
                     break;
 
-                if (pContext->pCmdCtx->cVerbose > 1)
+                if (pContext->pCmdCtx->cVerbose)
                 {
                     Utf8Str strDir(strName);
@@ -2460,5 +2459,5 @@
                 }
 
-                if (pContext->pCmdCtx->cVerbose > 1)
+                if (pContext->pCmdCtx->cVerbose)
                     RTPrintf("File: %s\n", strFile.c_str());
 
@@ -2732,5 +2731,5 @@
      * Done parsing arguments, do some more preparations.
      */
-    if (pCtx->cVerbose > 1)
+    if (pCtx->cVerbose)
     {
         if (fHostToGuest)
@@ -2804,5 +2803,5 @@
             }
 
-            if (pCtx->cVerbose > 1)
+            if (pCtx->cVerbose)
                 RTPrintf("Source: %s\n", pszSource);
 
@@ -2942,5 +2941,5 @@
                     if (rcExit != RTEXITCODE_SUCCESS)
                         return rcExit;
-                    if (pCtx->cVerbose > 1)
+                    if (pCtx->cVerbose)
                         RTPrintf("Creating %RU32 directories...\n", argc - GetState.iNext + 1);
                 }
@@ -2958,5 +2957,5 @@
                  */
                 cDirsCreated++;
-                if (pCtx->cVerbose > 1)
+                if (pCtx->cVerbose)
                     RTPrintf("Creating directory \"%s\" ...\n", ValueUnion.psz);
                 try
@@ -3025,5 +3024,5 @@
                     if (rcExit != RTEXITCODE_SUCCESS)
                         return rcExit;
-                    if (pCtx->cVerbose > 1)
+                    if (pCtx->cVerbose)
                         RTPrintf("Removing %RU32 directorie%ss...\n", argc - GetState.iNext + 1, fRecursive ? "trees" : "");
                 }
@@ -3039,5 +3038,5 @@
                      * Remove exactly one directory.
                      */
-                    if (pCtx->cVerbose > 1)
+                    if (pCtx->cVerbose)
                         RTPrintf("Removing directory \"%s\" ...\n", ValueUnion.psz);
                     try
@@ -3058,5 +3057,5 @@
                      * strongly warns against (and half-ways questions the sense of).
                      */
-                    if (pCtx->cVerbose > 1)
+                    if (pCtx->cVerbose)
                         RTPrintf("Recursively removing directory \"%s\" ...\n", ValueUnion.psz);
                     try
@@ -3072,5 +3071,5 @@
                         if (SUCCEEDED(rc))
                         {
-                            if (pCtx->cVerbose > 1)
+                            if (pCtx->cVerbose)
                                 rc = showProgress(ptrProgress);
                             else
@@ -3140,5 +3139,5 @@
                     if (rcExit != RTEXITCODE_SUCCESS)
                         return rcExit;
-                    if (pCtx->cVerbose > 1)
+                    if (pCtx->cVerbose)
                         RTPrintf("Removing %RU32 file(s)...\n", argc - GetState.iNext + 1);
                 }
@@ -3154,5 +3153,5 @@
                  */
                 cFilesDeleted++;
-                if (pCtx->cVerbose > 1)
+                if (pCtx->cVerbose)
                     RTPrintf("Removing file \"%s\" ...\n", ValueUnion.psz);
                 try
@@ -3265,5 +3264,5 @@
      * Rename (move) the entries.
      */
-    if (pCtx->cVerbose > 1)
+    if (pCtx->cVerbose)
         RTPrintf("Renaming %RU32 %s ...\n", cSources, cSources > 1 ? "entries" : "entry");
 
@@ -3281,5 +3280,5 @@
         if (FAILED(rc))
         {
-            if (pCtx->cVerbose > 1)
+            if (pCtx->cVerbose)
                 RTPrintf("Warning: Cannot stat for element \"%s\": No such element\n",
                          strCurSource.c_str());
@@ -3288,5 +3287,5 @@
         }
 
-        if (pCtx->cVerbose > 1)
+        if (pCtx->cVerbose)
             RTPrintf("Renaming %s \"%s\" to \"%s\" ...\n",
                      enmObjType == FsObjType_Directory ? "directory" : "file",
@@ -3321,5 +3320,5 @@
 
     if (   (it != vecSources.end())
-        && pCtx->cVerbose > 1)
+        && pCtx->cVerbose)
     {
         RTPrintf("Warning: Not all sources were renamed\n");
@@ -3408,5 +3407,5 @@
      * Create the directories.
      */
-    if (pCtx->cVerbose > 1)
+    if (pCtx->cVerbose)
     {
         if (fDirectory && !strTempDir.isEmpty())
@@ -3506,5 +3505,5 @@
     while (it != mapObjs.end())
     {
-        if (pCtx->cVerbose > 1)
+        if (pCtx->cVerbose)
             RTPrintf("Checking for element \"%s\" ...\n", it->first.c_str());
 
@@ -3515,5 +3514,5 @@
             /* If there's at least one element which does not exist on the guest,
              * drop out with exitcode 1. */
-            if (pCtx->cVerbose > 1)
+            if (pCtx->cVerbose)
                 RTPrintf("Cannot stat for element \"%s\": No such element\n",
                          it->first.c_str());
@@ -3604,5 +3603,5 @@
     }
 
-    if (pCtx->cVerbose > 1)
+    if (pCtx->cVerbose)
         RTPrintf("Updating Guest Additions ...\n");
 
@@ -3632,5 +3631,5 @@
     if (RT_SUCCESS(vrc))
     {
-        if (pCtx->cVerbose > 1)
+        if (pCtx->cVerbose)
             RTPrintf("Using source: %s\n", strSource.c_str());
 
@@ -3645,5 +3644,5 @@
         {
             aUpdateFlags.push_back(AdditionsUpdateFlag_WaitForUpdateStartOnly);
-            if (pCtx->cVerbose > 1)
+            if (pCtx->cVerbose)
                 RTPrintf("Preparing and waiting for Guest Additions installer to start ...\n");
         }
@@ -3659,5 +3658,5 @@
         else
         {
-            if (pCtx->cVerbose > 1)
+            if (pCtx->cVerbose)
                 rc = showProgress(pProgress);
             else
@@ -3668,5 +3667,5 @@
             vrc = gctlPrintProgressError(pProgress);
             if (   RT_SUCCESS(vrc)
-                && pCtx->cVerbose > 1)
+                && pCtx->cVerbose)
             {
                 RTPrintf("Guest Additions update successful\n");
@@ -3995,5 +3994,5 @@
                     if (fProcFound)
                     {
-                        if (pCtx->cVerbose > 1)
+                        if (pCtx->cVerbose)
                             RTPrintf("Terminating process (PID %RU32) (session ID %RU32) ...\n",
                                      uPID, uID);
@@ -4133,9 +4132,9 @@
 
                 Assert(!pSession.isNull());
-                if (pCtx->cVerbose > 1)
+                if (pCtx->cVerbose)
                     RTPrintf("Closing guest session ID=#%RU32 \"%s\" ...\n",
                              uID, strNameUtf8.c_str());
                 CHECK_ERROR_BREAK(pSession, Close());
-                if (pCtx->cVerbose > 1)
+                if (pCtx->cVerbose)
                     RTPrintf("Guest session successfully closed\n");
 
@@ -4217,5 +4216,5 @@
         } while (0);
 
-        if (pCtx->cVerbose > 1)
+        if (pCtx->cVerbose)
             RTPrintf("Waiting for events ...\n");
 
@@ -4226,5 +4225,5 @@
         }
 
-        if (pCtx->cVerbose > 1)
+        if (pCtx->cVerbose)
             RTPrintf("Signal caught, exiting ...\n");