Changeset 6959 in vbox for trunk/src/VBox/Additions/x11

Timestamp:

Feb 14, 2008 3:42:32 PM (17 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

28126

Message:

Additions/X11: minor logging corrections

Location:

trunk/src/VBox/Additions/x11/xclient

Files:

• seamless-host.cpp (modified) (8 diffs)
• seamless-host.h (modified) (3 diffs)
• seamless-x11.cpp (modified) (4 diffs)
• seamless.h (modified) (2 diffs)

trunk/src/VBox/Additions/x11/xclient/seamless-host.cpp

@@ -36 +36 @@
     if (mRunning)  /* Assertion */
     {
-        LogRel(("VBoxService: seamless service started twice!\n"));
+        LogRel(("VBoxClient: seamless service started twice!\n"));
         return VERR_INTERNAL_ERROR;
     }
@@ -42 +42 @@
     if (RT_FAILURE(rc))
     {
-        LogRel(("VBoxService (seamless): failed to set the guest IRQ filter mask, rc=%Rrc\n", rc));
+        LogRel(("VBoxClient (seamless): failed to set the guest IRQ filter mask, rc=%Rrc\n", rc));
     }
     rc = VbglR3SeamlessSetCap(true);
     if (RT_SUCCESS(rc))
     {
-        Log(("VBoxService: enabled seamless capability on host.\n"));
+        Log(("VBoxClient: enabled seamless capability on host.\n"));
         rc = mThread.start();
         if (RT_SUCCESS(rc))
@@ -55 +55 @@
         else
         {
-            LogRel(("VBoxService: failed to start seamless event thread, rc=%Rrc.  Disabled seamless capability on host again.\n", rc));
+            LogRel(("VBoxClient: failed to start seamless event thread, rc=%Rrc.  Disabled seamless capability on host again.\n", rc));
             VbglR3SeamlessSetCap(false);
         }
@@ -61 +61 @@
     if (RT_FAILURE(rc))
     {
-        Log(("VBoxService (seamless): failed to enable seamless capability on host, rc=%Rrc\n", rc));
+        Log(("VBoxClient (seamless): failed to enable seamless capability on host, rc=%Rrc\n", rc));
     }
     return rc;
@@ -71 +71 @@
     if (!mRunning)  /* Assertion */
     {
-        LogRel(("VBoxService: tried to stop seamless service which is not running!\n"));
+        LogRel(("VBoxClient: tried to stop seamless service which is not running!\n"));
         return;
     }
@@ -98 +98 @@
               making the guest desktop transparent. */
     #ifdef DEBUG
-                LogRelFunc(("VMMDev_Seamless_Visible_Region request received (VBoxService).\n"));
+                LogRelFunc(("VMMDev_Seamless_Visible_Region request received (VBoxClient).\n"));
     #endif
                 mState = ENABLE;
@@ -105 +105 @@
             case VMMDev_Seamless_Host_Window:
             /* One host window represents one guest window.  Not yet implemented. */
-                LogRelFunc(("Warning: VMMDev_Seamless_Host_Window request received (VBoxService).\n"));
+                LogRelFunc(("Warning: VMMDev_Seamless_Host_Window request received (VBoxClient).\n"));
                 /* fall through to default */
             default:
-                LogRelFunc(("Warning: unsupported VMMDev_Seamless request %d received (VBoxService).\n", newMode));
+                LogRelFunc(("Warning: unsupported VMMDev_Seamless request %d received (VBoxClient).\n", newMode));
                 /* fall through to case VMMDev_Seamless_Disabled */
             case VMMDev_Seamless_Disabled:
     #ifdef DEBUG
-                LogRelFunc(("VMMDev_Seamless_Disabled set (VBoxService).\n"));
+                LogRelFunc(("VMMDev_Seamless_Disabled set (VBoxClient).\n"));
     #endif
                 mState = DISABLE;
@@ -120 +120 @@
     else
     {
-        LogFunc(("VbglR3SeamlessWaitEvent returned %Rrc (VBoxService)\n", rc));
+        LogFunc(("VbglR3SeamlessWaitEvent returned %Rrc (VBoxClient)\n", rc));
     }
     return rc;

trunk/src/VBox/Additions/x11/xclient/seamless-host.h

@@ -123 +123 @@
         if (mObserver != 0)  /* Assertion */
         {
-            LogRel(("VBoxService: ERROR: attempt to initialise seamless host object twice!\n"));
+            LogRel(("VBoxClient: ERROR: attempt to initialise seamless host object twice!\n"));
             return VERR_INTERNAL_ERROR;
         }
@@ -151 +151 @@
 
     VBoxGuestSeamlessHost(void) : mThreadFunction(this),
-                                  mThread(&mThreadFunction, 0, RTTHREADTYPE_MAIN_WORKER,
+                                  mThread(&mThreadFunction, 0, RTTHREADTYPE_MSG_PUMP,
                                   RTTHREADFLAGS_WAITABLE, "Host events")
     {
@@ -163 +163 @@
         if (mRunning)  /* Assertion */
         {
-            LogRel(("VBoxService: seamless host object still running!  Stopping...\n"));
+            LogRel(("VBoxClient: seamless host object still running!  Stopping...\n"));
             try
             {

trunk/src/VBox/Additions/x11/xclient/seamless-x11.cpp

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2007 innotek GmbH
+ * Copyright (C) 2008 innotek GmbH
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -72 +72 @@
     if (0 != mObserver)  /* Assertion */
     {
-        LogRel(("VBoxService: ERROR: attempt to initialise seamless guest object twice!\n"));
+        LogRel(("VBoxClient: ERROR: attempt to initialise seamless guest object twice!\n"));
         return VERR_INTERNAL_ERROR;
     }
     if (!mDisplay.init())
     {
-        LogRel(("VBoxService: seamless guest object failed to acquire a connection to the display.\n"));
+        LogRel(("VBoxClient: seamless guest object failed to acquire a connection to the display.\n"));
         return VERR_ACCESS_DENIED;
     }
@@ -83 +83 @@
                            NET_CLIENT_LIST, &nItems).get())
     {
-        LogRel(("VBoxService: _NET_CLIENT_LIST property not supported by guest window manager.  Seamless mode will not be enabled.\n"));
+        LogRel(("VBoxClient: _NET_CLIENT_LIST property not supported by guest window manager.  Seamless mode will not be enabled.\n"));
     }
     mObserver = pObserver;
@@ -167 +167 @@
     if (!XGetWindowAttributes(mDisplay, hWin, &winAttrib))
     {
-        LogRelFunc(("VBoxService: Failed to get the window attributes for window %d\n", hWin));
+        LogRelFunc(("VBoxClient: Failed to get the window attributes for window %d\n", hWin));
         return;
     }

trunk/src/VBox/Additions/x11/xclient/seamless.h

@@ -142 +142 @@
         if (isInitialised)  /* Assertion */
         {
-            LogRelFunc(("error: called a second time! (VBoxService)\n"));
+            LogRelFunc(("error: called a second time! (VBoxClient)\n"));
             rc = VERR_INTERNAL_ERROR;
         }
@@ -163 +163 @@
         if (RT_FAILURE(rc))
         {
-            LogFunc(("returning %Rrc (VBoxService)\n", rc));
+            LogFunc(("returning %Rrc (VBoxClient)\n", rc));
         }
         return rc;