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

Timestamp:

Sep 15, 2016 4:44:30 PM (8 years ago)

Author:

vboxsync

Message:

bugref:3810: X11 Guest Additions maintenance: X.Org vboxvideo should fail gracefully if the X server does not provide direct hardware access. Check this by trying to enable it and checking whether it succeeds.

File:

• trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c (modified) (1 diff)

trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

@@ -745 +745 @@
         xf86Msg(X_INFO, "vboxvideo: kernel driver found, not loading.\n");
         close(drmFd);
+        return FALSE;
+    }
+    /* It is safe to call this, as the X server enables I/O access before
+     * calling the probe call-backs. */
+    if (!xf86EnableIO())
+    {
+        xf86Msg(X_INFO, "vboxvideo: this driver requires direct hardware access.  You may wish to use the kernel driver instead.\n");
         return FALSE;
     }