[10/12] BACKPORT: Fix segfault of qemu-system-arm with PXA target

Submitted by Glauber Costa on Aug. 26, 2009, 1:05 p.m.

Details

Message ID 1251291946-25821-11-git-send-email-glommer@redhat.com
State Superseded
Headers show

Commit Message

Glauber Costa Aug. 26, 2009, 1:05 p.m.
From: 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:

[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>
---
 hw/zaurus.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Patch hide | download patch | download mbox

diff --git a/hw/zaurus.c b/hw/zaurus.c
index 8b16c47..7c1fd2a 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);