aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Wolf <kwolf@redhat.com>2016-03-08 13:47:49 +0100
committerKevin Wolf <kwolf@redhat.com>2016-03-17 15:47:57 +0100
commit5bd51196676b07d3f9ddb3086057b0d82ae95f36 (patch)
tree389847d00f4d8d0c770c148ba485d7e35d10c7e8
parenta8823a3bfd8a8adfa11dea61b151175a02caa7d0 (diff)
downloadqemu-5bd51196676b07d3f9ddb3086057b0d82ae95f36.zip
qemu-5bd51196676b07d3f9ddb3086057b0d82ae95f36.tar.gz
qemu-5bd51196676b07d3f9ddb3086057b0d82ae95f36.tar.bz2
block: Pull up blk_read_unthrottled() implementation
Use blk_read(), so that it goes through blk_co_preadv() like all read requests from the BB to the BDS. Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block/block-backend.c12
-rw-r--r--block/io.c14
-rw-r--r--include/block/block.h2
3 files changed, 10 insertions, 18 deletions
diff --git a/block/block-backend.c b/block/block-backend.c
index 5b15475..475d27a 100644
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -789,12 +789,20 @@ int blk_read(BlockBackend *blk, int64_t sector_num, uint8_t *buf,
int blk_read_unthrottled(BlockBackend *blk, int64_t sector_num, uint8_t *buf,
int nb_sectors)
{
- int ret = blk_check_request(blk, sector_num, nb_sectors);
+ BlockDriverState *bs = blk_bs(blk);
+ bool enabled;
+ int ret;
+
+ ret = blk_check_request(blk, sector_num, nb_sectors);
if (ret < 0) {
return ret;
}
- return bdrv_read_unthrottled(blk_bs(blk), sector_num, buf, nb_sectors);
+ enabled = bs->io_limits_enabled;
+ bs->io_limits_enabled = false;
+ ret = blk_read(blk, sector_num, buf, nb_sectors);
+ bs->io_limits_enabled = enabled;
+ return ret;
}
int blk_write(BlockBackend *blk, int64_t sector_num, const uint8_t *buf,
diff --git a/block/io.c b/block/io.c
index aa8537c..41d954ca 100644
--- a/block/io.c
+++ b/block/io.c
@@ -615,20 +615,6 @@ int bdrv_read(BlockDriverState *bs, int64_t sector_num,
return bdrv_rw_co(bs, sector_num, buf, nb_sectors, false, 0);
}
-/* Just like bdrv_read(), but with I/O throttling temporarily disabled */
-int bdrv_read_unthrottled(BlockDriverState *bs, int64_t sector_num,
- uint8_t *buf, int nb_sectors)
-{
- bool enabled;
- int ret;
-
- enabled = bs->io_limits_enabled;
- bs->io_limits_enabled = false;
- ret = bdrv_read(bs, sector_num, buf, nb_sectors);
- bs->io_limits_enabled = enabled;
- return ret;
-}
-
/* Return < 0 if error. Important errors are:
-EIO generic I/O error (may happen for all errors)
-ENOMEDIUM No media inserted.
diff --git a/include/block/block.h b/include/block/block.h
index ea8ed04..01349ef 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -229,8 +229,6 @@ void bdrv_reopen_commit(BDRVReopenState *reopen_state);
void bdrv_reopen_abort(BDRVReopenState *reopen_state);
int bdrv_read(BlockDriverState *bs, int64_t sector_num,
uint8_t *buf, int nb_sectors);
-int bdrv_read_unthrottled(BlockDriverState *bs, int64_t sector_num,
- uint8_t *buf, int nb_sectors);
int bdrv_write(BlockDriverState *bs, int64_t sector_num,
const uint8_t *buf, int nb_sectors);
int bdrv_write_zeroes(BlockDriverState *bs, int64_t sector_num,