Changeset 36580 in vbox

Timestamp:

Apr 6, 2011 1:52:10 PM (14 years ago)

Author:

vboxsync

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

71020

Message:

Trunk: forward ported r70973: Additions/common/VBoxService: the timesync service should not fail if Guest Properties are not available

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox/Additions/common/VBoxService/VBoxServiceTimeSync.cpp (modified) (1 diff)
• src/VBox/GuestHost/OpenGL/LICENSE (modified) (1 prop)
• src/VBox/HostServices/SharedOpenGL/LICENSE (modified) (1 prop)
• src/VBox/Main/glue/tests (modified) (1 prop)
• src/VBox/Main/glue/tests/Makefile.kmk (modified) (1 prop)
• src/VBox/Main/include/MediumLock.h (modified) (1 prop)
• src/VBox/Runtime/testcase/tstRTMemEf.cpp (modified) (1 prop)

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

@@ -165 +165 @@
     if (RT_FAILURE(rc))
     {
-        VBoxServiceError("VBoxServiceTimeSyncPreInit: Failed to connect to the guest property service! Error: %Rrc\n", rc);
+        if (rc == VERR_HGCM_SERVICE_NOT_FOUND) /* Host service is not available. */
+        {
+            VBoxServiceVerbose(0, "VMInfo: Guest property service is not available, skipping\n");
+            rc = VINF_SUCCESS;
+        }
+        else
+            VBoxServiceError("Failed to connect to the guest property service! Error: %Rrc\n", rc);
     }
     else