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

BACKPORT: 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:

[backport: current code uses struct scoop_info_s instead of a typedef ]

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

diff --git a/hw/zaurus.c b/hw/zaurus.c
index 8b16c47a41c..7c1fd2a456f 100644
--- a/hw/zaurus.c
+++ b/hw/zaurus.c
@@ -160,7 +160,7 @@ static CPUWriteMemoryFunc *scoop_writefn[] = {
 
 void scoop_gpio_set(void *opaque, int line, int level)
 {
-    struct scoop_info_s *s = (struct scoop_info_s *) s;
+    struct scoop_info_s *s = (struct scoop_info_s *) opaque;
 
     if (level)
         s->gpio_level |= (1 << line);