[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 16/16] block: Keep bdrv_check*_request()'s return
From: |
Max Reitz |
Subject: |
[Qemu-devel] [PATCH v4 16/16] block: Keep bdrv_check*_request()'s return value |
Date: |
Thu, 5 Feb 2015 13:58:25 -0500 |
Do not throw away the value returned by bdrv_check_request() and
bdrv_check_byte_request().
Fix up some coding style issues in the proximity of the affected hunks.
Signed-off-by: Max Reitz <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
---
block.c | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/block.c b/block.c
index 47468a5..f35a437 100644
--- a/block.c
+++ b/block.c
@@ -3101,8 +3101,10 @@ static int coroutine_fn
bdrv_co_do_preadv(BlockDriverState *bs,
if (!drv) {
return -ENOMEDIUM;
}
- if (bdrv_check_byte_request(bs, offset, bytes)) {
- return -EIO;
+
+ ret = bdrv_check_byte_request(bs, offset, bytes);
+ if (ret < 0) {
+ return ret;
}
if (bs->copy_on_read) {
@@ -3345,8 +3347,10 @@ static int coroutine_fn
bdrv_co_do_pwritev(BlockDriverState *bs,
if (bs->read_only) {
return -EACCES;
}
- if (bdrv_check_byte_request(bs, offset, bytes)) {
- return -EIO;
+
+ ret = bdrv_check_byte_request(bs, offset, bytes);
+ if (ret < 0) {
+ return ret;
}
/* throttling disk I/O */
@@ -4200,12 +4204,18 @@ int bdrv_write_compressed(BlockDriverState *bs, int64_t
sector_num,
const uint8_t *buf, int nb_sectors)
{
BlockDriver *drv = bs->drv;
- if (!drv)
+ int ret;
+
+ if (!drv) {
return -ENOMEDIUM;
- if (!drv->bdrv_write_compressed)
+ }
+ if (!drv->bdrv_write_compressed) {
return -ENOTSUP;
- if (bdrv_check_request(bs, sector_num, nb_sectors))
- return -EIO;
+ }
+ ret = bdrv_check_request(bs, sector_num, nb_sectors);
+ if (ret < 0) {
+ return ret;
+ }
assert(QLIST_EMPTY(&bs->dirty_bitmaps));
@@ -5120,12 +5130,15 @@ static void coroutine_fn bdrv_discard_co_entry(void
*opaque)
int coroutine_fn bdrv_co_discard(BlockDriverState *bs, int64_t sector_num,
int nb_sectors)
{
- int max_discard;
+ int max_discard, ret;
if (!bs->drv) {
return -ENOMEDIUM;
- } else if (bdrv_check_request(bs, sector_num, nb_sectors)) {
- return -EIO;
+ }
+
+ ret = bdrv_check_request(bs, sector_num, nb_sectors);
+ if (ret < 0) {
+ return ret;
} else if (bs->read_only) {
return -EROFS;
}
--
2.1.0
- Re: [Qemu-devel] [PATCH v4 09/16] qemu-img: Use BlockBackend as far as possible, (continued)
- [Qemu-devel] [PATCH v4 14/16] block: Clamp BlockBackend requests, Max Reitz, 2015/02/05
- [Qemu-devel] [PATCH v4 10/16] qemu-nbd: Use blk_new_open() in main(), Max Reitz, 2015/02/05
- [Qemu-devel] [PATCH v4 11/16] qemu-io: Use blk_new_open() in openfile(), Max Reitz, 2015/02/05
- [Qemu-devel] [PATCH v4 13/16] qemu-io: Use BlockBackend, Max Reitz, 2015/02/05
- [Qemu-devel] [PATCH v4 16/16] block: Keep bdrv_check*_request()'s return value,
Max Reitz <=
- [Qemu-devel] [PATCH v4 15/16] block: Remove "growable" from BDS, Max Reitz, 2015/02/05
- Re: [Qemu-devel] [PATCH v4 00/16] block: Remove "growable", add blk_new_open(), Stefan Hajnoczi, 2015/02/13