On Thu, Oct 05, 2017 at 09:22:14 -0400, John Ferlan wrote:
> 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.
>
> Signed-off-by: John Ferlan <jferlan@xxxxxxxxxx>
> ---
> docs/formatdomain.html.in | 15 +++-
> docs/schemas/domaincommon.rng | 30 ++++++++
> src/conf/domain_conf.c | 68 ++++++++++++++++--
> src/util/virstoragefile.h | 1 +
> .../qemuxml2argv-luks-disks-source-both.xml | 40 +++++++++++
> .../qemuxml2argv-luks-disks-source.args | 62 ++++++++++++++++
> .../qemuxml2argv-luks-disks-source.xml | 81 +++++++++++++++++++++
> tests/qemuxml2argvtest.c | 2 +
> .../qemuxml2xmlout-luks-disks-source.xml | 84 ++++++++++++++++++++++
> .../qemuxml2xmlout-luks-disks.xml | 46 +++++++++++-
> tests/qemuxml2xmltest.c | 1 +
> 11 files changed, 420 insertions(+), 10 deletions(-)
> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source-both.xml
> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source.args
> create mode 100644 tests/qemuxml2argvdata/qemuxml2argv-luks-disks-source.xml
> create mode 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks-source.xml
> mode change 120000 => 100644 tests/qemuxml2xmloutdata/qemuxml2xmlout-luks-disks.xml
>
ACK with the same comment as for 1/16
Attachment:
signature.asc
Description: PGP signature
-- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list
