]> xenbits.xensource.com Git - libvirt.git/commit
conf: Add/Allow parsing the encryption in the disk source
authorJohn Ferlan <jferlan@redhat.com>
Thu, 14 Sep 2017 13:32:57 +0000 (09:32 -0400)
committerJohn Ferlan <jferlan@redhat.com>
Thu, 19 Oct 2017 19:32:50 +0000 (15:32 -0400)
commit37537a7c64b43be2eebf8b0cea7c6d445e214806
treece0bfea945f32acd32e91c6b670fb38ba6bc8090
parent8002d3cb1b1c3d34ab89cf5c4fb7611ad64140e4
conf: Add/Allow parsing the encryption in the disk source

Since the virStorageEncryptionPtr encryption; is a member of
 _virStorageSource it really should be allowed to be a subelement
of the disk <source> for various disk formats:

   Source{File|Dir|Block|Volume}
   SourceProtocol{RBD|ISCSI|NBD|Gluster|Simple|HTTP}

NB: Simple includes sheepdog, ftp, ftps, tftp

That way we can set up to allow the <encryption> element to be
formatted within the disk source, but we still need to be wary
from whence the element was read - see keep track and when it
comes to format the data, ensure it's written in the correct place.

Modify the qemuxml2argvtest to add a parse failure when there is an
<encryption> as a child of <disk> *and* an <encryption> as a child
of <source>.

The virschematest will read the new test files and validate from a
RNG viewpoint things are fine.
docs/formatdomain.html.in
docs/schemas/domaincommon.rng
src/conf/domain_conf.c
src/util/virstoragefile.h
tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source-both.xml [new file with mode: 0644]
tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source.args [new file with mode: 0644]
tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source.xml [new file with mode: 0644]
tests/qemuxml2argvtest.c
tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks-source.xml [new file with mode: 0644]
tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks.xml [changed from symlink to file mode: 0644]
tests/qemuxml2xmltest.c