[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v6 15/20] m25p80: Switch to byte-based block access
From: |
Eric Blake |
Subject: |
[Qemu-block] [PATCH v6 15/20] m25p80: Switch to byte-based block access |
Date: |
Wed, 4 May 2016 17:55:21 -0600 |
Sector-based blk_read() should die; switch to byte-based
blk_pread() instead.
Likewise for blk_aio_readv() and blk_aio_writev().
Signed-off-by: Eric Blake <address@hidden>
---
hw/block/m25p80.c | 23 +++++++----------------
1 file changed, 7 insertions(+), 16 deletions(-)
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index 906b712..5d30863 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -358,25 +358,21 @@ static void blk_sync_complete(void *opaque, int ret)
static void flash_sync_page(Flash *s, int page)
{
- int blk_sector, nb_sectors;
QEMUIOVector iov;
if (!s->blk || blk_is_read_only(s->blk)) {
return;
}
- blk_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 + blk_sector * BDRV_SECTOR_SIZE,
- nb_sectors * BDRV_SECTOR_SIZE);
- blk_aio_writev(s->blk, blk_sector, &iov, nb_sectors, blk_sync_complete,
- NULL);
+ qemu_iovec_add(&iov, s->storage + page * s->pi->page_size,
+ s->pi->page_size);
+ blk_aio_pwritev(s->blk, page * s->pi->page_size, &iov, 0,
+ blk_sync_complete, NULL);
}
static inline void flash_sync_area(Flash *s, int64_t off, int64_t len)
{
- int64_t start, end, nb_sectors;
QEMUIOVector iov;
if (!s->blk || blk_is_read_only(s->blk)) {
@@ -384,13 +380,9 @@ static inline void flash_sync_area(Flash *s, int64_t off,
int64_t len)
}
assert(!(len % BDRV_SECTOR_SIZE));
- start = off / BDRV_SECTOR_SIZE;
- end = (off + len) / BDRV_SECTOR_SIZE;
- nb_sectors = end - start;
qemu_iovec_init(&iov, 1);
- qemu_iovec_add(&iov, s->storage + (start * BDRV_SECTOR_SIZE),
- nb_sectors * BDRV_SECTOR_SIZE);
- blk_aio_writev(s->blk, start, &iov, nb_sectors, blk_sync_complete, NULL);
+ qemu_iovec_add(&iov, s->storage + off, len);
+ blk_aio_pwritev(s->blk, off, &iov, 0, blk_sync_complete, NULL);
}
static void flash_erase(Flash *s, int offset, FlashCMD cmd)
@@ -907,8 +899,7 @@ static int m25p80_init(SSISlave *ss)
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))) {
+ if (blk_pread(s->blk, 0, s->storage, s->size)) {
fprintf(stderr, "Failed to initialize SPI flash!\n");
return 1;
}
--
2.5.5
- Re: [Qemu-block] [PATCH v6 07/20] scsi-disk: Switch to byte-based aio block access, (continued)
[Qemu-block] [PATCH v6 01/20] block: Allow BDRV_REQ_FUA through blk_pwrite(), Eric Blake, 2016/05/04
[Qemu-block] [PATCH v6 08/20] virtio: Switch to byte-based aio block access, Eric Blake, 2016/05/04
[Qemu-block] [PATCH v6 09/20] xen_disk: Switch to byte-based aio block access, Eric Blake, 2016/05/04
[Qemu-block] [PATCH v6 10/20] fdc: Switch to byte-based block access, Eric Blake, 2016/05/04
[Qemu-block] [PATCH v6 11/20] nand: Switch to byte-based block access, Eric Blake, 2016/05/04
[Qemu-block] [PATCH v6 12/20] onenand: Switch to byte-based block access, Eric Blake, 2016/05/04
[Qemu-block] [PATCH v6 16/20] atapi: Switch to byte-based block access, Eric Blake, 2016/05/04
[Qemu-block] [PATCH v6 15/20] m25p80: Switch to byte-based block access,
Eric Blake <=
[Qemu-block] [PATCH v6 18/20] qemu-img: Switch to byte-based block access, Eric Blake, 2016/05/04
[Qemu-block] [PATCH v6 19/20] qemu-io: Switch to byte-based block access, Eric Blake, 2016/05/04
[Qemu-block] [PATCH v6 20/20] block: Kill unused sector-based blk_* functions, Eric Blake, 2016/05/04
[Qemu-block] [PATCH v6 13/20] pflash: Switch to byte-based block access, Eric Blake, 2016/05/04
[Qemu-block] [PATCH v6 14/20] sd: Switch to byte-based block access, Eric Blake, 2016/05/04
[Qemu-block] [PATCH v6 17/20] nbd: Switch to byte-based block access, Eric Blake, 2016/05/04
Re: [Qemu-block] [PATCH v6 00/20] block: kill sector-based blk_write/read, Kevin Wolf, 2016/05/06