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

Timestamp:

Aug 16, 2016 1:32:05 PM (8 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: improve check for kernel driver in vboxvideo X server driver so that it also works on NetBSD (and is more reliable elsewhere).

File:

• trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c (modified) (2 diffs)

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

@@ -94 +94 @@
 # include <stdlib.h>
 # include <string.h>
-# include <sys/stat.h>
-# define xf86stat stat
-# define xf86stat_s stat
-#else
-# include <xf86_ansic.h>
+# include <fcntl.h>
+# include <unistd.h>
 #endif
 
@@ -739 +736 @@
 {
     ScrnInfoPtr pScrn;
-    struct xf86stat_s sstat;
+    int drmFd;
 
     TRACE_ENTRY();
 
-    if (xf86stat("/dev/dri/card0", &sstat) == 0)
+    drmFd = open("/dev/dri/card0", O_RDWR, 0);
+    if (drmFd >= 0)
     {
         xf86Msg(X_INFO, "vboxvideo: kernel driver found, not loading.\n");
+        close(drmFd);
         return FALSE;
     }