Hello community,
here is the log from the commit of package xf86-input-vmmouse for
openSUSE:Factory checked in at 2014-06-10 14:37:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-input-vmmouse (Old)
and /work/SRC/openSUSE:Factory/.xf86-input-vmmouse.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-vmmouse"
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-input-vmmouse/xf86-input-vmmouse.changes
2014-06-02 07:04:13.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.xf86-input-vmmouse.new/xf86-input-vmmouse.changes
2014-06-10 14:37:47.000000000 +0200
@@ -1,0 +2,15 @@
+Tue May 27 10:07:09 UTC 2014 - [email protected]
+
+- U_Free-the-vmmouse-data-on-UnInit.patch:
+ Delete driver from xf86InputDevs list on UnInit().
+ Fixes crash during VT switch when reloading the devices
+ (bnc#879450).
+
+-------------------------------------------------------------------
+Tue May 27 10:06:28 UTC 2014 - [email protected]
+
+- u_Don-t-access-hardware-register-while-switched-away.patch:
+ Update patch to also take into account new ABI versions.
+ (bnc#877132).
+
+-------------------------------------------------------------------
New:
----
U_Free-the-vmmouse-data-on-UnInit.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-input-vmmouse.spec ++++++
--- /var/tmp/diff_new_pack.ybPukL/_old 2014-06-10 14:37:49.000000000 +0200
+++ /var/tmp/diff_new_pack.ybPukL/_new 2014-06-10 14:37:49.000000000 +0200
@@ -32,6 +32,7 @@
Source0:
http://xorg.freedesktop.org/releases/individual/driver/%{name}-%{version}.tar.bz2
Patch1: u_Revert-Remove-call-to-iopl-.-It-s-not-portable-and-i.patch
Patch2: u_Don-t-access-hardware-register-while-switched-away.patch
+Patch3: U_Free-the-vmmouse-data-on-UnInit.patch
BuildRequires: pkg-config
# For directory ownership
BuildRequires: udev
@@ -57,6 +58,7 @@
%setup -q
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
%configure --with-xorg-conf-dir=/etc/X11/xorg.conf.d
--with-udev-rules-dir=%{_udevrulesdir}
++++++ U_Free-the-vmmouse-data-on-UnInit.patch ++++++
From: Peter Hutterer <[email protected]>
Date: Fri Feb 1 11:52:53 2013 +1000
Subject: [PATCH]Free the vmmouse data on UnInit
Patch-mainline: Upstream
Git-commit: 8cb6254ad3068537e74faaf80b9e346e525ea92d
Git-repo: git://anongit.freedesktop.org/git/xorg/driver/xf86-input-vmmouse
References: bnc#879450
Signed-off-by: Egbert Eich <[email protected]>
xf86DeleteInput() will free pInfo->private, but not the one hanging off
that.
Signed-off-by: Peter Hutterer <[email protected]>
Tested-by: Zack Rusin <[email protected]>
---
src/vmmouse.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/vmmouse.c b/src/vmmouse.c
index bb450ff..cac8306 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -807,7 +807,14 @@ MouseCommonOptions(InputInfoPtr pInfo)
static void
VMMouseUnInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
{
+ MouseDevPtr pMse = pInfo->private;
+ VMMousePrivPtr mPriv = (VMMousePrivPtr)pMse->mousePriv;
+
xf86Msg(X_INFO, "VMWARE(0): VMMouseUnInit\n");
+
+ free(mPriv);
+
+ xf86DeleteInput(pInfo, flags);
}
++++++ u_Don-t-access-hardware-register-while-switched-away.patch ++++++
--- /var/tmp/diff_new_pack.ybPukL/_old 2014-06-10 14:37:49.000000000 +0200
+++ /var/tmp/diff_new_pack.ybPukL/_new 2014-06-10 14:37:49.000000000 +0200
@@ -83,3 +83,24 @@
}
if (!(pInfo = xf86AllocateInput(drv, 0))) {
+@@ -427,12 +427,14 @@ VMMousePreInit(InputDriverPtr drv, InputInfoPtr pInfo,
int flags)
+ #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 */
+- if (!VMMouseClient_Enable()) {
+- xf86Msg(X_ERROR, "VMWARE(0): vmmouse enable failed\n");
+- return VMMouseInitPassthru(drv, pInfo, flags);
+- } else {
+- xf86Msg(X_INFO, "VMWARE(0): vmmouse is available\n");
+- VMMouseClient_Disable();
++ if (xf86VTOwner()) {
++ if (!VMMouseClient_Enable()) {
++ xf86Msg(X_ERROR, "VMWARE(0): vmmouse enable failed\n");
++ return VMMouseInitPassthru(drv, pInfo, flags);
++ } else {
++ xf86Msg(X_INFO, "VMWARE(0): vmmouse is available\n");
++ VMMouseClient_Disable();
++ }
+ }
+ #endif
+
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
