xserver-xorg-input-vmmouse: Changes to 'debian-unstable'
ChangeLog | 49 +++++++++++++++++++++++++++++++++++++++++
configure.ac | 6 ++---
debian/changelog | 8 ++++++
src/vmmouse.c | 21 +++++++++++++++++
tools/69-xorg-vmmouse.rules.in | 2 -
5 files changed, 82 insertions(+), 4 deletions(-)
New commits:
commit 8e50791ac87c2bccb38958b8ec6bd19de7a984b8
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Tue May 22 16:35:43 2012 -0400
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 0e850d9..b65c479 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,52 @@
+commit 3a828d876772d05577b9372e8f6dc068794f4704
+Author: Jakob Bornecrantz <jakob@vmware.com>
+Date: Tue May 22 20:14:25 2012 +0200
+
+ vmmouse 12.8.0
+
+ Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
+
+commit 2a321a39350aa020a8103813bed61ff559088195
+Author: Zack Rusin <zackr@vmware.com>
+Date: Thu May 10 19:55:01 2012 -0400
+
+ Revert "Adjust the kernel name in the udev file."
+
+ This reverts commit 189dc266a66485d48303acbc1a4fbe4642c75e9f.
+
+ It seems that for some reason the device routing is breaking with this.
+ Possibly related to Win7 x64 hosts because it's not reproducible on
+ GNU/Linux hosts. Semantially we'd still like to match only on mouse
+ kernel but for the time being this seems to cause more problems
+ than it solves. Hence the revert.
+
+commit 55efac85ca9bd2041240ca29316ca716ddc2185d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Tue May 1 16:20:59 2012 -0400
+
+ config: replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Moved up in the autoconf init section.
+ It has been removed from Automake 1.12.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+ Signed-off-by: Zack Rusin <zackr@vmware.com>
+
+commit 840dcbf947dd9d1383777c3cd811ff680cef5f16
+Author: Michal Srb <msrb@suse.com>
+Date: Thu May 3 17:55:24 2012 +0200
+
+ Enable hardware access during vmmouse preinit.
+
+ Vmmouse driver uses outl calls but never requests hardware access.
+ In case there are no other drivers that requests it, vmmouse
+ initialization will fail. (Found on KVM virtual machine with fbdev
+ graphics driver and vmmouse input driver.)
+
+ Request hardware access in same way xf86-input-keyboard does.
+
+ Signed-off-by: Zack Rusin <zackr@vmware.com>
+
commit e925b2e6e9d548db5a6646a76d513fb6881f69b4
Author: Zack Rusin <zackr@vmware.com>
Date: Thu Mar 8 09:51:48 2012 -0500
diff --git a/debian/changelog b/debian/changelog
index add6cda..30cfa88 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-input-vmmouse (1:12.9.0-1) UNRELEASED; urgency=low
+
+ * New upstream bugfix release.
+ - Fixes erratic mouse behavior with a Windows x64 host. (LP: #996821)
+ - Fixes initialization when no other drivers request hardware access.
+
+ -- Robert Hooker <sarvatt@ubuntu.com> Tue, 22 May 2012 16:30:11 -0400
+
xserver-xorg-input-vmmouse (1:12.8.0-1) unstable; urgency=low
* New upstream release.
commit 3a828d876772d05577b9372e8f6dc068794f4704
Author: Jakob Bornecrantz <jakob@vmware.com>
Date: Tue May 22 20:14:25 2012 +0200
vmmouse 12.8.0
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
diff --git a/configure.ac b/configure.ac
index 33fbd64..d2fb0b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
- [12.8.0],
+ [12.9.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit 2a321a39350aa020a8103813bed61ff559088195
Author: Zack Rusin <zackr@vmware.com>
Date: Thu May 10 19:55:01 2012 -0400
Revert "Adjust the kernel name in the udev file."
This reverts commit 189dc266a66485d48303acbc1a4fbe4642c75e9f.
It seems that for some reason the device routing is breaking with this.
Possibly related to Win7 x64 hosts because it's not reproducible on
GNU/Linux hosts. Semantially we'd still like to match only on mouse
kernel but for the time being this seems to cause more problems
than it solves. Hence the revert.
diff --git a/tools/69-xorg-vmmouse.rules.in b/tools/69-xorg-vmmouse.rules.in
index 9af3938..602afb6 100644
--- a/tools/69-xorg-vmmouse.rules.in
+++ b/tools/69-xorg-vmmouse.rules.in
@@ -1 +1 @@
-ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042 AUX port", KERNEL=="mouse[0-9]*", PROGRAM="__BIN_PREFIX__/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse"
+ACTION=="add|change", ENV{ID_INPUT_MOUSE}=="?*", ATTRS{description}=="i8042 AUX port", KERNEL=="event[0-9]*", PROGRAM="__BIN_PREFIX__/vmmouse_detect", ENV{ID_INPUT.tags}="vmmouse"
commit 55efac85ca9bd2041240ca29316ca716ddc2185d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Tue May 1 16:20:59 2012 -0400
config: replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Moved up in the autoconf init section.
It has been removed from Automake 1.12.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Zack Rusin <zackr@vmware.com>
diff --git a/configure.ac b/configure.ac
index 5938ca7..33fbd64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,8 @@ AC_INIT([xf86-input-vmmouse],
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_AUX_DIR(.)
+AC_CONFIG_HEADERS([config.h])
+
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -41,8 +43,6 @@ XORG_DEFAULT_OPTIONS
DRIVER_NAME=vmmouse
AC_SUBST([DRIVER_NAME])
-AM_CONFIG_HEADER([config.h])
-
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
commit 840dcbf947dd9d1383777c3cd811ff680cef5f16
Author: Michal Srb <msrb@suse.com>
Date: Thu May 3 17:55:24 2012 +0200
Enable hardware access during vmmouse preinit.
Vmmouse driver uses outl calls but never requests hardware access.
In case there are no other drivers that requests it, vmmouse
initialization will fail. (Found on KVM virtual machine with fbdev
graphics driver and vmmouse input driver.)
Request hardware access in same way xf86-input-keyboard does.
Signed-off-by: Zack Rusin <zackr@vmware.com>
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 285ba26..7778923 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -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
@@ -339,6 +340,16 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
#endif
/*
+ * enable hardware access
+ */
+ if (!xorgHWAccess) {
+ if (xf86EnableIO())
+ xorgHWAccess = TRUE;
+ else
+ return NULL;
+ }
+
+ /*
* try to enable vmmouse here
*/
if (!VMMouseClient_Enable()) {
@@ -399,6 +410,16 @@ VMMousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
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 */
Reply to: