[libvirt] PATCH: update the XML domain RelaxNG schemas
pritesh raised the issue on IRC, so I checked the schemas against the current parsing routines and found a few missing items, I also sorted the device lice to match the enum sequence in the C file. One thing missing and still TODO is the interface definition block, the C parser accepts the "server", "client" and "mcast" types but the RNG doesn't list them in the choice for "interface" Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
On Thu, Apr 02, 2009 at 11:19:58AM +0200, Daniel Veillard wrote:
pritesh raised the issue on IRC, so I checked the schemas against the current parsing routines and found a few missing items, I also sorted the device lice to match the enum sequence in the C file.
ACK. this means there's no XML files in our test suites currently using these features, which is a problem in itself ! The schemas are run against every XML file under tests/ to try & keep them up2date.
Index: docs/schemas/domain.rng =================================================================== RCS file: /data/cvs/libxen/docs/schemas/domain.rng,v retrieving revision 1.6 diff -u -r1.6 domain.rng --- docs/schemas/domain.rng 19 Mar 2009 14:26:51 -0000 1.6 +++ docs/schemas/domain.rng 2 Apr 2009 09:14:03 -0000 @@ -430,10 +430,12 @@ <attribute name='bus'> <choice> <value>ide</value> - <value>virtio</value> <value>fdc</value> + <value>scsi</value> + <value>virtio</value> <value>xen</value> <value>usb</value> + <value>uml</value> </choice> </attribute> </optional> @@ -1005,16 +1007,17 @@ </optional> <zeroOrMore> <choice> - <ref name='graphic'/> <ref name='disk'/> <ref name='filesystem'/> <ref name='interface'/> - <ref name='console'/> + <ref name='input'/> <ref name='sound'/> + <ref name='hostdev'/> + + <ref name='graphic'/> + <ref name='console'/> <ref name='parallel'/> <ref name='serial'/> - <ref name='input'/> - <ref name='hostdev'/> </choice> </zeroOrMore> </interleave>
We've got some seriously bizarre indentation going on in this RNG file :-) Daniel -- |: Red Hat, Engineering, London -o- http://people.redhat.com/berrange/ :| |: http://libvirt.org -o- http://virt-manager.org -o- http://ovirt.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: GnuPG: 7D3B9505 -o- F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505 :|
On Thu, Apr 02, 2009 at 11:19:33AM +0100, Daniel P. Berrange wrote:
On Thu, Apr 02, 2009 at 11:19:58AM +0200, Daniel Veillard wrote:
pritesh raised the issue on IRC, so I checked the schemas against the current parsing routines and found a few missing items, I also sorted the device lice to match the enum sequence in the C file.
ACK. this means there's no XML files in our test suites currently using these features, which is a problem in itself ! The schemas are run against every XML file under tests/ to try & keep them up2date.
Okay, commited,
We've got some seriously bizarre indentation going on in this RNG file :-)
Right, it got the xmllint --format treatment and should be clean now ! thanks ! Daniel -- Daniel Veillard | libxml Gnome XML XSLT toolkit http://xmlsoft.org/ daniel@veillard.com | Rpmfind RPM search engine http://rpmfind.net/ http://veillard.com/ | virtualization library http://libvirt.org/
participants (2)
-
Daniel P. Berrange -
Daniel Veillard