[libvirt] [PATCH 2/2] Add LXC XML files to schema test & fix problems this uncovers
From: "Daniel P. Berrange" <berrange(a)redhat.com>
* docs/schemas/domaincommon.rng: Add missing lxc & openvz
console target types. Allow arch on LXC <os> type element
* tests/domainschematest: Include tests/lxcxml2xmldata/
---
docs/schemas/domaincommon.rng | 14 ++++++++++++++
tests/domainschematest | 2 +-
2 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 730f3d8..5ed47ac 100644
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -370,6 +370,18 @@
<define name="osexe">
<element name="os">
<element name="type">
+ <optional>
+ <attribute name="arch">
+ <choice>
+ <value>i686</value>
+ <value>x86_64</value>
+ <value>ppc</value>
+ <value>ppc64</value>
+ <value>mips</value>
+ <value>sparc</value>
+ </choice>
+ </attribute>
+ </optional>
<value>exe</value>
</element>
<interleave>
@@ -2103,6 +2115,8 @@
<value>serial</value>
<value>uml</value>
<value>virtio</value>
+ <value>lxc</value>
+ <value>openvz</value>
</choice>
</attribute>
</define>
diff --git a/tests/domainschematest b/tests/domainschematest
index 7557cef..18faa62 100755
--- a/tests/domainschematest
+++ b/tests/domainschematest
@@ -4,7 +4,7 @@
. $srcdir/test-lib.sh
. $abs_srcdir/schematestutils.sh
-DIRS="domainschemadata qemuxml2argvdata sexpr2xmldata xmconfigdata xml2sexprdata
qemuxml2xmloutdata"
+DIRS="domainschemadata qemuxml2argvdata sexpr2xmldata xmconfigdata xml2sexprdata
qemuxml2xmloutdata lxcxml2xmldata"
SCHEMA="domain.rng"
check_schema "$DIRS" "$SCHEMA"
--
1.7.7.6