Changeset 38411 in vbox

Timestamp:

Aug 11, 2011 9:40:35 AM (14 years ago)

Author:

vboxsync

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

73448

Message:

Additions/VBoxService: don't fail if VbglR3GetSessionId() does not work

File:

• trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp (modified) (2 diffs)

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2010 Oracle Corporation
+ * Copyright (C) 2006-2011 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -568 +568 @@
 
     rc =  VbglR3GetSessionId(&g_idSession);
-    AssertRCReturn(rc, rc);
+    if (RT_FAILURE(rc))
+    {
+        if (rc == VERR_IO_GEN_FAILURE)
+            VBoxServiceVerbose(0, "PageSharing: Page sharing support is not available by the host\n");
+        else
+            VBoxServiceError("VBoxServicePageSharingInit: Failed with rc=%Rrc\n", rc);
+
+        rc = VERR_SERVICE_DISABLED;
+
+        RTSemEventMultiDestroy(g_PageSharingEvent);
+        g_PageSharingEvent = NIL_RTSEMEVENTMULTI;
+
+    }
 #endif
 
-    /* Never fail here. */
-    return VINF_SUCCESS;
+    return rc;
 }