schema: bhyve and nmdm updates

* docs/schemas/domaincommon.rng: Add bhyve domain type, nmdm
  serial type and master and slave optional attributes for
  serial that are used by nmdm
* tests/domainschematest: Add bhyvexml2argvdata directory
  to validate bhyve XMLs

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index f6f697c85558db4eae6c8553fae827e0eea317b2..7ace1c228d77431d81441dc1fd7d6df8fb03214b 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -201,6 +201,7 @@
         <value>vbox</value>
         <value>phyp</value>
         <value>parallels</value>
+        <value>bhyve</value>
       </choice>
     </attribute>
   </define>
@@ -3010,6 +3011,7 @@
       <value>pty</value>
       <value>spicevmc</value>
       <value>spiceport</value>
+      <value>nmdm</value>
     </choice>
   </define>
 
@@ -3082,6 +3084,12 @@
         <optional>
           <attribute name="channel"/>
         </optional>
+        <optional>
+          <attribute name="master"/>
+        </optional>
+        <optional>
+          <attribute name="slave"/>
+        </optional>
         <optional>
           <ref name='devSeclabel'/>
         </optional>

diff --git a/tests/domainschematest b/tests/domainschematest
index 9ebf0b9a58043aca2b9d908c3643175ecaf2bdc1..ba9018091a7968aebbcde1592528b2db67278e89 100755 (executable)
--- a/tests/domainschematest
+++ b/tests/domainschematest
@@ -6,8 +6,9 @@
 
 DIRS=""
 DIRS="$DIRS domainschemadata qemuxml2argvdata sexpr2xmldata"
-DIRS="$DIRS xmconfigdata xml2sexprdata qemuxml2xmloutdata "
+DIRS="$DIRS xmconfigdata xml2sexprdata qemuxml2xmloutdata"
 DIRS="$DIRS lxcxml2xmldata lxcxml2xmloutdata"
+DIRS="$DIRS bhyvexml2argvdata"
 SCHEMA="domain.rng"
 
 check_schema "$DIRS" "$SCHEMA"