From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1LP81p-0006wT-56
	for qemu-devel@nongnu.org; Mon, 19 Jan 2009 23:15:53 -0500
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1LP81m-0006wH-OJ
	for qemu-devel@nongnu.org; Mon, 19 Jan 2009 23:15:51 -0500
Received: from [199.232.76.173] (port=43867 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1LP81m-0006wE-IR
	for qemu-devel@nongnu.org; Mon, 19 Jan 2009 23:15:50 -0500
Received: from savannah.gnu.org ([199.232.41.3]:43436 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <INVALID.NOREPLY@gnu.org>)
	id 1LP81m-00076m-BM
	for qemu-devel@nongnu.org; Mon, 19 Jan 2009 23:15:50 -0500
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63)
	(envelope-from <INVALID.NOREPLY@gnu.org>) id 1LP81l-0001ZU-FC
	for qemu-devel@nongnu.org; Tue, 20 Jan 2009 04:15:49 +0000
Received: from pbrook by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <pbrook@savannah.gnu.org>) id 1LP81l-0001ZQ-2y
	for qemu-devel@nongnu.org; Tue, 20 Jan 2009 04:15:49 +0000
MIME-Version: 1.0
Errors-To: pbrook
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Paul Brook <paul@nowt.org>
Message-Id: <E1LP81l-0001ZQ-2y@cvs.savannah.gnu.org>
Date: Tue, 20 Jan 2009 04:15:49 +0000
Subject: [Qemu-devel] [6370] Fix NAND flash save/restore.
Reply-To: qemu-devel@nongnu.org
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

Revision: 6370
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6370
Author:   pbrook
Date:     2009-01-20 04:15:47 +0000 (Tue, 20 Jan 2009)

Log Message:
-----------
Fix NAND flash save/restore.

Modified Paths:
--------------
    trunk/hw/nand.c

Modified: trunk/hw/nand.c
===================================================================
--- trunk/hw/nand.c	2009-01-19 16:34:10 UTC (rev 6369)
+++ trunk/hw/nand.c	2009-01-20 04:15:47 UTC (rev 6370)
@@ -492,6 +492,9 @@
     if (pagesize)
         s->storage = (uint8_t *) memset(qemu_malloc(s->pages * pagesize),
                         0xff, s->pages * pagesize);
+    /* Give s->ioaddr a sane value in case we save state before it
+       is used.  */
+    s->ioaddr = s->io;
 
     register_savevm("nand", -1, 0, nand_save, nand_load, s);