From patchwork Sat Aug 15 21:17:58 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: fix segfault of qemu-system-arm with PXA target
Date: Sat, 15 Aug 2009 11:17:58 -0000
From: Christoph Hellwig <hch@lst.de>
X-Patchwork-Id: 31476
Message-Id: <20090815211758.GA23634@lst.de>
To: qemu-devel@nongnu.org
Cc: Torsten Duwe <duwe@lst.de>

qemu-system-arm (0.10.5) segfaults when invoked with a PXA machine target,      
e.g. -M tosa. The reason is fairly obvious:

[hch: forward ported from qemu-0.11 to current git HEAD]


Signed-off-by: Torsten Duwe <duwe@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>


Index: qemu/hw/zaurus.c
===================================================================
--- qemu.orig/hw/zaurus.c	2009-08-15 18:13:46.102699041 -0300
+++ qemu/hw/zaurus.c	2009-08-15 18:13:55.366663320 -0300
@@ -155,7 +155,7 @@ static CPUWriteMemoryFunc *scoop_writefn
 
 void scoop_gpio_set(void *opaque, int line, int level)
 {
-    ScoopInfo *s = (ScoopInfo *) s;
+    ScoopInfo *s = (ScoopInfo *) opaque;
 
     if (level)
         s->gpio_level |= (1 << line);