[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v5 14/14] block: Kill blk_write(), blk_read()
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v5 14/14] block: Kill blk_write(), blk_read() |
Date: |
Tue, 3 May 2016 09:42:46 -0600 |
Now that there are no remaining clients, we can drop these
functions, to ensure that all future users get the byte-based
interfaces. Sadly, there are still remaining sector-based
interfaces, such as blk_aio_writev; those will have to wait
for another day.
Signed-off-by: Eric Blake <address@hidden>
---
include/sysemu/block-backend.h | 4 ----
block/block-backend.c | 25 -------------------------
2 files changed, 29 deletions(-)
diff --git a/include/sysemu/block-backend.h b/include/sysemu/block-backend.h
index 681431b..a63af97 100644
--- a/include/sysemu/block-backend.h
+++ b/include/sysemu/block-backend.h
@@ -90,12 +90,8 @@ void blk_attach_dev_nofail(BlockBackend *blk, void *dev);
void blk_detach_dev(BlockBackend *blk, void *dev);
void *blk_get_attached_dev(BlockBackend *blk);
void blk_set_dev_ops(BlockBackend *blk, const BlockDevOps *ops, void *opaque);
-int blk_read(BlockBackend *blk, int64_t sector_num, uint8_t *buf,
- int nb_sectors);
int blk_pread_unthrottled(BlockBackend *blk, int64_t offset, uint8_t *buf,
int count);
-int blk_write(BlockBackend *blk, int64_t sector_num, const uint8_t *buf,
- int nb_sectors);
int blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,
int count, BdrvRequestFlags flags);
BlockAIOCB *blk_aio_write_zeroes(BlockBackend *blk, int64_t sector_num,
diff --git a/block/block-backend.c b/block/block-backend.c
index 71133b2..e6ded54 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -772,24 +772,6 @@ static int blk_prw(BlockBackend *blk, int64_t offset,
uint8_t *buf,
return rwco.ret;
}
-static int blk_rw(BlockBackend *blk, int64_t sector_num, uint8_t *buf,
- int nb_sectors, CoroutineEntry co_entry,
- BdrvRequestFlags flags)
-{
- if (nb_sectors < 0 || nb_sectors > BDRV_REQUEST_MAX_SECTORS) {
- return -EINVAL;
- }
-
- return blk_prw(blk, sector_num << BDRV_SECTOR_BITS, buf,
- nb_sectors << BDRV_SECTOR_BITS, co_entry, flags);
-}
-
-int blk_read(BlockBackend *blk, int64_t sector_num, uint8_t *buf,
- int nb_sectors)
-{
- return blk_rw(blk, sector_num, buf, nb_sectors, blk_read_entry, 0);
-}
-
int blk_pread_unthrottled(BlockBackend *blk, int64_t offset, uint8_t *buf,
int count)
{
@@ -807,13 +789,6 @@ int blk_pread_unthrottled(BlockBackend *blk, int64_t
offset, uint8_t *buf,
return ret;
}
-int blk_write(BlockBackend *blk, int64_t sector_num, const uint8_t *buf,
- int nb_sectors)
-{
- return blk_rw(blk, sector_num, (uint8_t*) buf, nb_sectors,
- blk_write_entry, 0);
-}
-
int blk_pwrite_zeroes(BlockBackend *blk, int64_t offset,
int count, BdrvRequestFlags flags)
{
--
2.5.5
- [Qemu-devel] [PATCH v5 00/14] block: kill sector-based blk_write/read, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 02/14] fdc: Switch to byte-based block access, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 12/14] block: Switch blk_read_unthrottled() to byte interface, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 14/14] block: Kill blk_write(), blk_read(),
Eric Blake <=
- [Qemu-devel] [PATCH v5 10/14] qemu-img: Switch to byte-based block access, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 13/14] block: Switch blk_write_zeroes() to byte interface, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 11/14] qemu-io: Switch to byte-based block access, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 05/14] pflash: Switch to byte-based block access, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 08/14] atapi: Switch to byte-based block access, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 09/14] nbd: Switch to byte-based block access, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 06/14] sd: Switch to byte-based block access, Eric Blake, 2016/05/03
- [Qemu-devel] [PATCH v5 07/14] m25p80: Switch to byte-based block access, Eric Blake, 2016/05/03