From patchwork Sat Aug 15 21:17:58 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 31476 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by bilbo.ozlabs.org (Postfix) with ESMTPS id 2BCACB6F1F for ; Sun, 16 Aug 2009 07:18:36 +1000 (EST) Received: from localhost ([127.0.0.1]:42965 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1McQe1-0004Xi-1U for incoming@patchwork.ozlabs.org; Sat, 15 Aug 2009 17:18:33 -0400 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 ) id 1McQdU-0000cL-L4 for qemu-devel@nongnu.org; Sat, 15 Aug 2009 17:18:00 -0400 Received: from verein.lst.de (localhost [127.0.0.1]) by verein.lst.de (8.12.3/8.12.3/Debian-7.1) with ESMTP id n7FLHxVL023657 (version=TLSv1/SSLv3 cipher=EDH-RSA-DES-CBC3-SHA bits=168 verify=NO); Sat, 15 Aug 2009 23:17:59 +0200 Received: (from hch@localhost) by verein.lst.de (8.12.3/8.12.3/Debian-7.2) id n7FLHwvu023656; Sat, 15 Aug 2009 23:17:58 +0200 Date: Sat, 15 Aug 2009 23:17:58 +0200 From: Christoph Hellwig To: qemu-devel@nongnu.org Message-ID: <20090815211758.GA23634@lst.de> Mime-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.3.28i X-Spam-Score: -0.349 () BAYES_30 X-Scanned-By: MIMEDefang 2.39 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Cc: Torsten Duwe Subject: [Qemu-devel] [PATCH] fix segfault of qemu-system-arm with PXA target X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Signed-off-by: Christoph Hellwig 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);