Eric Blake a9efe2d70c conf: better <disk> interleaving in schema
In general, we try to make virt-xml-validate tolerant of input
elements in any order when possible.  However, as written, the
RNG grammar did not permit <source> unless there was an explicit
type= attribute (even though the C code manages just fine by
defaulting to type='file').  After making the attribute optional
on the 'file' branch, I noticed that the use of diskspec was now
redundant with the branch when no <source> was supplied.

View this patch with 'git diff -b' for a better picture of the
schema change.

* docs/schemas/domaincommon.rng (disk): Hoist 'diskspec' out of
choice, make type='file' default, and still preserve interleave.
* tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-source-pool.xml:
* tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-drive-discard.xml:
New files.
* tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.xml:
* tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.xml:
Reorder XML.
* tests/qemuxml2xmltest.c (mymain): Cover new files.

Signed-off-by: Eric Blake <eblake@redhat.com>
2014-04-15 11:45:02 +02:00
..
2013-12-02 10:21:26 +08:00
2014-03-13 06:54:56 +01:00
2013-12-02 11:59:18 -07:00
2013-12-02 10:21:26 +08:00
2014-03-01 23:44:58 +04:00
2014-03-03 17:41:26 +04:00
2013-12-02 10:21:26 +08:00
2014-02-18 14:46:49 +01:00
2014-03-01 23:44:58 +04:00
2009-07-16 15:06:42 +02:00
2014-04-01 15:29:53 +08:00
2009-07-29 09:04:21 +01:00
2013-12-02 10:21:26 +08:00
2013-09-12 17:18:32 +08:00
2013-11-26 18:37:09 +08:00
2014-03-01 23:44:58 +04:00