From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1McQda-0004Xd-Ii
	for qemu-devel@nongnu.org; Sat, 15 Aug 2009 17:18:06 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1McQdV-0004XQ-8X
	for qemu-devel@nongnu.org; Sat, 15 Aug 2009 17:18:05 -0400
Received: from [199.232.76.173] (port=59865 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1McQdV-0004XN-3T
	for qemu-devel@nongnu.org; Sat, 15 Aug 2009 17:18:01 -0400
Received: from verein.lst.de ([213.95.11.210]:34354)
	by monty-python.gnu.org with esmtps
	(TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60)
	(envelope-from <hch@lst.de>) id 1McQdU-0000cL-L4
	for qemu-devel@nongnu.org; Sat, 15 Aug 2009 17:18:00 -0400
Date: Sat, 15 Aug 2009 23:17:58 +0200
From: Christoph Hellwig <hch@lst.de>
Message-ID: <20090815211758.GA23634@lst.de>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Subject: [Qemu-devel] [PATCH] fix segfault of qemu-system-arm with PXA target
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
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);