From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1LAQJ6-0007uF-Mm for qemu-devel@nongnu.org; Wed, 10 Dec 2008 09:44:56 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1LAQJ2-0007sM-TY for qemu-devel@nongnu.org; Wed, 10 Dec 2008 09:44:56 -0500 Received: from [199.232.76.173] (port=45851 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1LAQJ2-0007s8-8Y for qemu-devel@nongnu.org; Wed, 10 Dec 2008 09:44:52 -0500 Received: from mail-qy0-f20.google.com ([209.85.221.20]:51376) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1LAQJ0-0003rW-Mu for qemu-devel@nongnu.org; Wed, 10 Dec 2008 09:44:51 -0500 Received: by qyk13 with SMTP id 13so949640qyk.10 for ; Wed, 10 Dec 2008 06:44:49 -0800 (PST) Message-ID: <493FD5DD.2020704@codemonkey.ws> Date: Wed, 10 Dec 2008 08:44:45 -0600 From: Anthony Liguori MIME-Version: 1.0 Subject: Re: [Qemu-devel] [PATCH] evdev_keycode_map References: <20081209224235.GA12529@kos.to> <20081210112845.GC22446@redhat.com> In-Reply-To: <20081210112845.GC22446@redhat.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: "Daniel P. Berrange" , qemu-devel@nongnu.org Cc: Dustin Kirkland Daniel P. Berrange wrote: > On Wed, Dec 10, 2008 at 12:42:35AM +0200, Riku Voipio wrote: > >> On Wed, Sep 24, 2008 at 06:10:27PM -0500, Dustin Kirkland wrote: >> >>> I'm attaching a patch that we have applied to the qemu implementation >>> inside of the kvm package in Ubuntu. >>> >> Anyone know why this patch is still lingering? >> >> >>> --- kvm-72+dfsg/qemu/configure 2008-07-27 08:20:10.000000000 -0500 >>> +++ kvm-72+dfsg/qemu/configure 2008-09-24 16:04:28.036791147 -0500 >>> @@ -1198,9 +1198,9 @@ if test "$sdl1" = "yes" ; then >>> echo "#define CONFIG_SDL 1" >> $config_h >>> echo "CONFIG_SDL=yes" >> $config_mak >>> if test "$target_softmmu" = "no" -o "$static" = "yes"; then >>> - echo "SDL_LIBS=$sdl_static_libs" >> $config_mak >>> + echo "SDL_LIBS=-lX11 $sdl_static_libs" >> $config_mak >>> else >>> - echo "SDL_LIBS=`$sdl_config --libs`" >> $config_mak >>> + echo "SDL_LIBS=-lX11 `$sdl_config --libs`" >> $config_mak >>> fi >>> >> These changes make the SDL code dependant on X ? This >> would make compiling windows less trivial.. >> > > It ought to be possible to just #ifdef out the bit of the code which > checks for evdev on non-Linux, and just default to the existing > mapping QEMU had. > This is what's required for merging. SDL X11 support needs to be probed at configure time, an appropriate #define needs to be added to config.h, and then the detection code needs to be enabled conditionally based on that #define. Otherwise, non-X11 SDL platforms will stop building which certainly isn't acceptable. Regards, Anthony Liguori