Changeset 97412 in vbox for trunk/src/VBox/Main

Timestamp:

Nov 6, 2022 9:30:21 AM (2 years ago)

Author:

vboxsync

Message:

Guest Control/Main: Temporary verbose logging build for the Testboxes. Losing patience with the non-working environment tweaks, sigh. ​bugref:10286

Location:

trunk/src/VBox/Main/src-client

Files:

• GuestSessionImpl.cpp (modified) (2 diffs)
• GuestSessionImplTasks.cpp (modified) (19 diffs)

trunk/src/VBox/Main/src-client/GuestSessionImpl.cpp

@@ -769 +769 @@
     while (itSrc != SourceSet.end())
     {
-        LogRel2(("Guest Control: Copying '%s' from guest to '%s' on the host (type: %s, filter: %s)\n",
+        LogRel(("Guest Control: Copying '%s' from guest to '%s' on the host (type: %s, filter: %s)\n",
                  itSrc->strSource.c_str(), strDestination.c_str(), GuestBase::fsObjTypeToStr(itSrc->enmType), itSrc->strFilter.c_str()));
         ++itSrc;
@@ -836 +836 @@
     while (itSrc != SourceSet.end())
     {
-        LogRel2(("Guest Control: Copying '%s' from host to '%s' on the guest (type: %s, filter: %s)\n",
+        LogRel(("Guest Control: Copying '%s' from host to '%s' on the guest (type: %s, filter: %s)\n",
                  itSrc->strSource.c_str(), strDestination.c_str(), GuestBase::fsObjTypeToStr(itSrc->enmType), itSrc->strFilter.c_str()));
         ++itSrc;

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -363 +363 @@
     LogFlowFunc(("strPath=%s, fMode=%RU32, fCreate=0x%x, fCanExist=%RTbool\n", strPath.c_str(), fMode, fCreate, fCanExist));
 
-    LogRel2(("Guest Control: Creating host directory '%s' ...\n", strPath.c_str()));
+    LogRel(("Guest Control: Creating host directory '%s' ...\n", strPath.c_str()));
 
     int vrc = RTDirCreate(strPath.c_str(), fMode, fCreate);
@@ -598 +598 @@
                 if (RTTimeSpecCompare(&srcModificationTimeTS, &dstObjInfo.ModificationTime) <= 0)
                 {
-                    LogRel2(("Guest Control: Host file \"%s\" has same or newer modification date, skipping", strDst.c_str()));
+                    LogRel(("Guest Control: Host file \"%s\" has same or newer modification date, skipping", strDst.c_str()));
                     fSkip = true;
                 }
@@ -650 +650 @@
     }
 
-    LogRel2(("Guest Control: Copying file '%s' from guest to '%s' on host ...\n", strSrc.c_str(), strDst.c_str()));
+    LogRel(("Guest Control: Copying file '%s' from guest to '%s' on host ...\n", strSrc.c_str(), strDst.c_str()));
 
     LogFlowFunc(("vrc=%Rrc, dstFsType=%#x, pszDstFile=%s\n", vrc, dstObjInfo.Attr.fMode & RTFS_TYPE_MASK, strDst.c_str()));
@@ -859 +859 @@
                         if (RTTimeSpecCompare(&dstModificationTimeTS, &srcObjInfo.ModificationTime) <= 0)
                         {
-                            LogRel2(("Guest Control: Guest file \"%s\" has same or newer modification date, skipping",
+                            LogRel(("Guest Control: Guest file \"%s\" has same or newer modification date, skipping",
                                      strDst.c_str()));
                             fSkip = true;
@@ -906 +906 @@
     if (RT_SUCCESS(vrc))
     {
-        LogRel2(("Guest Control: Copying file '%s' from host to '%s' on guest ...\n", strSrc.c_str(), strDst.c_str()));
+        LogRel(("Guest Control: Copying file '%s' from host to '%s' on guest ...\n", strSrc.c_str(), strDst.c_str()));
 
         RTVFSFILE hSrcFile;
@@ -1092 +1092 @@
     LogFlowFunc(("Entering '%s' (sub '%s')\n", strPathAbs.c_str(), strPathSub.c_str()));
 
-    LogRel2(("Guest Control: Handling directory '%s' on guest ...\n", strPathAbs.c_str()));
+    LogRel(("Guest Control: Handling directory '%s' on guest ...\n", strPathAbs.c_str()));
 
     GuestDirectoryOpenInfo dirOpenInfo;
@@ -1156 +1156 @@
                     }
 
-                    LogRel2(("Guest Control: Directory '%s'\n", strEntry.c_str()));
+                    LogRel(("Guest Control: Directory '%s'\n", strEntry.c_str()));
 
                     if (!(mSourceSpec.fDirCopyFlags & DirectoryCopyFlag_Recursive))
@@ -1172 +1172 @@
                         /** @todo Symlink handling from guest is not implemented yet.
                          *        See IGuestSession::symlinkRead(). */
-                        LogRel2(("Guest Control: Warning: Symlink support on guest side not available, skipping '%s'",
+                        LogRel(("Guest Control: Warning: Symlink support on guest side not available, skipping '%s'",
                                  strEntry.c_str()));
                     }
@@ -1180 +1180 @@
                 case FsObjType_File:
                 {
-                    LogRel2(("Guest Control: File '%s'\n", strEntry.c_str()));
+                    LogRel(("Guest Control: File '%s'\n", strEntry.c_str()));
 
                     vrc = AddEntryFromGuest(strEntry, fsObjInfo->i_getData());
@@ -1231 +1231 @@
     LogFlowFunc(("Entering '%s' (sub '%s')\n", strPathAbs.c_str(), strPathSub.c_str()));
 
-    LogRel2(("Guest Control: Handling directory '%s' on host ...\n", strPathAbs.c_str()));
+    LogRel(("Guest Control: Handling directory '%s' on host ...\n", strPathAbs.c_str()));
 
     RTFSOBJINFO objInfo;
@@ -1271 +1271 @@
                                     break;
 
-                                LogRel2(("Guest Control: Directory '%s'\n", strEntry.c_str()));
+                                LogRel(("Guest Control: Directory '%s'\n", strEntry.c_str()));
 
                                 if (!(mSourceSpec.fDirCopyFlags & DirectoryCopyFlag_Recursive))
@@ -1282 +1282 @@
                             case RTFS_TYPE_FILE:
                             {
-                                LogRel2(("Guest Control: File '%s'\n", strEntry.c_str()));
+                                LogRel(("Guest Control: File '%s'\n", strEntry.c_str()));
 
                                 vrc = AddEntryFromHost(strEntry, &pDirEntry->Info);
@@ -1300 +1300 @@
                                         if (RTFS_IS_DIRECTORY(objInfo.Attr.fMode))
                                         {
-                                            LogRel2(("Guest Control: Symbolic link '%s' -> '%s' (directory)\n",
+                                            LogRel(("Guest Control: Symbolic link '%s' -> '%s' (directory)\n",
                                                      strEntryAbs.c_str(), pszPathReal));
                                             if (mSourceSpec.fDirCopyFlags  & DirectoryCopyFlag_FollowLinks)
@@ -1307 +1307 @@
                                         else if (RTFS_IS_FILE(objInfo.Attr.fMode))
                                         {
-                                            LogRel2(("Guest Control: Symbolic link '%s' -> '%s' (file)\n",
+                                            LogRel(("Guest Control: Symbolic link '%s' -> '%s' (file)\n",
                                                      strEntryAbs.c_str(), pszPathReal));
                                             if (mSourceSpec.fFileCopyFlags & DirectoryCopyFlag_FollowLinks)
@@ -1317 +1317 @@
 
                                     if (RT_FAILURE(vrc))
-                                        LogRel2(("Guest Control: Unable to query symbolic link info for '%s', rc=%Rrc\n",
+                                        LogRel(("Guest Control: Unable to query symbolic link info for '%s', rc=%Rrc\n",
                                                  pszPathReal, vrc));
                                 }
                                 else
                                 {
-                                    LogRel2(("Guest Control: Unable to resolve symlink for '%s', rc=%Rrc\n", strPathAbs.c_str(), vrc));
+                                    LogRel(("Guest Control: Unable to resolve symlink for '%s', rc=%Rrc\n", strPathAbs.c_str(), vrc));
                                     if (vrc == VERR_FILE_NOT_FOUND) /* Broken symlink, skip. */
                                         vrc = VINF_SUCCESS;
@@ -1532 +1532 @@
 
                         default:
-                            LogRel2(("Guest Control: Warning: Unknown guest file system type %#x for source \"%s\", skipping\n",
+                            LogRel(("Guest Control: Warning: Unknown guest file system type %#x for source \"%s\", skipping\n",
                                      itSrc->enmType, strSrc.c_str()));
                             break;
@@ -1975 +1975 @@
 
                         default:
-                            LogRel2(("Guest Control: Warning: Unknown guest host system type %#x for source \"%s\", skipping\n",
+                            LogRel(("Guest Control: Warning: Unknown guest host system type %#x for source \"%s\", skipping\n",
                                      itSrc->enmType, strSrc.c_str()));
                             break;
@@ -2233 +2233 @@
                     case RTFS_TYPE_DIRECTORY:
                     {
-                        LogRel2(("Guest Control: Copying directory '%s' from host to '%s' on guest ...\n", strSrcAbs.c_str(), strDstAbs.c_str()));
+                        LogRel(("Guest Control: Copying directory '%s' from host to '%s' on guest ...\n", strSrcAbs.c_str(), strDstAbs.c_str()));
                         if (!pList->mSourceSpec.fDryRun)
                             vrc = directoryCreateOnGuest(strDstAbs, fDirMode, DirectoryCreateFlag_None,
@@ -2248 +2248 @@
 
                     default:
-                        LogRel2(("Guest Control: Warning: Host file system type 0x%x for '%s' is not supported, skipping\n",
+                        LogRel(("Guest Control: Warning: Host file system type 0x%x for '%s' is not supported, skipping\n",
                                  pEntry->fMode & RTFS_TYPE_MASK, strSrcAbs.c_str()));
                         break;