Commit fc1084aa authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Stefan Hajnoczi
Browse files

block: m25p80: sync_page(): Deindent function body. 



sync_page() was conditionalizing it's whole fn body on the bdrv being
non-null. Just return for the function immediately on NULL brdv and
get rid of the big if.

Makes implementation consistent with flash_zynq_area().

Signed-off-by: default avatarPeter Crosthwaite <peter.crosthwaite@xilinx.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 427e1750

hw/block/m25p80.c

+13 −11
Original line number Diff line number Diff line
@@ -288,18 +288,20 @@ static void bdrv_sync_complete(void *opaque, int ret) 


static void flash_sync_page(Flash *s, int page)

{

    if (s->bdrv) {

    int bdrv_sector, nb_sectors;

    QEMUIOVector iov;



    if (!s->bdrv) {

        return;

    }



    bdrv_sector = (page * s->pi->page_size) / BDRV_SECTOR_SIZE;

    nb_sectors = DIV_ROUND_UP(s->pi->page_size, BDRV_SECTOR_SIZE);

    qemu_iovec_init(&iov, 1);

    qemu_iovec_add(&iov, s->storage + bdrv_sector * BDRV_SECTOR_SIZE,

                   nb_sectors * BDRV_SECTOR_SIZE);

        bdrv_aio_writev(s->bdrv, bdrv_sector, &iov, nb_sectors,

                                                bdrv_sync_complete, NULL);

    }

    bdrv_aio_writev(s->bdrv, bdrv_sector, &iov, nb_sectors, bdrv_sync_complete,

                    NULL);

}



static inline void flash_sync_area(Flash *s, int64_t off, int64_t len)