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
`. `' [EMAIL PROTECTED] | [EMAIL PROTECTED]
`- people.debian.org/~aurel32 | www.aurel32.net
