From patchwork Thu May 12 14:21:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 95320 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A25F7B6FBC for ; Fri, 13 May 2011 00:21:27 +1000 (EST) Received: from localhost ([::1]:39923 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKWlZ-0002Gw-1C for incoming@patchwork.ozlabs.org; Thu, 12 May 2011 10:21:25 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43127) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKWlK-0002Ge-A6 for qemu-devel@nongnu.org; Thu, 12 May 2011 10:21:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QKWlF-0006gg-WC for qemu-devel@nongnu.org; Thu, 12 May 2011 10:21:10 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:41534) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QKWlF-0006gc-Ob for qemu-devel@nongnu.org; Thu, 12 May 2011 10:21:05 -0400 Received: from [192.168.88.2] (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id 80CFDA1064; Thu, 12 May 2011 18:19:17 +0400 (MSD) Message-ID: <4DCBECCF.7010305@msgid.tls.msk.ru> Date: Thu, 12 May 2011 18:21:03 +0400 From: Michael Tokarev Organization: Telecom Service, JSC User-Agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.9.1.16) Gecko/20110307 Icedove/3.0.11 MIME-Version: 1.0 To: qemu-devel@nongnu.org X-Enigmail-Version: 1.0.1 OpenPGP: id=804465C5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PATCH] set $SDL_VIDEODRIVER=x11 on Linux to prevent sudo kvm from fighting for video card X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org This is a resend of email sent 08.05.2011 01:18. On Linux, SDL may use fbcon|directfb|svgalib when run without accessible $DISPLAY to open X11 window. This is often the case when qemu is run using sudo. But in this case, and when actually run in X11 environment, SDL fights with X11 for the video card, making current display unavailable, often until reboot. So make x11 the default SDL video driver if this variable is unset. This is a bit hackish but saves us from bigger problem. Maybe it's a good idea to fix this in SDL instead. Signed-off-by: Michael Tokarev Acked-by: Alexander Graf --- ui/sdl.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/ui/sdl.c b/ui/sdl.c index dc5c3a1..14a62d9 100644 --- a/ui/sdl.c +++ b/ui/sdl.c @@ -831,6 +831,18 @@ void sdl_display_init(DisplayState *ds, int full_screen, int no_frame) if (!full_screen) { setenv("SDL_VIDEO_ALLOW_SCREENSAVER", "1", 0); } +#ifdef __linux__ + /* on Linux, SDL may use fbcon|directfb|svgalib when run without + * accessible $DISPLAY to open X11 window. This is often the case + * when qemu is run using sudo. But in this case, and when actually + * run in X11 environment, SDL fights with X11 for the video card, + * making current display unavailable, often until reboot. + * So make x11 the default SDL video driver if this variable is unset. + * This is a bit hackish but saves us from bigger problem. + * Maybe it's a good idea to fix this in SDL instead. + */ + setenv("SDL_VIDEODRIVER", "x11", 0); +#endif /* Enable normal up/down events for Caps-Lock and Num-Lock keys. * This requires SDL >= 1.2.14. */ -- 1.7.2.5