[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH for-2.4] m25p80: fix s->blk usage before assignm
From: |
Paolo Bonzini |
Subject: |
Re: [Qemu-devel] [PATCH for-2.4] m25p80: fix s->blk usage before assignment |
Date: |
Wed, 15 Apr 2015 11:53:00 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 |
On 15/04/2015 11:43, Stefan Hajnoczi wrote:
> Delay the call to blk_blockalign() until s->blk has been assigned.
>
> This never caused a crash because blk_blockalign(NULL, size) defaults to
> 4096 alignment but it's technically incorrect.
>
> Signed-off-by: Stefan Hajnoczi <address@hidden>
> ---
> hw/block/m25p80.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
> index afe243b..d6a37a5 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);
> @@ -629,6 +628,7 @@ static int m25p80_init(SSISlave *ss)
> if (dinfo) {
> DB_PRINT_L(0, "Binding to IF_MTD drive\n");
> s->blk = blk_by_legacy_dinfo(dinfo);
> + s->storage = blk_blockalign(s->blk, s->size);
>
> /* FIXME: Move to late init */
> if (blk_read(s->blk, 0, s->storage,
> @@ -638,6 +638,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);
> }
>
>
Reviewed-by: Paolo Bonzini <address@hidden>