[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] block: Drop last of the sector-based aio callba
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH 6/6] block: Drop last of the sector-based aio callbacks |
Date: |
Thu, 15 Feb 2018 13:28:29 -0600 |
We are gradually moving away from sector-based interfaces, towards
byte-based. Now that all drivers with aio callbacks are using the
byte-based interfaces, we can remove the sector-based versions.
Signed-off-by: Eric Blake <address@hidden>
---
include/block/block_int.h | 6 ------
block/io.c | 23 ++++++-----------------
2 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/include/block/block_int.h b/include/block/block_int.h
index c882dc4232d..0f5b7accfa8 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -134,15 +134,9 @@ struct BlockDriver {
void (*bdrv_refresh_filename)(BlockDriverState *bs, QDict *options);
/* aio */
- BlockAIOCB *(*bdrv_aio_readv)(BlockDriverState *bs,
- int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
- BlockCompletionFunc *cb, void *opaque);
BlockAIOCB *(*bdrv_aio_preadv)(BlockDriverState *bs,
uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags,
BlockCompletionFunc *cb, void *opaque);
- BlockAIOCB *(*bdrv_aio_writev)(BlockDriverState *bs,
- int64_t sector_num, QEMUIOVector *qiov, int nb_sectors,
- BlockCompletionFunc *cb, void *opaque);
BlockAIOCB *(*bdrv_aio_pwritev)(BlockDriverState *bs,
uint64_t offset, uint64_t bytes, QEMUIOVector *qiov, int flags,
BlockCompletionFunc *cb, void *opaque);
diff --git a/block/io.c b/block/io.c
index 84a4caa72b7..04239f01eef 100644
--- a/block/io.c
+++ b/block/io.c
@@ -948,13 +948,8 @@ static int coroutine_fn
bdrv_driver_preadv(BlockDriverState *bs,
.coroutine = qemu_coroutine_self(),
};
- if (drv->bdrv_aio_preadv) {
- acb = bs->drv->bdrv_aio_preadv(bs, offset, bytes, qiov, flags,
- bdrv_co_io_em_complete, &co);
- } else {
- acb = bs->drv->bdrv_aio_readv(bs, sector_num, qiov, nb_sectors,
- bdrv_co_io_em_complete, &co);
- }
+ acb = bs->drv->bdrv_aio_preadv(bs, offset, bytes, qiov, flags,
+ bdrv_co_io_em_complete, &co);
if (acb == NULL) {
return -EIO;
} else {
@@ -1008,16 +1003,10 @@ static int coroutine_fn
bdrv_driver_pwritev(BlockDriverState *bs,
.coroutine = qemu_coroutine_self(),
};
- if (drv->bdrv_aio_pwritev) {
- acb = bs->drv->bdrv_aio_pwritev(bs, offset, bytes, qiov,
- flags & bs->supported_write_flags,
- bdrv_co_io_em_complete, &co);
- flags &= ~bs->supported_write_flags;
- } else {
- assert(!bs->supported_write_flags);
- acb = bs->drv->bdrv_aio_writev(bs, sector_num, qiov, nb_sectors,
- bdrv_co_io_em_complete, &co);
- }
+ acb = bs->drv->bdrv_aio_pwritev(bs, offset, bytes, qiov,
+ flags & bs->supported_write_flags,
+ bdrv_co_io_em_complete, &co);
+ flags &= ~bs->supported_write_flags;
if (acb == NULL) {
ret = -EIO;
} else {
--
2.14.3
- [Qemu-devel] [PATCH 0/6] block: byte-based AIO read/write, Eric Blake, 2018/02/15
- [Qemu-devel] [PATCH 3/6] null: Switch to byte-based read/write, Eric Blake, 2018/02/15
- [Qemu-devel] [PATCH 4/6] rbd: Switch to byte-based callbacks, Eric Blake, 2018/02/15
- [Qemu-devel] [PATCH 6/6] block: Drop last of the sector-based aio callbacks,
Eric Blake <=
- [Qemu-devel] [PATCH 5/6] vxhs: Switch to byte-based callbacks, Eric Blake, 2018/02/15
- [Qemu-devel] [PATCH 2/6] file-win32: Switch to byte-based callbacks, Eric Blake, 2018/02/15
- [Qemu-devel] [PATCH 1/6] block: Support byte-based aio callbacks, Eric Blake, 2018/02/15