aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-20 04:15:47 +0000
committerpbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>2009-01-20 04:15:47 +0000
commit4892792678580c50949e465fd1e51cea7e411fb1 (patch)
tree65520a96ba90f4763141dd6f94833027c763f42f /hw
parent8f391ab41ac02d6f7d94113161883f3ff92cc144 (diff)
downloadqemu-4892792678580c50949e465fd1e51cea7e411fb1.zip
qemu-4892792678580c50949e465fd1e51cea7e411fb1.tar.gz
qemu-4892792678580c50949e465fd1e51cea7e411fb1.tar.bz2
Fix NAND flash save/restore.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6370 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw')
-rw-r--r--hw/nand.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/hw/nand.c b/hw/nand.c
index 11f8efc..e73a1b8 100644
--- a/hw/nand.c
+++ b/hw/nand.c
@@ -492,6 +492,9 @@ struct nand_flash_s *nand_init(int manf_id, int chip_id)
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);