Changeset 29202 in vbox for trunk/src

Timestamp:

May 7, 2010 12:38:59 PM (15 years ago)

Author:

vboxsync

Message:

VBoxService: Don't terminate if some HGCM host service is not available on the host.

Location:

trunk/src/VBox/Additions/common/VBoxService

Files:

• VBoxService.cpp (modified) (1 diff)
• VBoxServiceControl.cpp (modified) (4 diffs)

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

@@ -310 +310 @@
             if (RT_FAILURE(rc))
             {
-                VBoxServiceError("Service '%s' failed to initialize: %Rrc\n",
-                                 g_aServices[j].pDesc->pszName, rc);
-                return rc;
+                /*
+                 * If a service uses some sort of HGCM host service
+                 * which is not available on the host (maybe because the host
+                 * is using an older VBox version), just disable that service
+                 * here.
+                 */
+                if (rc == VERR_HGCM_SERVICE_NOT_FOUND)
+                {
+                    g_aServices[j].fEnabled = false;
+                    VBoxServiceVerbose(0, "Service '%s' was disabled (because %Rrc)\n", 
+                                       g_aServices[j].pDesc->pszName, rc);
+                }
+                else
+                {
+                    VBoxServiceError("Service '%s' failed to initialize: %Rrc\n",
+                                     g_aServices[j].pDesc->pszName, rc);
+                    return rc;
+                }
             }
         }

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

@@ -81 +81 @@
     rc = VbglR3GuestCtrlConnect(&g_GuestControlSvcClientID);
     if (RT_SUCCESS(rc))
+    {
         VBoxServiceVerbose(3, "Control: Service Client ID: %#x\n", g_GuestControlSvcClientID);
+
+        /* Init thread list. */
+        RTListInit(&g_GuestControlExecThreads);
+    }
     else
     {
-        VBoxServiceError("Control: Failed to connect to the guest control service! Error: %Rrc\n", rc);
+        if (rc == VERR_HGCM_SERVICE_NOT_FOUND) /* Host service is not available; that's not fatal. */
+            VBoxServiceVerbose(0, "Guest control service is not available\n");
+        else
+            VBoxServiceError("Control: Failed to connect to the guest control service! Error: %Rrc\n", rc);
         RTSemEventMultiDestroy(g_hControlEvent);
         g_hControlEvent = NIL_RTSEMEVENTMULTI;
     }
-
-    /* Init thread list. */
-    RTListInit(&g_GuestControlExecThreads);
     return rc;
 }
@@ -147 +152 @@
     }
 
-    VBoxServiceVerbose(4, "Control: VBoxServiceControlHandleCmdStartProcess returned with %Rrc\n", rc);
+    VBoxServiceVerbose(3, "Control: VBoxServiceControlHandleCmdStartProcess returned with %Rrc\n", rc);
     return rc;
 }
@@ -210 +215 @@
             rc = VERR_NOT_FOUND; /* PID not found! */
     }
-    VBoxServiceVerbose(4, "Control: VBoxServiceControlHandleCmdGetOutput returned with %Rrc\n", rc);
+    VBoxServiceVerbose(3, "Control: VBoxServiceControlHandleCmdGetOutput returned with %Rrc\n", rc);
     return rc;
 }
@@ -236 +241 @@
         uint32_t uMsg;
         uint32_t uNumParms;
-        VBoxServiceVerbose(4, "Control: Waiting for host msg ...\n");
+        VBoxServiceVerbose(3, "Control: Waiting for host msg ...\n");
         rc = VbglR3GuestCtrlGetHostMsg(g_GuestControlSvcClientID, &uMsg, &uNumParms, 1000 /* 1s timeout */);
         if (RT_FAILURE(rc))