mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-09-09 01:04:59 +00:00
conf: move storage formats to common RNG file
We had incomplete RelaxNG support for storage formats listed
in virstoragefile.h: commit 027bf2e
added 'vdi' but forgot
to update the <volume> and <domain> xml lists; the <volume>
list was also missing 'fat' and 'vhd'. Maintaining two lists
is a recipe for them getting out of sync, so make the list
common so that both contexts benefit the next time we add a
format in a single location.
* docs/schemas/domaincommon.rng (storageFormat): Move...
* docs/schemas/storagecommon.rng: ...here, and add vdi.
* docs/schemas/storagevol.rng (formatfile): Use common list.
Signed-off-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
parent
a9efe2d70c
commit
4f596a070d
@ -1500,24 +1500,7 @@
|
|||||||
</attribute>
|
</attribute>
|
||||||
</optional>
|
</optional>
|
||||||
</define>
|
</define>
|
||||||
<define name='storageFormat'>
|
|
||||||
<choice>
|
|
||||||
<value>raw</value>
|
|
||||||
<value>dir</value>
|
|
||||||
<value>bochs</value>
|
|
||||||
<value>cloop</value>
|
|
||||||
<value>cow</value>
|
|
||||||
<value>dmg</value>
|
|
||||||
<value>iso</value>
|
|
||||||
<value>qcow</value>
|
|
||||||
<value>qcow2</value>
|
|
||||||
<value>qed</value>
|
|
||||||
<value>vmdk</value>
|
|
||||||
<value>vpc</value>
|
|
||||||
<value>fat</value>
|
|
||||||
<value>vhd</value>
|
|
||||||
</choice>
|
|
||||||
</define>
|
|
||||||
<define name="driverCache">
|
<define name="driverCache">
|
||||||
<attribute name="cache">
|
<attribute name="cache">
|
||||||
<choice>
|
<choice>
|
||||||
|
@ -52,4 +52,24 @@
|
|||||||
</element>
|
</element>
|
||||||
</define>
|
</define>
|
||||||
|
|
||||||
|
<define name='storageFormat'>
|
||||||
|
<choice>
|
||||||
|
<value>raw</value>
|
||||||
|
<value>dir</value>
|
||||||
|
<value>bochs</value>
|
||||||
|
<value>cloop</value>
|
||||||
|
<value>cow</value>
|
||||||
|
<value>dmg</value>
|
||||||
|
<value>iso</value>
|
||||||
|
<value>qcow</value>
|
||||||
|
<value>qcow2</value>
|
||||||
|
<value>qed</value>
|
||||||
|
<value>vmdk</value>
|
||||||
|
<value>vpc</value>
|
||||||
|
<value>fat</value>
|
||||||
|
<value>vhd</value>
|
||||||
|
<value>vdi</value>
|
||||||
|
</choice>
|
||||||
|
</define>
|
||||||
|
|
||||||
</grammar>
|
</grammar>
|
||||||
|
@ -212,18 +212,7 @@
|
|||||||
<define name='formatfile'>
|
<define name='formatfile'>
|
||||||
<choice>
|
<choice>
|
||||||
<value>unknown</value>
|
<value>unknown</value>
|
||||||
<value>raw</value>
|
<ref name='storageFormat'/>
|
||||||
<value>dir</value>
|
|
||||||
<value>bochs</value>
|
|
||||||
<value>cloop</value>
|
|
||||||
<value>cow</value>
|
|
||||||
<value>dmg</value>
|
|
||||||
<value>iso</value>
|
|
||||||
<value>qcow</value>
|
|
||||||
<value>qcow2</value>
|
|
||||||
<value>qed</value>
|
|
||||||
<value>vmdk</value>
|
|
||||||
<value>vpc</value>
|
|
||||||
</choice>
|
</choice>
|
||||||
</define>
|
</define>
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user