[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 15/18] block/qcow2: implement blockdev-amend
From: |
Max Reitz |
Subject: |
[PULL 15/18] block/qcow2: implement blockdev-amend |
Date: |
Mon, 22 Jun 2020 17:10:56 +0200 |
From: Maxim Levitsky <mlevitsk@redhat.com>
Currently the implementation only supports amending the encryption
options, unlike the qemu-img version
Signed-off-by: Maxim Levitsky <mlevitsk@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20200608094030.670121-14-mlevitsk@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
---
qapi/block-core.json | 16 +++++++++++++++-
block/qcow2.c | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 54 insertions(+), 1 deletion(-)
diff --git a/qapi/block-core.json b/qapi/block-core.json
index cd679ad435..b20332e592 100644
--- a/qapi/block-core.json
+++ b/qapi/block-core.json
@@ -4686,6 +4686,19 @@
'data': { }
}
+##
+# @BlockdevAmendOptionsQcow2:
+#
+# Driver specific image amend options for qcow2.
+# For now, only encryption options can be amended
+#
+# @encrypt Encryption options to be amended
+#
+# Since: 5.1
+##
+{ 'struct': 'BlockdevAmendOptionsQcow2',
+ 'data': { '*encrypt': 'QCryptoBlockAmendOptions' } }
+
##
# @BlockdevAmendOptions:
#
@@ -4700,7 +4713,8 @@
'driver': 'BlockdevDriver' },
'discriminator': 'driver',
'data': {
- 'luks': 'BlockdevAmendOptionsLUKS' } }
+ 'luks': 'BlockdevAmendOptionsLUKS',
+ 'qcow2': 'BlockdevAmendOptionsQcow2' } }
##
# @x-blockdev-amend:
diff --git a/block/qcow2.c b/block/qcow2.c
index 0e72e8fc39..0d2d05d1f7 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -5585,6 +5585,44 @@ static int qcow2_amend_options(BlockDriverState *bs,
QemuOpts *opts,
return 0;
}
+static int coroutine_fn qcow2_co_amend(BlockDriverState *bs,
+ BlockdevAmendOptions *opts,
+ bool force,
+ Error **errp)
+{
+ BlockdevAmendOptionsQcow2 *qopts = &opts->u.qcow2;
+ BDRVQcow2State *s = bs->opaque;
+ int ret = 0;
+
+ if (qopts->has_encrypt) {
+ if (!s->crypto) {
+ error_setg(errp, "image is not encrypted, can't amend");
+ return -EOPNOTSUPP;
+ }
+
+ if (qopts->encrypt->format != Q_CRYPTO_BLOCK_FORMAT_LUKS) {
+ error_setg(errp,
+ "Amend can't be used to change the qcow2 encryption
format");
+ return -EOPNOTSUPP;
+ }
+
+ if (s->crypt_method_header != QCOW_CRYPT_LUKS) {
+ error_setg(errp,
+ "Only LUKS encryption options can be amended for qcow2
with blockdev-amend");
+ return -EOPNOTSUPP;
+ }
+
+ ret = qcrypto_block_amend_options(s->crypto,
+ qcow2_crypto_hdr_read_func,
+ qcow2_crypto_hdr_write_func,
+ bs,
+ qopts->encrypt,
+ force,
+ errp);
+ }
+ return ret;
+}
+
/*
* If offset or size are negative, respectively, they will not be included in
* the BLOCK_IMAGE_CORRUPTED event emitted.
@@ -5802,6 +5840,7 @@ BlockDriver bdrv_qcow2 = {
.mutable_opts = mutable_opts,
.bdrv_co_check = qcow2_co_check,
.bdrv_amend_options = qcow2_amend_options,
+ .bdrv_co_amend = qcow2_co_amend,
.bdrv_detach_aio_context = qcow2_detach_aio_context,
.bdrv_attach_aio_context = qcow2_attach_aio_context,
--
2.26.2
- [PULL 05/18] qcrypto/luks: implement encryption key management, (continued)
- [PULL 05/18] qcrypto/luks: implement encryption key management, Max Reitz, 2020/06/22
- [PULL 06/18] block/amend: add 'force' option, Max Reitz, 2020/06/22
- [PULL 04/18] qcrypto/core: add generic infrastructure for crypto options amendment, Max Reitz, 2020/06/22
- [PULL 08/18] block/amend: refactor qcow2 amend options, Max Reitz, 2020/06/22
- [PULL 11/18] block/qcow2: extend qemu-img amend interface with crypto options, Max Reitz, 2020/06/22
- [PULL 14/18] block/crypto: implement blockdev-amend, Max Reitz, 2020/06/22
- [PULL 18/18] iotests: don't test qcow2.py inside 291, Max Reitz, 2020/06/22
- [PULL 13/18] block/core: add generic infrastructure for x-blockdev-amend qmp command, Max Reitz, 2020/06/22
- [PULL 12/18] iotests: qemu-img tests for luks key management, Max Reitz, 2020/06/22
- [PULL 17/18] iotests: Fix 051 output after qdev_init_nofail() removal, Max Reitz, 2020/06/22
- [PULL 15/18] block/qcow2: implement blockdev-amend,
Max Reitz <=
- [PULL 16/18] iotests: add tests for blockdev-amend, Max Reitz, 2020/06/22
- Re: [PULL 00/18] Block patches, no-reply, 2020/06/22
- Re: [PULL 00/18] Block patches, Peter Maydell, 2020/06/23