aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTorsten Duwe <duwe@lst.de>2009-08-23 18:08:14 +0200
committerGlauber Costa <glommer@redhat.com>2009-08-25 16:27:36 -0400
commitf3c7245f2387d3963ed85e97f220b72e5bddc161 (patch)
treeb653016c770218b0943da00ce56e4ea0236aac00
parentd4779e9572d9c97da137124445b6ea2e7d014235 (diff)
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>
-rw-r--r--hw/zaurus.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/zaurus.c b/hw/zaurus.c
index 8b16c47a41..7c1fd2a456 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);