On Wed, Oct 06, 2021 at 05:18:44 -0500, Or Ozeri wrote: > This commit extends libvirt XML configuration to support luks2 encryption format. > This means that <encryption format="luks2"> becomes valid. > Actual handler (other than returning "not supported") for this new format will be added in an upcoming commit. > > Signed-off-by: Or Ozeri <oro@xxxxxxxxxx> > --- > docs/formatstorageencryption.html.in | 2 +- > docs/schemas/storagecommon.rng | 1 + > src/conf/storage_encryption_conf.c | 2 +- > src/conf/storage_encryption_conf.h | 1 + > src/qemu/qemu_block.c | 1 + > src/qemu/qemu_domain.c | 3 ++- > 6 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/docs/formatstorageencryption.html.in b/docs/formatstorageencryption.html.in > index 7215c307d7..b2631ab25d 100644 > --- a/docs/formatstorageencryption.html.in > +++ b/docs/formatstorageencryption.html.in > @@ -18,7 +18,7 @@ > is <code>encryption</code>, with a mandatory > attribute <code>format</code>. Currently defined values > of <code>format</code> are <code>default</code>, <code>qcow</code>, > - and <code>luks</code>. > + <code>luks</code>, and <code>luks2</code>. > Each value of <code>format</code> implies some expectations about the > content of the <code>encryption</code> tag. Other format values may be > defined in the future. Note that this section you've added 'luks2' into is then followed by sections on each encryption format. E.g. direct link to the 'luks' section https://www.libvirt.org/formatstorageencryption.html#StorageEncryptionLuks You should add a similar section for luks2 outling that it's currently supported only with librbd2 direct acess and not qcow2 images and neither the storage driver so that it's clear. The rest of the patch looks good.
