ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

luks: Fix .bdrv_co_create(_opts) to open images with no_co_wrapper 

.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>
Message-Id: <20230126172432.436111-4-kwolf@redhat.com>
Reviewed-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Hanna Czenczek <hreitz@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2023-01-26 18:24:22 +01:00
parent 4bee90e9da
commit 91817e9c58
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
block/crypto.c
View File

@ -314,19 +314,18 @@ static int block_crypto_open_generic(QCryptoBlockFormat format,
} }
static int block_crypto_co_create_generic(BlockDriverState *bs, static int coroutine_fn
int64_t size, block_crypto_co_create_generic(BlockDriverState *bs, int64_t size,
QCryptoBlockCreateOptions *opts, QCryptoBlockCreateOptions *opts,
PreallocMode prealloc, PreallocMode prealloc, Error **errp)
Error **errp)
{ {
int ret; int ret;
BlockBackend *blk; BlockBackend *blk;
QCryptoBlock *crypto = NULL; QCryptoBlock *crypto = NULL;
struct BlockCryptoCreateData data; struct BlockCryptoCreateData data;
blk = blk_new_with_bs(bs, BLK_PERM_WRITE | BLK_PERM_RESIZE, BLK_PERM_ALL, blk = blk_co_new_with_bs(bs, BLK_PERM_WRITE | BLK_PERM_RESIZE, BLK_PERM_ALL,
errp); errp);
if (!blk) { if (!blk) {
ret = -EPERM; ret = -EPERM;
goto cleanup; goto cleanup;
@ -639,7 +638,7 @@ block_crypto_co_create_luks(BlockdevCreateOptions *create_options, Error **errp)
assert(create_options->driver == BLOCKDEV_DRIVER_LUKS); assert(create_options->driver == BLOCKDEV_DRIVER_LUKS);
luks_opts = &create_options->u.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) { if (bs == NULL) {
return -EIO; return -EIO;
} }
@ -708,8 +707,8 @@ static int coroutine_fn block_crypto_co_create_opts_luks(BlockDriver *drv,
goto fail; goto fail;
} }
bs = bdrv_open(filename, NULL, NULL, bs = bdrv_co_open(filename, NULL, NULL,
BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL, errp); BDRV_O_RDWR | BDRV_O_RESIZE | BDRV_O_PROTOCOL, errp);
if (!bs) { if (!bs) {
ret = -EINVAL; ret = -EINVAL;
goto fail; goto fail;