mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-09 17:24:53 +00:00
5d7659027f
https://bugzilla.redhat.com/show_bug.cgi?id=1475250 It's possible to define and start a pool with a '.' in the name; however, when trying to add a volume to a domain using the storage pool source with a '.' in the storage pool name, the domain RNG validation fails because RNG uses 'genericName' which does not allow a '.' in the name. Domain XML def parsing has a virXMLValidateAgainstSchema which generates the error. The Storage Pool XML def parsing has no call to virXMLValidateAgainstSchema. The only Storage Pool name validation occurs in virStoragePoolDefParseXML to ensure the name doesn't have a '/' in it and in storagePoolDefineXML to call virXMLCheckIllegalChars using the same parameter "\n" as qemuDomainDefineXMLFlags would check after the RNG check could be succesful. In order to resolve this, create a poolName definition in storagecommon.rng that will mimic the domain name regex that disallows a newline character, but add the "/" in the exclude list. Then modify the pool and volume source name definitions to key off that poolName.
184 lines
4.5 KiB
XML
184 lines
4.5 KiB
XML
<?xml version="1.0"?>
|
|
<!-- A Relax NG schema for common libvirt XML storage elements -->
|
|
<grammar xmlns="http://relaxng.org/ns/structure/1.0"
|
|
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
|
|
|
|
<!-- This schema is not designed for standalone use; another file
|
|
must include both this file and basictypes.rng -->
|
|
|
|
<define name="poolName">
|
|
<data type="string">
|
|
<!-- Use literal newline instead of \n for bug in libxml2 2.7.6 -->
|
|
<param name="pattern">[^/
|
|
]+</param>
|
|
</data>
|
|
</define>
|
|
|
|
<define name='encryption'>
|
|
<element name='encryption'>
|
|
<attribute name='format'>
|
|
<choice>
|
|
<value>default</value>
|
|
<value>qcow</value>
|
|
<value>luks</value>
|
|
</choice>
|
|
</attribute>
|
|
<interleave>
|
|
<zeroOrMore>
|
|
<ref name='secret'/>
|
|
</zeroOrMore>
|
|
<optional>
|
|
<element name='cipher'>
|
|
<ref name='keycipher'/>
|
|
</element>
|
|
<element name='ivgen'>
|
|
<ref name='keyivgen'/>
|
|
</element>
|
|
</optional>
|
|
</interleave>
|
|
</element>
|
|
</define>
|
|
|
|
<define name='secret'>
|
|
<element name='secret'>
|
|
<attribute name='type'>
|
|
<value>passphrase</value>
|
|
</attribute>
|
|
<choice>
|
|
<attribute name='uuid'>
|
|
<ref name="UUID"/>
|
|
</attribute>
|
|
<attribute name='usage'>
|
|
<text/>
|
|
</attribute>
|
|
</choice>
|
|
</element>
|
|
</define>
|
|
|
|
<define name='compat'>
|
|
<element name='compat'>
|
|
<data type='string'>
|
|
<param name='pattern'>[0-9]+\.[0-9]+</param>
|
|
</data>
|
|
</element>
|
|
</define>
|
|
<define name='fileFormatFeatures'>
|
|
<element name='features'>
|
|
<interleave>
|
|
<optional>
|
|
<element name='lazy_refcounts'>
|
|
<empty/>
|
|
</element>
|
|
</optional>
|
|
</interleave>
|
|
</element>
|
|
</define>
|
|
|
|
<!-- split the list of known storage formats into two, those where
|
|
we know how to follow backing chains, and all others -->
|
|
<define name='storageFormatBacking'>
|
|
<choice>
|
|
<value>cow</value>
|
|
<value>qcow</value>
|
|
<value>qcow2</value>
|
|
<value>qed</value>
|
|
<value>vmdk</value>
|
|
</choice>
|
|
</define>
|
|
<define name='storageFormat'>
|
|
<choice>
|
|
<value>raw</value>
|
|
<value>dir</value>
|
|
<value>bochs</value>
|
|
<value>cloop</value>
|
|
<value>dmg</value>
|
|
<value>iso</value>
|
|
<value>vpc</value>
|
|
<value>vdi</value>
|
|
<value>fat</value>
|
|
<value>vhd</value>
|
|
<value>ploop</value>
|
|
<value>luks</value>
|
|
<ref name='storageFormatBacking'/>
|
|
</choice>
|
|
</define>
|
|
|
|
<define name='storageStartupPolicy'>
|
|
<!-- Use a combine='choice' override in client files that want to
|
|
add additional attributes to a <source> sub-element
|
|
associated with a storage source -->
|
|
<notAllowed/>
|
|
</define>
|
|
|
|
<define name='storageSourceExtra'>
|
|
<!-- Use a combine='choice' override in client files that want to
|
|
add additional elements as siblings of a <source> sub-element
|
|
associated with a storage source -->
|
|
<notAllowed/>
|
|
</define>
|
|
|
|
<define name='permissions'>
|
|
<optional>
|
|
<element name='permissions'>
|
|
<interleave>
|
|
<optional>
|
|
<element name='mode'>
|
|
<ref name='octalMode'/>
|
|
</element>
|
|
</optional>
|
|
<optional>
|
|
<element name='owner'>
|
|
<choice>
|
|
<ref name='unsignedInt'/>
|
|
<value>-1</value>
|
|
</choice>
|
|
</element>
|
|
</optional>
|
|
<optional>
|
|
<element name='group'>
|
|
<choice>
|
|
<ref name='unsignedInt'/>
|
|
<value>-1</value>
|
|
</choice>
|
|
</element>
|
|
</optional>
|
|
<optional>
|
|
<element name='label'>
|
|
<text/>
|
|
</element>
|
|
</optional>
|
|
</interleave>
|
|
</element>
|
|
</optional>
|
|
</define>
|
|
|
|
<define name='keycipher'>
|
|
<attribute name='name'>
|
|
<text/>
|
|
</attribute>
|
|
<attribute name='size'>
|
|
<ref name="unsignedInt"/>
|
|
</attribute>
|
|
<optional>
|
|
<attribute name='mode'>
|
|
<text/>
|
|
</attribute>
|
|
<attribute name='hash'>
|
|
<text/>
|
|
</attribute>
|
|
</optional>
|
|
</define>
|
|
|
|
<define name='keyivgen'>
|
|
<attribute name='name'>
|
|
<text/>
|
|
</attribute>
|
|
<optional>
|
|
<attribute name='hash'>
|
|
<text/>
|
|
</attribute>
|
|
</optional>
|
|
</define>
|
|
|
|
</grammar>
|