conf: Fix virttype handling in schemas

Create a common `virttype` definition in basictypes.rng and reuse it
to enumerate all virt types. This change eliminates the need to duplicate
virttypes in multiple locations.

Signed-off-by: Praveen K Paladugu <prapal@linux.microsoft.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>

diff --git a/src/conf/schemas/basictypes.rng b/src/conf/schemas/basictypes.rng
index 2931e316b764a62a365ee4f866715821f952c346..5689170fad155327b65d6a8b3d8e578f2976b555 100644 (file)
--- a/src/conf/schemas/basictypes.rng
+++ b/src/conf/schemas/basictypes.rng
@@ -677,4 +677,26 @@
     </element>
   </define>
 
+  <define name="virttype">
+    <attribute name="type">
+      <choice>
+        <value>qemu</value>
+        <value>kqemu</value>
+        <value>kvm</value>
+        <value>xen</value>
+        <value>lxc</value>
+        <value>uml</value> <!-- NOT USED ANYMORE -->
+        <value>openvz</value>
+        <value>test</value>
+        <value>vmware</value>
+        <value>hyperv</value>
+        <value>vbox</value>
+        <value>phyp</value> <!-- NOT USED ANYMORE -->
+        <value>vz</value>
+        <value>bhyve</value>
+        <value>hvf</value>
+      </choice>
+    </attribute>
+  </define>
+
 </grammar>

diff --git a/src/conf/schemas/capability.rng b/src/conf/schemas/capability.rng
index a1606941e753711b1ff31f8a2eee58b545cd2565..8ef6e9a2824fe94ee44344c77fcb70a12e0fe93a 100644 (file)
--- a/src/conf/schemas/capability.rng
+++ b/src/conf/schemas/capability.rng
@@ -421,19 +421,7 @@
 
   <define name="domain">
     <element name="domain">
-      <attribute name="type">
-        <choice>
-          <value>qemu</value>
-          <value>kqemu</value>
-          <value>kvm</value>
-          <value>xen</value>
-          <value>uml</value> <!-- NOT USED ANYMORE -->
-          <value>lxc</value>
-          <value>openvz</value>
-          <value>test</value>
-          <value>hvf</value>
-        </choice>
-      </attribute>
+      <ref name="virttype"/>
 
       <optional>
         <ref name="emulator"/>

diff --git a/src/conf/schemas/domaincommon.rng b/src/conf/schemas/domaincommon.rng
index 78cf0a08cf394fe4f24436b88395460bbecafb62..d3255e2dd8527960b99c8d5417bfd243806e07a2 100644 (file)
--- a/src/conf/schemas/domaincommon.rng
+++ b/src/conf/schemas/domaincommon.rng
@@ -32,7 +32,7 @@
   </define>
 
   <define name="domaincontents">
-    <ref name="hvs"/>
+    <ref name="virttype"/>
     <optional>
       <attribute name="id">
         <ref name="unsignedInt"/>
@@ -241,27 +241,6 @@
       </choice>
     </element>
   </define>
-  <define name="hvs">
-    <attribute name="type">
-      <choice>
-        <value>qemu</value>
-        <value>kqemu</value>
-        <value>kvm</value>
-        <value>xen</value>
-        <value>lxc</value>
-        <value>uml</value> <!-- NOT USED ANYMORE -->
-        <value>openvz</value>
-        <value>test</value>
-        <value>vmware</value>
-        <value>hyperv</value>
-        <value>vbox</value>
-        <value>phyp</value> <!-- NOT USED ANYMORE -->
-        <value>vz</value>
-        <value>bhyve</value>
-        <value>hvf</value>
-      </choice>
-    </attribute>
-  </define>
   <define name="os">
     <choice>
       <ref name="osxen"/>