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

Timestamp:

Jul 3, 2017 1:33:55 PM (7 years ago)

Author:

vboxsync

Message:

bugref:8533: Additions/x11: fully support VMSVGA
Revert r116031: Allow VBoxClient services to daemonise without providing a pidfile; and r116032: Use AcquireGuestCaps in the vmsvga VBoxClient service and do not create a pidfile.

Location:

trunk/src/VBox/Additions/x11/VBoxClient

Files:

• VBoxClient.h (modified) (2 diffs)
• display-svga.cpp (modified) (3 diffs)
• main.cpp (modified) (1 diff)

trunk/src/VBox/Additions/x11/VBoxClient/VBoxClient.h

@@ -42 +42 @@
 struct VBCLSERVICE
 {
-    /** Get the services default path to pidfile, relative to $HOME.  Optional */
+    /** Get the services default path to pidfile, relative to $HOME */
     /** @todo Should this also have a component relative to the X server number?
      */
@@ -55 +55 @@
      */
     void (*cleanup)(struct VBCLSERVICE **ppInterface);
-    /** Should the service daemonise?  Only checked if @a getPidFilePath is NULL. */
-    /** @todo clean this up along with the pidfile handling. */
-    bool fDaemonise;
 };
 

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

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

trunk/src/VBox/Additions/x11/VBoxClient/main.cpp

@@ -329 +329 @@
         if (RT_FAILURE(rc))
             VBClFatalError(("Creating PID file path failed: %Rrc\n", rc));
-    }
-    if ((*g_pService)->getPidFilePath || (*g_pService)->fDaemonise)
-    {
         if (fDaemonise)
             rc = VbglR3Daemonize(false /* fNoChDir */, false /* fNoClose */, fRespawn, &cRespawn);