[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 03/13] luks: Fix .bdrv_co_create(_opts) to open images with no_co
From: |
Kevin Wolf |
Subject: |
[PATCH 03/13] luks: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper |
Date: |
Thu, 26 Jan 2023 18:24:22 +0100 |
.bdrv_co_create implementations run in a coroutine. Therefore they are
not allowed to open images directly. Fix the calls to use the
corresponding no_co_wrappers instead.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block/crypto.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/block/crypto.c b/block/crypto.c
index b70cec97c7..9c477397c7 100644
--- a/block/crypto.c
+++ b/block/crypto.c
@@ -325,8 +325,8 @@ static int block_crypto_co_create_generic(BlockDriverState
*bs,
QCryptoBlock *crypto = NULL;
struct BlockCryptoCreateData data;
- blk = blk_new_with_bs(bs, BLK_PERM_WRITE | BLK_PERM_RESIZE, BLK_PERM_ALL,
- errp);
+ blk = blk_co_new_with_bs(bs, BLK_PERM_WRITE | BLK_PERM_RESIZE,
BLK_PERM_ALL,
+ errp);
if (!blk) {
ret = -EPERM;
goto cleanup;
@@ -639,7 +639,7 @@ block_crypto_co_create_luks(BlockdevCreateOptions
*create_options, Error **errp)
assert(create_options->driver == BLOCKDEV_DRIVER_LUKS);
luks_opts = &create_options->u.luks;
- bs = bdrv_open_blockdev_ref(luks_opts->file, errp);
+ bs = bdrv_co_open_blockdev_ref(luks_opts->file, errp);
if (bs == NULL) {
return -EIO;
}
@@ -708,8 +708,8 @@ static int coroutine_fn
block_crypto_co_create_opts_luks(BlockDriver *drv,
goto fail;
}
- bs = bdrv_open(filename, NULL, NULL,
- BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL, errp);
+ bs = bdrv_co_open(filename, NULL, NULL,
+ BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL, errp);
if (!bs) {
ret = -EINVAL;
goto fail;
--
2.38.1
- [PATCH 00/13] block: Fix bdrv_open*() calls from coroutine context, Kevin Wolf, 2023/01/26
- [PATCH 02/13] block: Create no_co_wrappers for open functions, Kevin Wolf, 2023/01/26
- [PATCH 03/13] luks: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper,
Kevin Wolf <=
- [PATCH 01/13] block-coroutine-wrapper: Introduce no_co_wrapper, Kevin Wolf, 2023/01/26
- [PATCH 08/13] vdi: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper, Kevin Wolf, 2023/01/26
- [PATCH 07/13] qed: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper, Kevin Wolf, 2023/01/26
- [PATCH 06/13] qcow2: Fix open/create to open images with no_co_wrapper, Kevin Wolf, 2023/01/26
- [PATCH 11/13] vpc: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper, Kevin Wolf, 2023/01/26
- [PATCH 12/13] block: Fix bdrv_co_create_opts_simple() to open images with no_co_wrapper, Kevin Wolf, 2023/01/26
- [PATCH 05/13] qcow: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper, Kevin Wolf, 2023/01/26
- [PATCH 04/13] parallels: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper, Kevin Wolf, 2023/01/26
- [PATCH 10/13] vmdk: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper, Kevin Wolf, 2023/01/26
- [PATCH 09/13] vhdx: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper, Kevin Wolf, 2023/01/26