Attachment 489411 Details for Bug 625041

[patch] Enable hardware access during vmmouse preinit.

xf86-input-vmmouse-hwaccess.diff (text/plain), 1.12 KB, created by Michal Srb on 2012-05-03 14:59:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Srb

Created: 2012-05-03 14:59:02 UTC

Size: 1.12 KB

patch

obsolete

>Enable hardware access during preinit.
>Inspired by xf86-input-keyboard.
>
>diff -ur a/src/vmmouse.c b/src/vmmouse.c
>--- a/src/vmmouse.c	2010-12-08 10:02:20.000000000 +0100
>+++ b/src/vmmouse.c	2012-05-03 16:37:34.342944000 +0200
>@@ -65,6 +65,7 @@
> #include "xf86Xinput.h"
> #include "xf86_OSproc.h"
> #include "xf86OSmouse.h"
>+#include "xf86Priv.h"
> #include "compiler.h"
> 
> #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
>@@ -320,6 +321,16 @@
> #endif
> 
>    /*
>+    * enable hardware access
>+    */
>+   if (!xorgHWAccess) {
>+      if (xf86EnableIO())
>+          xorgHWAccess = TRUE;
>+      else
>+          return NULL;
>+  }
>+
>+   /*
>     * try to enable vmmouse here
>     */
>    if (!VMMouseClient_Enable()) {
>@@ -380,6 +391,16 @@
>    VMMousePrivPtr mPriv = NULL;
>    int rc = Success;
> 
>+   /* Enable hardware access. */
>+   if (!xorgHWAccess) {
>+      if (xf86EnableIO())
>+          xorgHWAccess = TRUE;
>+      else {
>+          rc = BadValue;
>+          goto error;
>+      }
>+  }
>+
> #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 12
>    /* For ABI < 12, we need to return the wrapped driver's pInfo (see
>     * above). ABI 12, we call NIDR and are done */

Actions: View | Diff

Attachments on bug 625041: 378001 | 398872 | 398903 | 398904 | 398908 | 398913 | 398920 | 489411