[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 17/17] block/qcow2: refactor qcow2_update_options_prepare error pa
From: |
Eric Blake |
Subject: |
[PULL 17/17] block/qcow2: refactor qcow2_update_options_prepare error paths |
Date: |
Tue, 9 Mar 2021 09:52:02 -0600 |
From: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Keep setting ret close to setting errp and don't merge different error
paths into one. This way it's more obvious that we don't return
error without setting errp.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Alberto Garcia <berto@igalia.com>
Message-Id: <20210202124956.63146-15-vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
block/qcow2.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/block/qcow2.c b/block/qcow2.c
index a1dee95dea6c..0db1227ac909 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -1158,6 +1158,10 @@ static int qcow2_update_options_prepare(BlockDriverState
*bs,
}
qdict_put_str(encryptopts, "format", "qcow");
r->crypto_opts = block_crypto_open_opts_init(encryptopts, errp);
+ if (!r->crypto_opts) {
+ ret = -EINVAL;
+ goto fail;
+ }
break;
case QCOW_CRYPT_LUKS:
@@ -1170,14 +1174,15 @@ static int
qcow2_update_options_prepare(BlockDriverState *bs,
}
qdict_put_str(encryptopts, "format", "luks");
r->crypto_opts = block_crypto_open_opts_init(encryptopts, errp);
+ if (!r->crypto_opts) {
+ ret = -EINVAL;
+ goto fail;
+ }
break;
default:
error_setg(errp, "Unsupported encryption method %d",
s->crypt_method_header);
- break;
- }
- if (s->crypt_method_header != QCOW_CRYPT_NONE && !r->crypto_opts) {
ret = -EINVAL;
goto fail;
}
--
2.30.1
- [PULL 04/17] utils: Improve qemu_strtosz() to have 64 bits of precision, (continued)
- [PULL 04/17] utils: Improve qemu_strtosz() to have 64 bits of precision, Eric Blake, 2021/03/09
- [PULL 01/17] MAINTAINERS: add Vladimir as co-maintainer of NBD, Eric Blake, 2021/03/09
- [PULL 07/17] blockdev: fix drive_backup_prepare() missed error, Eric Blake, 2021/03/09
- [PULL 06/17] block: check return value of bdrv_open_child and drop error propagation, Eric Blake, 2021/03/09
- [PULL 05/17] utils: Deprecate hex-with-suffix sizes, Eric Blake, 2021/03/09
- [PULL 12/17] block/qcow2-bitmap: improve qcow2_load_dirty_bitmaps() interface, Eric Blake, 2021/03/09
- [PULL 11/17] block/qcow2: qcow2_get_specific_info(): drop error propagation, Eric Blake, 2021/03/09
- [PULL 13/17] block/qcow2-bitmap: return status from qcow2_store_persistent_dirty_bitmaps, Eric Blake, 2021/03/09
- [PULL 10/17] blockjob: return status from block_job_set_speed(), Eric Blake, 2021/03/09
- [PULL 16/17] block/qed: bdrv_qed_do_open: deal with errp, Eric Blake, 2021/03/09
- [PULL 17/17] block/qcow2: refactor qcow2_update_options_prepare error paths,
Eric Blake <=
- [PULL 08/17] block: drop extra error propagation for bdrv_set_backing_hd, Eric Blake, 2021/03/09
- [PULL 14/17] block/qcow2: read_cache_sizes: return status value, Eric Blake, 2021/03/09
- [PULL 09/17] block/mirror: drop extra error propagation in commit_active_start(), Eric Blake, 2021/03/09
- [PULL 15/17] block/qcow2: simplify qcow2_co_invalidate_cache(), Eric Blake, 2021/03/09
- Re: [PULL 00/17] NBD patches through 2021-03-09, Peter Maydell, 2021/03/11
- Re: [PULL 00/17] NBD patches through 2021-03-09, Peter Maydell, 2021/03/11