]> xenbits.xensource.com Git - people/liuw/libxenctrl-split/libvirt.git/commit
conf: split <disk> schema into more pieces
authorEric Blake <eblake@redhat.com>
Mon, 14 Apr 2014 22:54:16 +0000 (16:54 -0600)
committerJiri Denemark <jdenemar@redhat.com>
Wed, 16 Apr 2014 08:45:55 +0000 (10:45 +0200)
commitfec1a93927c860934b4e983dce4ecbbe44485a93
treee755db11f18e06dc8d900754cae16636023afd81
parent369cdfa8f54c9848cc44327fb9b2bb67e01def8a
conf: split <disk> schema into more pieces

To make <disk> schema more maintainable and to allow for moving the
pieces to a common file in the future. It relies on the ability to
override definitions as part of an include, set up in the previous
patch.

The diff is a bit hard to read, because it mixes reindentation
with refactoring; 'git diff -b --patience' may help.

* docs/schemas/domaincommon.rng (disk): Refactor into pieces.
(diskSource, diskSourceFile, diskSourceBlock, diskSourceDir)
(diskSourceVolume: New defines.
(diskSourceNetwork): Revise scope.
* docs/schemas/domainsnapshot.rng (disksnapshot): Adjust.
* tests/domainsnapshotxml2xmlin/disk-seclabel-invalid.xml,
tests/domainsnapshotxml2xmlin/disk-network-seclabel-invalid.xml: New
tests to check seclabel is forbidden in domain snapshot by schema.

Signed-off-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
docs/schemas/domaincommon.rng
docs/schemas/domainsnapshot.rng
tests/domainsnapshotxml2xmlin/disk-network-seclabel-invalid.xml [new file with mode: 0644]
tests/domainsnapshotxml2xmlin/disk-seclabel-invalid.xml [new file with mode: 0644]