conf: make virt-xml-validate work with vbox domains

virt-xml-validate fails when run on a domain XML file of type 'vbox'.

For failing test case, see https://bugzilla.redhat.com/show_bug.cgi?id=757097

This patch updates the XML schema to accept all valid hypervisor
types, as well as dropping hypervisor types that are not in use
by the current code base.

Signed-off-by: Eric Blake <eblake@redhat.com>

diff --git a/AUTHORS b/AUTHORS
index dff34fcc3fb1a6c9bc097f2cfbecf372bb195f45..59d94626afff5085cb8ec773de1e5fcd792e6e8e 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -208,6 +208,7 @@ Patches have also been contributed by:
   Bharata B Rao        <bharata@linux.vnet.ibm.com>
   Srivatsa S. Bhat     <srivatsa.bhat@linux.vnet.ibm.com>
   Chang Liu            <lingjiao.lc@taobao.com>
+  Lorin Hochstein      <lorin@isi.edu>
 
   [....send patches to get your name here....]
 

diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
index 8968ee6029f5717f8b41c0c58499be0eb9f4bbc7..14b55b229f6b7480a338384d0193907849f4a354 100644 (file)
--- a/docs/schemas/domaincommon.rng
+++ b/docs/schemas/domaincommon.rng
@@ -79,13 +79,18 @@
   <define name="hvs">
     <attribute name="type">
       <choice>
-        <value>xen</value>
-        <value>kvm</value>
-        <value>kqemu</value>
         <value>qemu</value>
+        <value>kqemu</value>
+        <value>kvm</value>
+        <value>xen</value>
         <value>lxc</value>
+        <value>uml</value>
         <value>openvz</value>
         <value>test</value>
+        <value>vmware</value>
+        <value>hyperv</value>
+        <value>vbox</value>
+        <value>phyp</value>
       </choice>
     </attribute>
   </define>

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index bb504f98a626a0af2ad9adb7f99f4cf48391555f..3ea99f73d8f13ff02f99915d7d65bd64f23ee985 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -85,13 +85,10 @@ VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST,
               "lxc",
               "uml",
               "openvz",
-              "vserver",
-              "ldom",
               "test",
               "vmware",
               "hyperv",
               "vbox",
-              "one",
               "phyp")
 
 VIR_ENUM_IMPL(virDomainBoot, VIR_DOMAIN_BOOT_LAST,

diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
index 75111782826256d4c51e0697a72586c261fe90fa..4439f55c12039334c02f668204b98ca4e9760897 100644 (file)
--- a/src/conf/domain_conf.h
+++ b/src/conf/domain_conf.h
@@ -53,13 +53,10 @@ enum virDomainVirtType {
     VIR_DOMAIN_VIRT_LXC,
     VIR_DOMAIN_VIRT_UML,
     VIR_DOMAIN_VIRT_OPENVZ,
-    VIR_DOMAIN_VIRT_VSERVER,
-    VIR_DOMAIN_VIRT_LDOM,
     VIR_DOMAIN_VIRT_TEST,
     VIR_DOMAIN_VIRT_VMWARE,
     VIR_DOMAIN_VIRT_HYPERV,
     VIR_DOMAIN_VIRT_VBOX,
-    VIR_DOMAIN_VIRT_ONE,
     VIR_DOMAIN_VIRT_PHYP,
 
     VIR_DOMAIN_VIRT_LAST,