Misc XML schema fixes for libxl

The libxlxml2domconfigdata directory was not covered in the RNG schema
tests. This hid a few bugs in both the libxl XML files and the RNG
schema itself.

Reviewed-by: Jim Fehlig <jfehlig@suse.com>
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2017-11-29 17:43:29 +00:00
parent 681bc423e8
commit 1c7874e8d9
4 changed files with 5 additions and 4 deletions

View File

@ -1169,7 +1169,7 @@
<optional> <optional>
<element name="bootloader"> <element name="bootloader">
<choice> <choice>
<ref name="absFilePath"/> <text/>
<empty/> <empty/>
</choice> </choice>
</element> </element>
@ -2764,6 +2764,7 @@
<choice> <choice>
<value>kvm</value> <value>kvm</value>
<value>vfio</value> <value>vfio</value>
<value>xen</value>
</choice> </choice>
</attribute> </attribute>
</group> </group>

View File

@ -8,7 +8,7 @@
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<clock sync='utc'/> <clock offset='utc'/>
<os> <os>
<type>hvm</type> <type>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>

View File

@ -8,7 +8,7 @@
<on_poweroff>destroy</on_poweroff> <on_poweroff>destroy</on_poweroff>
<on_reboot>restart</on_reboot> <on_reboot>restart</on_reboot>
<on_crash>destroy</on_crash> <on_crash>destroy</on_crash>
<clock sync='utc'/> <clock offset='utc'/>
<os> <os>
<type>hvm</type> <type>hvm</type>
<loader>/usr/lib/xen/boot/hvmloader</loader> <loader>/usr/lib/xen/boot/hvmloader</loader>

View File

@ -221,7 +221,7 @@ mymain(void)
"qemuxml2argvdata", "sexpr2xmldata", "xmconfigdata", "qemuxml2argvdata", "sexpr2xmldata", "xmconfigdata",
"xml2sexprdata", "qemuxml2xmloutdata", "lxcxml2xmldata", "xml2sexprdata", "qemuxml2xmloutdata", "lxcxml2xmldata",
"lxcxml2xmloutdata", "bhyvexml2argvdata", "genericxml2xmlindata", "lxcxml2xmloutdata", "bhyvexml2argvdata", "genericxml2xmlindata",
"genericxml2xmloutdata", "xlconfigdata", "genericxml2xmloutdata", "xlconfigdata", "libxlxml2domconfigdata",
"qemuhotplugtestdomains"); "qemuhotplugtestdomains");
DO_TEST_DIR("domaincaps.rng", "domaincapsschemadata"); DO_TEST_DIR("domaincaps.rng", "domaincapsschemadata");
DO_TEST_DIR("domainsnapshot.rng", "domainsnapshotxml2xmlin", DO_TEST_DIR("domainsnapshot.rng", "domainsnapshotxml2xmlin",