[libvirt] [PATCH] Make virt-xml-validate work with xbox 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 so it accepts type 'vbox'. --- diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8968ee6..444592c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -85,6 +85,7 @@ <value>qemu</value> <value>lxc</value> <value>openvz</value> + <value>vbox</value> <value>test</value> </choice> </attribute>
s/xbox/vbox/ in the subject On 11/28/2011 07:26 AM, Lorin Hochstein wrote:
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 so it accepts type 'vbox'.
---
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8968ee6..444592c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -85,6 +85,7 @@ <value>qemu</value> <value>lxc</value> <value>openvz</value> + <value>vbox</value> <value>test</value>
ACK that we had a problem. Actually, it was more than just vbox missing. virDomainVirtTypeToString in domain_conf.c has the full list; on the other hand, that list had elements that aren't in use by any existing hypervisor driver. Here's what I'm squashing into your patch before pushing. I also added you to AUTHORS; let me know if I need to update any preferred spelling. diff --git i/docs/schemas/domaincommon.rng w/docs/schemas/domaincommon.rng index 444592c..14b55b2 100644 --- i/docs/schemas/domaincommon.rng +++ w/docs/schemas/domaincommon.rng @@ -79,14 +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>vbox</value> <value>test</value> + <value>vmware</value> + <value>hyperv</value> + <value>vbox</value> + <value>phyp</value> </choice> </attribute> </define> diff --git i/src/conf/domain_conf.c w/src/conf/domain_conf.c index f04e477..983de14 100644 --- i/src/conf/domain_conf.c +++ w/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 i/src/conf/domain_conf.h w/src/conf/domain_conf.h index 7511178..4439f55 100644 --- i/src/conf/domain_conf.h +++ w/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, -- Eric Blake eblake@redhat.com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
On Nov 28, 2011, at 11:23 AM, Eric Blake wrote:
s/xbox/vbox/ in the subject
Whoops... Hope I didn't disappoint anybody hoping for libvirt support on the xbox.
On 11/28/2011 07:26 AM, Lorin Hochstein wrote:
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 so it accepts type 'vbox'.
---
diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index 8968ee6..444592c 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -85,6 +85,7 @@ <value>qemu</value> <value>lxc</value> <value>openvz</value> + <value>vbox</value> <value>test</value>
ACK that we had a problem. Actually, it was more than just vbox missing. virDomainVirtTypeToString in domain_conf.c has the full list; on the other hand, that list had elements that aren't in use by any existing hypervisor driver.
Here's what I'm squashing into your patch before pushing. I also added you to AUTHORS; let me know if I need to update any preferred spelling.
Patch looks good to me (including AUTHORS spelling). Lorin -- Lorin Hochstein, Computer Scientist USC Information Sciences Institute 703.812.3710 http://www.east.isi.edu/~lorin
participants (2)
-
Eric Blake -
Lorin Hochstein