[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 05/14] block: drop extra error propagation for bdrv_set_backing_h
From: |
Vladimir Sementsov-Ogievskiy |
Subject: |
[PATCH 05/14] block: drop extra error propagation for bdrv_set_backing_hd |
Date: |
Wed, 9 Sep 2020 21:59:21 +0300 |
bdrv_set_backing_hd now returns status, let's use it.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
---
block.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index 9b624b2535..c5e3a1927e 100644
--- a/block.c
+++ b/block.c
@@ -3011,11 +3011,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 02/14] block: use return status of bdrv_append(), (continued)
- [PATCH 02/14] block: use return status of bdrv_append(), Vladimir Sementsov-Ogievskiy, 2020/09/09
- [PATCH 01/14] block: return status from bdrv_append and friends, Vladimir Sementsov-Ogievskiy, 2020/09/09
- [PATCH 03/14] block: check return value of bdrv_open_child and drop error propagation, Vladimir Sementsov-Ogievskiy, 2020/09/09
- [PATCH 05/14] block: drop extra error propagation for bdrv_set_backing_hd,
Vladimir Sementsov-Ogievskiy <=
- [PATCH 04/14] blockdev: fix drive_backup_prepare() missed error, Vladimir Sementsov-Ogievskiy, 2020/09/09
- [PATCH 10/14] block/qcow2-bitmap: improve qcow2_load_dirty_bitmaps() interface, Vladimir Sementsov-Ogievskiy, 2020/09/09
- [PATCH 07/14] block/blklogwrites: drop error propagation, Vladimir Sementsov-Ogievskiy, 2020/09/09