diff options
Diffstat (limited to 'hw/block')
| -rw-r--r-- | hw/block/m25p80.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 728e384279..efc43dde6a 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -621,7 +621,6 @@ static int m25p80_init(SSISlave *ss) s->size = s->pi->sector_size * s->pi->n_sectors; s->dirty_page = -1; - s->storage = blk_blockalign(s->blk, s->size); /* FIXME use a qdev drive property instead of drive_get_next() */ dinfo = drive_get_next(IF_MTD); @@ -631,6 +630,8 @@ static int m25p80_init(SSISlave *ss) s->blk = blk_by_legacy_dinfo(dinfo); blk_attach_dev_nofail(s->blk, s); + s->storage = blk_blockalign(s->blk, s->size); + /* FIXME: Move to late init */ if (blk_read(s->blk, 0, s->storage, DIV_ROUND_UP(s->size, BDRV_SECTOR_SIZE))) { @@ -639,6 +640,7 @@ static int m25p80_init(SSISlave *ss) } } else { DB_PRINT_L(0, "No BDRV - binding to RAM\n"); + s->storage = blk_blockalign(NULL, s->size); memset(s->storage, 0xFF, s->size); } |