Add LXC XML files to schema test & fix problems this uncovers

* docs/schemas/domaincommon.rng: Add missing lxc & openvz
  console target types. Allow arch on LXC <os> type element
* tests/domainschematest: Include tests/lxcxml2xmldata/

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 730f3d8e8ba339d19f24d13a95eb1f5793f3e58d..5ed47aca63524616321cd52370e1e1dd6a9b7f54 100644 (file)
--- 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 7557cef5d6b0c9c2eaaec30f5b757f20f9b9cd9d..0e360caae903fff533235c986741d45db8b7bbd3 100755 (executable)
--- a/tests/domainschematest
+++ b/tests/domainschematest
@@ -4,7 +4,10 @@
 . $srcdir/test-lib.sh
 . $abs_srcdir/schematestutils.sh
 
-DIRS="domainschemadata qemuxml2argvdata sexpr2xmldata xmconfigdata xml2sexprdata qemuxml2xmloutdata"
+DIRS=""
+DIRS="$DIRS domainschemadata qemuxml2argvdata sexpr2xmldata"
+DIRS="$DIRS xmconfigdata xml2sexprdata qemuxml2xmloutdata "
+DIRS="$DIRS lxcxml2xmldata"
 SCHEMA="domain.rng"
 
 check_schema "$DIRS" "$SCHEMA"