Changeset 86078 in vbox for trunk/src/VBox/Additions/x11/VBoxClient

Timestamp:

Sep 9, 2020 4:04:00 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9637. Using DRM client on 32 bit vms

File:

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

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

@@ -744 +744 @@
 }
 
+static bool startDRMClient()
+{
+    char* argv[] = {NULL};
+    char* env[] = {NULL};
+    char szDRMClientPath[RTPATH_MAX];
+    RTPathExecDir(szDRMClientPath, RTPATH_MAX);
+    RTPathAppend(szDRMClientPath, RTPATH_MAX, "VBoxDRMClient");
+    VBClLogInfo("Starting DRM client.\n");
+    int rc = execve(szDRMClientPath, argv, env);
+    if (rc == -1)
+        VBClLogFatalError("execve for % returns the following error %d %s\n", szDRMClientPath, errno, strerror(errno));
+    /* This is reached only when execve fails. */
+    return false;
+}
+
 static bool init()
 {
@@ -753 +768 @@
     }
     if (isXwayland())
-    {
-        char* argv[] = {NULL};
-        char* env[] = {NULL};
-        char szDRMClientPath[RTPATH_MAX];
-        RTPathExecDir(szDRMClientPath, RTPATH_MAX);
-        RTPathAppend(szDRMClientPath, RTPATH_MAX, "VBoxDRMClient");
-        int rc = execve(szDRMClientPath, argv, env);
-        if (rc == -1)
-            VBClLogFatalError("execve for % returns the following error %d %s\n", szDRMClientPath, errno, strerror(errno));
-        /* This is reached only when execve fails. */
-        return false;
-    }
+        return startDRMClient();
+
     x11Connect();
     if (x11Context.pDisplay == NULL)
@@ -1225 +1230 @@
 {
     XGrabServer(x11Context.pDisplay);
-    /* In 32-bit guests GAs build on our release machines causes an xserver lock during vmware_ctrl extention
-     * if we do the call withing XGrab. So we disabled this call for 32-bit GAs. */
-#if ARCH_BITS != 32
     if (x11Context.fWmwareCtrlExtention)
         callVMWCTRL(paOutputs);
-#endif
+
 #ifdef WITH_DISTRO_XRAND_XINERAMA
     x11Context.pScreenResources = XRRGetScreenResources(x11Context.pDisplay, x11Context.rootWindow);
@@ -1326 +1328 @@
 {
     RT_NOREF(ppInterface, fDaemonised);
+
+    /* In 32-bit guests GAs build on our release machines causes an xserver hang.
+     * So for 32-bit GAs we use our DRM client. */
+#if ARCH_BITS == 32
+    startDRMClient();
+    return VERR_NOT_AVAILABLE;
+#endif
+
     if (!init())
         return VERR_NOT_AVAILABLE;