[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 12/17] qapi: Make parameter 'file' optional for BlockdevCreateOpti
From: |
Daniel P . Berrangé |
Subject: |
[PULL 12/17] qapi: Make parameter 'file' optional for BlockdevCreateOptionsLUKS |
Date: |
Fri, 9 Feb 2024 14:05:00 +0000 |
From: Hyman Huang <yong.huang@smartx.com>
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>
---
block/crypto.c | 21 ++++++++++++++-------
qapi/block-core.json | 5 +++--
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/block/crypto.c b/block/crypto.c
index 68656158e9..e87dc84111 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;
diff --git a/qapi/block-core.json b/qapi/block-core.json
index e7d4fb539b..77d1f50d55 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -4955,7 +4955,8 @@
#
# Driver specific image creation options for LUKS.
#
-# @file: Node to create the image format on
+# @file: Node to create the image format on, mandatory except when
+# 'preallocation' is not requested
#
# @size: Size of the virtual disk in bytes
#
@@ -4966,7 +4967,7 @@
##
{ 'struct': 'BlockdevCreateOptionsLUKS',
'base': 'QCryptoBlockCreateOptionsLUKS',
- 'data': { 'file': 'BlockdevRef',
+ 'data': { '*file': 'BlockdevRef',
'size': 'size',
'*preallocation': 'PreallocMode' } }
--
2.43.0
- [PULL 02/17] crypto: Introduce SM4 symmetric cipher algorithm, (continued)
- [PULL 02/17] crypto: Introduce SM4 symmetric cipher algorithm, Daniel P . Berrangé, 2024/02/09
- [PULL 03/17] qemu_init: increase NOFILE soft limit on POSIX, Daniel P . Berrangé, 2024/02/09
- [PULL 04/17] ui: drop VNC feature _MASK constants, Daniel P . Berrangé, 2024/02/09
- [PULL 05/17] softmmu: remove obsolete comment about libvirt timeouts, Daniel P . Berrangé, 2024/02/09
- [PULL 06/17] scripts: drop comment about autogenerated CPU API file, Daniel P . Berrangé, 2024/02/09
- [PULL 07/17] docs: fix highlighting of CPU ABI header rows, Daniel P . Berrangé, 2024/02/09
- [PULL 10/17] io: add trace event when cancelling TLS handshake, Daniel P . Berrangé, 2024/02/09
- [PULL 09/17] chardev: close QIOChannel before unref'ing, Daniel P . Berrangé, 2024/02/09
- [PULL 08/17] docs: re-generate x86_64 ABI compatibility CSV, Daniel P . Berrangé, 2024/02/09
- [PULL 11/17] crypto: Support LUKS volume with detached header, Daniel P . Berrangé, 2024/02/09
- [PULL 12/17] qapi: Make parameter 'file' optional for BlockdevCreateOptionsLUKS,
Daniel P . Berrangé <=
- [PULL 13/17] crypto: Modify the qcrypto_block_create to support creation flags, Daniel P . Berrangé, 2024/02/09
- [PULL 15/17] block: Support detached LUKS header creation using qemu-img, Daniel P . Berrangé, 2024/02/09
- [PULL 17/17] tests: Add case for LUKS volume with detached header, Daniel P . Berrangé, 2024/02/09
- [PULL 14/17] block: Support detached LUKS header creation using blockdev-create, Daniel P . Berrangé, 2024/02/09
- [PULL 16/17] crypto: Introduce 'detached-header' field in QCryptoBlockInfoLUKS, Daniel P . Berrangé, 2024/02/09
- Re: [PULL 00/17] Misc fixes patches, Peter Maydell, 2024/02/12