Changeset 67320 in vbox for trunk/src/VBox/Additions

Timestamp:

Jun 9, 2017 1:18:12 PM (8 years ago)

Author:

vboxsync

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

116032

Message:

bugref:8533: Additions/x11: fully support VMSVGA
Use AcquireGuestCaps in the vmsvga VBoxClient service and do not create a pidfile.

This change makes the VBoxClient vmsvga service use the new AcquireGuestCaps
function in the R3 guest library, and stop creating a pidfile, but still
daemonise. The pidfile is no longer needed to prevent multiple copies of
the service from running due to the use of AcquireGuestCaps, and was not very
clean either, as the service running as root created it in the root home. If
we do decide to go back to creating pidfiles this needs to be fixed.

File:

• trunk/src/VBox/Additions/x11/VBoxClient/display-svga.cpp (modified) (3 diffs)

trunk/src/VBox/Additions/x11/VBoxClient/display-svga.cpp

@@ -321 +321 @@
 }
 
-static const char *getPidFilePath()
-{
-    return ".vboxclient-display-svga.pid";
-}
-
 static int run(struct VBCLSERVICE **ppInterface, bool fDaemonised)
 {
@@ -356 +351 @@
     if (RT_FAILURE(rc))
         VBClFatalError(("Failed to request display change events, rc=%Rrc\n", rc));
-    rc = VbglR3SetGuestCaps(VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0);
+    rc = VbglR3AcquireGuestCaps(VMMDEV_GUEST_SUPPORTS_GRAPHICS, 0, false);
+    if (rc == VERR_RESOURCE_BUSY)  /* Someone else has already acquired it. */
+        return VINF_SUCCESS;
     if (RT_FAILURE(rc))
         VBClFatalError(("Failed to register resizing support, rc=%Rrc\n", rc));
@@ -411 +408 @@
 struct VBCLSERVICE interface =
 {
-    getPidFilePath,
+    NULL,  /* No pidfile needed, as we use acquire capability for exclusion. */
     VBClServiceDefaultHandler, /* Init */
     run,
-    VBClServiceDefaultCleanup
+    VBClServiceDefaultCleanup,
+    true  /* fDaemonise */
 }, *pInterface = &interface;