From 72c507317ae4260e3ee2b657b848d70f5d45edcf Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Mon, 26 Mar 2012 18:11:09 +0100
Subject: [PATCH] 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/
---
 docs/schemas/domaincommon.rng | 14 ++++++++++++++
 tests/domainschematest        |  5 ++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 730f3d8e8b..5ed47aca63 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 7557cef5d6..0e360caae9 100755
--- 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"