diff options
author | Hyman Huang <yong.huang@smartx.com> | 2024-01-30 13:37:20 +0800 |
---|---|---|
committer | Daniel P. Berrangé <berrange@redhat.com> | 2024-02-09 12:50:36 +0000 |
commit | 433957bb7f99d7577601949c92f2fffa9457cd7b (patch) | |
tree | 205391c7805de62d4d134ed215df342d22a27f8b /block | |
parent | 9ad5c4e7ee513019e75ea8ece0d1da6ecce540e6 (diff) | |
download | qemu-433957bb7f99d7577601949c92f2fffa9457cd7b.zip qemu-433957bb7f99d7577601949c92f2fffa9457cd7b.tar.gz qemu-433957bb7f99d7577601949c92f2fffa9457cd7b.tar.bz2 |
qapi: Make parameter 'file' optional for BlockdevCreateOptionsLUKS
To support detached LUKS header creation, make the existing 'file'
field in BlockdevCreateOptionsLUKS optional.
Signed-off-by: Hyman Huang <yong.huang@smartx.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
Diffstat (limited to 'block')
-rw-r--r-- | block/crypto.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/block/crypto.c b/block/crypto.c index 6865615..e87dc84 100644 --- a/block/crypto.c +++ b/block/crypto.c @@ -663,9 +663,9 @@ 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_co_open_blockdev_ref(luks_opts->file, errp); - if (bs == NULL) { - return -EIO; + if (luks_opts->file == NULL) { + error_setg(errp, "Formatting LUKS disk requires parameter 'file'"); + return -EINVAL; } create_opts = (QCryptoBlockCreateOptions) { @@ -677,10 +677,17 @@ block_crypto_co_create_luks(BlockdevCreateOptions *create_options, Error **errp) preallocation = luks_opts->preallocation; } - ret = block_crypto_co_create_generic(bs, luks_opts->size, &create_opts, - preallocation, errp); - if (ret < 0) { - goto fail; + if (luks_opts->file) { + bs = bdrv_co_open_blockdev_ref(luks_opts->file, errp); + if (bs == NULL) { + return -EIO; + } + + ret = block_crypto_co_create_generic(bs, luks_opts->size, &create_opts, + preallocation, errp); + if (ret < 0) { + goto fail; + } } ret = 0; |