[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 65/65] block: Keep bdrv_check*_request()'s return val
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 65/65] block: Keep bdrv_check*_request()'s return value |
Date: |
Fri, 13 Feb 2015 16:25:01 +0000 |
From: Max Reitz <address@hidden>
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>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
block.c | 35 ++++++++++++++++++++++++-----------
1 file changed, 24 insertions(+), 11 deletions(-)
diff --git a/block.c b/block.c
index 4d5ae99..9b707e3 100644
--- a/block.c
+++ b/block.c
@@ -3098,8 +3098,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) {
@@ -3342,8 +3344,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 */
@@ -4197,12 +4201,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));
@@ -5117,12 +5127,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
- [Qemu-devel] [PULL 56/65] qemu-img: Use blk_new_open() in img_open(), (continued)
- [Qemu-devel] [PULL 56/65] qemu-img: Use blk_new_open() in img_open(), Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 57/65] qemu-img: Use blk_new_open() in img_rebase(), Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 53/65] iotests: Add test for driver=qcow2, format=qcow2, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 60/65] qemu-io: Use blk_new_open() in openfile(), Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 58/65] qemu-img: Use BlockBackend as far as possible, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 55/65] block/xen: Use blk_new_open() in blk_connect(), Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 59/65] qemu-nbd: Use blk_new_open() in main(), Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 63/65] block: Clamp BlockBackend requests, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 64/65] block: Remove "growable" from BDS, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 62/65] qemu-io: Use BlockBackend, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 65/65] block: Keep bdrv_check*_request()'s return value,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 61/65] qemu-io: Remove "growable" option, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 18/65] libqos/ahci: create libqos/ahci.c, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 54/65] blockdev: Use blk_new_open() in blockdev_init(), Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 16/65] qtest/ahci: remove getter/setter macros, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 15/65] libqos/ahci: Functional register helpers, Stefan Hajnoczi, 2015/02/13
- [Qemu-devel] [PULL 08/65] libqos: add alloc_init_flags, Stefan Hajnoczi, 2015/02/13
- Re: [Qemu-devel] [PULL 00/65] Block patches, Peter Maydell, 2015/02/13