External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Lorin Hochstein 2011-11-28 09:26:57 -05:00 committed by Eric Blake
parent a6916977bb
commit 8078a90a24
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -208,6 +208,7 @@ Patches have also been contributed by:
Bharata B Rao <bharata@linux.vnet.ibm.com> Bharata B Rao <bharata@linux.vnet.ibm.com>
Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com> Srivatsa S. Bhat <srivatsa.bhat@linux.vnet.ibm.com>
Chang Liu <lingjiao.lc@taobao.com> Chang Liu <lingjiao.lc@taobao.com>
Lorin Hochstein <lorin@isi.edu>
[....send patches to get your name here....] [....send patches to get your name here....]

11
docs/schemas/domaincommon.rng
View File

@ -79,13 +79,18 @@
<define name="hvs"> <define name="hvs">
<attribute name="type"> <attribute name="type">
<choice> <choice>
<value>xen</value>
<value>kvm</value>
<value>kqemu</value>
<value>qemu</value> <value>qemu</value>
<value>kqemu</value>
<value>kvm</value>
<value>xen</value>
<value>lxc</value> <value>lxc</value>
<value>uml</value>
<value>openvz</value> <value>openvz</value>
<value>test</value> <value>test</value>
<value>vmware</value>
<value>hyperv</value>
<value>vbox</value>
<value>phyp</value>
</choice> </choice>
</attribute> </attribute>
</define> </define>

3
src/conf/domain_conf.c
View File

@ -85,13 +85,10 @@ VIR_ENUM_IMPL(virDomainVirt, VIR_DOMAIN_VIRT_LAST,
"lxc", "lxc",
"uml", "uml",
"openvz", "openvz",
"vserver",
"ldom",
"test", "test",
"vmware", "vmware",
"hyperv", "hyperv",
"vbox", "vbox",
"one",
"phyp") "phyp")
VIR_ENUM_IMPL(virDomainBoot, VIR_DOMAIN_BOOT_LAST, VIR_ENUM_IMPL(virDomainBoot, VIR_DOMAIN_BOOT_LAST,

3
src/conf/domain_conf.h
View File

@ -53,13 +53,10 @@ enum virDomainVirtType {
VIR_DOMAIN_VIRT_LXC, VIR_DOMAIN_VIRT_LXC,
VIR_DOMAIN_VIRT_UML, VIR_DOMAIN_VIRT_UML,
VIR_DOMAIN_VIRT_OPENVZ, VIR_DOMAIN_VIRT_OPENVZ,
VIR_DOMAIN_VIRT_VSERVER,
VIR_DOMAIN_VIRT_LDOM,
VIR_DOMAIN_VIRT_TEST, VIR_DOMAIN_VIRT_TEST,
VIR_DOMAIN_VIRT_VMWARE, VIR_DOMAIN_VIRT_VMWARE,
VIR_DOMAIN_VIRT_HYPERV, VIR_DOMAIN_VIRT_HYPERV,
VIR_DOMAIN_VIRT_VBOX, VIR_DOMAIN_VIRT_VBOX,
VIR_DOMAIN_VIRT_ONE,
VIR_DOMAIN_VIRT_PHYP, VIR_DOMAIN_VIRT_PHYP,
VIR_DOMAIN_VIRT_LAST, VIR_DOMAIN_VIRT_LAST,