From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1I0NX7-0007Bw-IB for qemu-devel@nongnu.org; Mon, 18 Jun 2007 16:09:05 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1I0NX4-0007Ak-Jz for qemu-devel@nongnu.org; Mon, 18 Jun 2007 16:09:04 -0400 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1I0NX4-0007Ae-AB for qemu-devel@nongnu.org; Mon, 18 Jun 2007 16:09:02 -0400 Received: from farad.aurel32.net ([82.232.2.251] helo=mail.aurel32.net) by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1I0NX3-0005t9-Dc for qemu-devel@nongnu.org; Mon, 18 Jun 2007 16:09:01 -0400 Received: from farad.aurel32.net ([2001:618:400:fc13:216:3eff:fe00:100c]) by mail.aurel32.net with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.63) (envelope-from ) id 1I0NWw-0000jD-MS for qemu-devel@nongnu.org; Mon, 18 Jun 2007 22:08:54 +0200 Received: from aurel32 by farad.aurel32.net with local (Exim 4.63) (envelope-from ) id 1I0NWw-0004AT-Bt for qemu-devel@nongnu.org; Mon, 18 Jun 2007 22:08:54 +0200 Date: Mon, 18 Jun 2007 22:08:54 +0200 From: Aurelien Jarno Message-ID: <20070618200852.GA16008@farad.aurel32.net> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline Subject: [Qemu-devel] [PATCH, arm] Segmentation fault when run with -nographic Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Hi all, The patch below fixes a segmentation fault when using the arm emulation with -nographic. Bye Aurelien Index: hw/versatilepb.c =================================================================== RCS file: /sources/qemu/qemu/hw/versatilepb.c,v retrieving revision 1.15 diff -u -d -p -r1.15 versatilepb.c --- hw/versatilepb.c 3 Jun 2007 15:19:33 -0000 1.15 +++ hw/versatilepb.c 18 Jun 2007 20:04:22 -0000 @@ -10,6 +10,8 @@ #include "vl.h" #include "arm_pic.h" +extern int nographic; + /* Primary interrupt controller. */ typedef struct vpb_sic_state @@ -215,7 +217,8 @@ static void versatile_init(int ram_size, /* The versatile/PB actually has a modified Color LCD controller that includes hardware cursor support from the PL111. */ - pl110_init(ds, 0x10120000, pic[16], 1); + if (!nographic) + pl110_init(ds, 0x10120000, pic[16], 1); pl181_init(0x10005000, sd_bdrv, sic[22], sic[1]); #if 0 -- .''`. Aurelien Jarno | GPG: 1024D/F1BCDB73 : :' : Debian developer | Electrical Engineer `. `' aurel32@debian.org | aurelien@aurel32.net `- people.debian.org/~aurel32 | www.aurel32.net