Hello community, here is the log from the commit of package xorg-x11-driver-input for openSUSE:Factory checked in at Wed Nov 10 19:07:33 CET 2010. -------- --- xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-10-30 21:42:01.000000000 +0200 +++ xorg-x11-driver-input/xorg-x11-driver-input.changes 2010-11-08 16:03:54.000000000 +0100 @@ -1,0 +2,19 @@ +Mon Nov 8 14:57:59 UTC 2010 - sndirsch@novell.com + +- merged xf86-input-vmmouse-iopl.diff/ + xf86-input-vmmouse-iopl-driver.diff and removed fprintfs + +------------------------------------------------------------------- +Sun Nov 7 21:14:34 UTC 2010 - sndirsch@novell.com + +- xf86-input-vmmouse-iopl-driver.diff + * Use fprintf(...) instead of VMwareLog((...)) for debug messages. + +------------------------------------------------------------------- +Sun Nov 7 12:05:53 UTC 2010 - sndirsch@novell.com + +- xf86-input-vmmouse-iopl-driver.diff + * switch to I/O privilege level 3 also for the driver itself + (bnc #625041) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-input.spec ++++++ --- /var/tmp/diff_new_pack.YhiInj/_old 2010-11-10 18:58:47.000000000 +0100 +++ /var/tmp/diff_new_pack.YhiInj/_new 2010-11-10 18:58:47.000000000 +0100 @@ -23,7 +23,7 @@ BuildRequires: Mesa-devel pkgconfig udev xorg-x11-proto-devel xorg-x11-server-sdk Url: http://xorg.freedesktop.org/ Version: 7.5 -Release: 16 +Release: 17 License: MIT License (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -117,7 +117,7 @@ rm -rf xf86-input-vmmouse* %else pushd xf86-input-vmmouse-* -%patch47 -p1 -R +%patch47 -p1 %endif %build ++++++ xf86-input-vmmouse-iopl.diff ++++++ --- /var/tmp/diff_new_pack.YhiInj/_old 2010-11-10 18:58:47.000000000 +0100 +++ /var/tmp/diff_new_pack.YhiInj/_new 2010-11-10 18:58:47.000000000 +0100 @@ -1,22 +1,67 @@ -commit bcdec3d0cd4434770cd841c33c030e0d7203881f -Author: Philip Langdale <philipl@fido2.homeip.net> -Date: Thu Oct 23 23:35:28 2008 -0700 - - Remove call to iopl(). It's not portable and isn't necessary. - -diff --git a/tools/vmmouse_detect.c b/tools/vmmouse_detect.c -index e5f14a3..0dd4827 100644 ---- a/tools/vmmouse_detect.c -+++ b/tools/vmmouse_detect.c -@@ -47,11 +47,6 @@ main(void) - signal(SIGSEGV, segvCB); - - #if defined __i386__ || defined __x86_64__ -- /* -- * To access i/o ports above 0x3ff, we need to be in iopl(3). -- */ -- -- iopl(3); - if (VMMouseClient_Enable()) { - VMMouseClient_Disable(); - return 0; +diff --git a/shared/vmmouse_proto.c b/shared/vmmouse_proto.c +index b50e071..263bb36 100644 +--- a/shared/vmmouse_proto.c ++++ b/shared/vmmouse_proto.c +@@ -33,6 +33,7 @@ + */ + + ++#include <sys/io.h> + #include "vmmouse_proto.h" + + +@@ -119,6 +120,31 @@ VMMouseProtoInOut(VMMouseProtoCmd *cmd) // IN/OUT + #endif + } + ++/* ++ *----------------------------------------------------------------------------- ++ * ++ * VMMouseGetIOPL -- ++ * ++ * Helper to figure out the current I/O privilege level (idea by ++ * Jiri Kosina <jkosina@suse.cz>) ++ * ++ * Results: ++ * Returns I/O privilege level ++ * ++ * Side effects: ++ * None ++ * ++ *----------------------------------------------------------------------------- ++ */ ++ ++int ++VMMouseGetIOPL() ++{ ++ unsigned long eflags; ++ ++ asm ("pushf\n\tpop %0" : "=r" (eflags)); ++ return (eflags >> 12) & 3; ++} + + /* + *----------------------------------------------------------------------------- +@@ -140,8 +166,22 @@ VMMouseProtoInOut(VMMouseProtoCmd *cmd) // IN/OUT + void + VMMouseProto_SendCmd(VMMouseProtoCmd *cmd) // IN/OUT + { ++ int cpl; ++ + cmd->in.magic = VMMOUSE_PROTO_MAGIC; + cmd->in.port = VMMOUSE_PROTO_PORT; + ++#if defined __i386__ || defined __x86_64__ ++ cpl = VMMouseGetIOPL(); ++ /* ++ * To access i/o ports above 0x3ff, we need to be in iopl(3). ++ */ ++ iopl(3); ++#endif ++ + VMMouseProtoInOut(cmd); ++ ++#if defined __i386__ || defined __x86_64__ ++ iopl(cpl); ++#endif + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org