Am 29.01.2023 um 12:31 hat o...@il.ibm.com geschrieben:
> From: Or Ozeri <o...@il.ibm.com>
>
> Ceph RBD encryption API required specifying the encryption format
> for loading encryption. The supported formats were LUKS (v1) and LUKS2.
>
> Starting from Reef release, RBD also supports loading with "luks-any" format,
> which works for both versions of LUKS.
>
> This commit extends the qemu rbd driver API to enable qemu users to use
> this luks-any wildcard format.
>
> Signed-off-by: Or Ozeri <o...@il.ibm.com>
> diff --git a/qapi/block-core.json b/qapi/block-core.json
> index 95ac4fa634..e59fb5d453 100644
> --- a/qapi/block-core.json
> +++ b/qapi/block-core.json
> @@ -3827,10 +3827,16 @@
> ##
> # @RbdImageEncryptionFormat:
> #
> +# luks
> +#
> +# luks2
If we don't want to document these values, there's no reason to have
them listed at all. After all, the undocumented list is already in the
definition.
> +# luks-any: Used for opening either luks or luks2. (Since 8.0)
And here it should be '@luks-any' with @.
> # Since: 6.1
> ##
> { 'enum': 'RbdImageEncryptionFormat',
> - 'data': [ 'luks', 'luks2' ] }
> + 'data': [ 'luks', 'luks2', 'luks-any' ] }
I've fixed this up and applied the series to my block branch. Thanks!
Kevin
