[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 05/13] block: drop extra error propagation for bdrv_set_backin
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH v2 05/13] block: drop extra error propagation for bdrv_set_backing_hd |
Date: |
Thu, 17 Sep 2020 22:55:11 +0300 |
bdrv_set_backing_hd now returns status, let's use it.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Greg Kurz <groug@kaod.org>
Reviewed-by: Alberto Garcia <berto@igalia.com>
---
block.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index b4e36d6dd7..1cf825c349 100644
--- a/block.c
+++ b/block.c
@@ -3015,11 +3015,9 @@ int bdrv_open_backing_file(BlockDriverState *bs, QDict
*parent_options,
/* Hook up the backing file link; drop our reference, bs owns the
* backing_hd reference now */
- bdrv_set_backing_hd(bs, backing_hd, &local_err);
+ ret = bdrv_set_backing_hd(bs, backing_hd, errp);
bdrv_unref(backing_hd);
- if (local_err) {
- error_propagate(errp, local_err);
- ret = -EINVAL;
+ if (ret < 0) {
goto free_exit;
}
--
2.21.3
- [PATCH v2 00/13] block: deal with errp: part I, Vladimir Sementsov-Ogievskiy, 2020/09/17
- [PATCH v2 01/13] block: return status from bdrv_append and friends, Vladimir Sementsov-Ogievskiy, 2020/09/17
- [PATCH v2 02/13] block: use return status of bdrv_append(), Vladimir Sementsov-Ogievskiy, 2020/09/17
- [PATCH v2 04/13] blockdev: fix drive_backup_prepare() missed error, Vladimir Sementsov-Ogievskiy, 2020/09/17
- [PATCH v2 05/13] block: drop extra error propagation for bdrv_set_backing_hd,
Vladimir Sementsov-Ogievskiy <=
- [PATCH v2 03/13] block: check return value of bdrv_open_child and drop error propagation, Vladimir Sementsov-Ogievskiy, 2020/09/17
- [PATCH v2 10/13] block/qcow2-bitmap: return status from qcow2_store_persistent_dirty_bitmaps, Vladimir Sementsov-Ogievskiy, 2020/09/17
- [PATCH v2 06/13] block/mirror: drop extra error propagation in commit_active_start(), Vladimir Sementsov-Ogievskiy, 2020/09/17
- [PATCH v2 07/13] blockjob: return status from block_job_set_speed(), Vladimir Sementsov-Ogievskiy, 2020/09/17
- [PATCH v2 11/13] block/qcow2: read_cache_sizes: return status value, Vladimir Sementsov-Ogievskiy, 2020/09/17
- [PATCH v2 12/13] block/qcow2: simplify qcow2_co_invalidate_cache(), Vladimir Sementsov-Ogievskiy, 2020/09/17