From: Torsten Duwe <duwe@lst.de>
Date: Sun, 23 Aug 2009 16:08:14 +0000 (+0200)
Subject: Fix segfault of qemu-system-arm with PXA target
X-Git-Tag: v0.12.0-rc0~1534
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d30b794ce952638f7ad5d249d2447a2f45d123e;p=thirdparty%2Fqemu.git

Fix segfault of qemu-system-arm with PXA target

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

Signed-off-by: Torsten Duwe <duwe@lst.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Andrzej Zaborowski <balrogg@gmail.com>
---

diff --git a/hw/zaurus.c b/hw/zaurus.c
index e52f29b575e..78a120c9d09 100644
--- a/hw/zaurus.c
+++ b/hw/zaurus.c
@@ -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);