[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v5 01/11] block/io: bring request check to bdrv_co_(read, write)v
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v5 01/11] block/io: bring request check to bdrv_co_(read, write)v_vmstate |
Date: |
Wed, 5 May 2021 10:49:51 +0300 |
There are only two drivers supporting vmstate: qcow2 and sheepdog.
Sheepdog is deprecated. In qcow2 these requests go through
.bdrv_co_p{read,write}v_part handlers.
So, let's do our basic check for the request on vmstate generic
handlers.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block/io.c | 18 ++++++++++++++++--
1 file changed, 16 insertions(+), 2 deletions(-)
diff --git a/block/io.c b/block/io.c
index 35b6c56efc..3eb6a38008 100644
--- a/block/io.c
+++ b/block/io.c
@@ -2745,7 +2745,12 @@ bdrv_co_readv_vmstate(BlockDriverState *bs, QEMUIOVector
*qiov, int64_t pos)
{
BlockDriver *drv = bs->drv;
BlockDriverState *child_bs = bdrv_primary_bs(bs);
- int ret = -ENOTSUP;
+ int ret;
+
+ ret = bdrv_check_qiov_request(pos, qiov->size, qiov, 0, NULL);
+ if (ret < 0) {
+ return ret;
+ }
if (!drv) {
return -ENOMEDIUM;
@@ -2757,6 +2762,8 @@ bdrv_co_readv_vmstate(BlockDriverState *bs, QEMUIOVector
*qiov, int64_t pos)
ret = drv->bdrv_load_vmstate(bs, qiov, pos);
} else if (child_bs) {
ret = bdrv_co_readv_vmstate(child_bs, qiov, pos);
+ } else {
+ ret = -ENOTSUP;
}
bdrv_dec_in_flight(bs);
@@ -2769,7 +2776,12 @@ bdrv_co_writev_vmstate(BlockDriverState *bs,
QEMUIOVector *qiov, int64_t pos)
{
BlockDriver *drv = bs->drv;
BlockDriverState *child_bs = bdrv_primary_bs(bs);
- int ret = -ENOTSUP;
+ int ret;
+
+ ret = bdrv_check_qiov_request(pos, qiov->size, qiov, 0, NULL);
+ if (ret < 0) {
+ return ret;
+ }
if (!drv) {
return -ENOMEDIUM;
@@ -2781,6 +2793,8 @@ bdrv_co_writev_vmstate(BlockDriverState *bs, QEMUIOVector
*qiov, int64_t pos)
ret = drv->bdrv_save_vmstate(bs, qiov, pos);
} else if (child_bs) {
ret = bdrv_co_writev_vmstate(child_bs, qiov, pos);
+ } else {
+ ret = -ENOTSUP;
}
bdrv_dec_in_flight(bs);
--
2.29.2
- [PATCH v5 00/11] 64bit block-layer: part II, Vladimir Sementsov-Ogievskiy, 2021/05/05
- [PATCH v5 01/11] block/io: bring request check to bdrv_co_(read, write)v_vmstate,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v5 02/11] qcow2: check request on vmstate save/load path, Vladimir Sementsov-Ogievskiy, 2021/05/05
- [PATCH v5 03/11] block: use int64_t instead of uint64_t in driver read handlers, Vladimir Sementsov-Ogievskiy, 2021/05/05
- [PATCH v5 05/11] block: use int64_t instead of uint64_t in copy_range driver handlers, Vladimir Sementsov-Ogievskiy, 2021/05/05
- [PATCH v5 04/11] block: use int64_t instead of uint64_t in driver write handlers, Vladimir Sementsov-Ogievskiy, 2021/05/05
- [PATCH v5 10/11] block: use int64_t instead of int in driver discard handlers, Vladimir Sementsov-Ogievskiy, 2021/05/05
- [PATCH v5 06/11] block: make BlockLimits::max_pwrite_zeroes 64bit, Vladimir Sementsov-Ogievskiy, 2021/05/05
- [PATCH v5 11/11] block/io: allow 64bit discard requests, Vladimir Sementsov-Ogievskiy, 2021/05/05
- [PATCH v5 07/11] block: use int64_t instead of int in driver write_zeroes handlers, Vladimir Sementsov-Ogievskiy, 2021/05/05
- [PATCH v5 08/11] block/io: allow 64bit write-zeroes requests, Vladimir Sementsov-Ogievskiy, 2021/05/05
- [PATCH v5 09/11] block: make BlockLimits::max_pdiscard 64bit, Vladimir Sementsov-Ogievskiy, 2021/05/05