libvirt/tests/storagevolxml2xmlout/vol-file.xml

<volume type='file'>
  <name>sparse.img</name>
  <source>
  </source>
  <capacity unit='bytes'>1099511627776</capacity>
  <allocation unit='bytes'>0</allocation>
  <target>
    <path>/var/lib/libvirt/images/sparse.img</path>
    <format type='raw'/>
    <permissions>
      <mode>00</mode>
      <owner>744</owner>
      <group>0</group>
      <label>virt_image_t</label>
    </permissions>
  </target>
</volume>
storage: expose volume meta-type in XML I got annoyed at having to use both 'virsh vol-list $pool --details' AND 'virsh vol-dumpxml $vol $pool' to learn if I had populated the volume correctly. Since two-thirds of the data present in virStorageVolGetInfo() already appears in virStorageVolGetXMLDesc(), this just adds the remaining piece of information, as: <volume type='...'> ... </volume> * docs/formatstorage.html.in: Document new <volume type=...>. * docs/schemas/storagevol.rng (vol): Add it to RelaxNG. * src/conf/storage_conf.h (virStorageVolTypeToString): Declare. * src/conf/storage_conf.c (virStorageVolTargetDefFormat): Output the metatype. (virStorageVolDefParseXML): Parse it, for unit tests. * tests/storagevolxml2xmlout/vol-*.xml: Update tests to match. Signed-off-by: Eric Blake <eblake@redhat.com> 2013-11-19 20:14:54 +00:00			`<volume type='file'>`
tests: Add storage volume XML 2 XML tests. 2009-10-09 18:17:21 +00:00			`<name>sparse.img</name>`
			`<source>`
			`</source>`
xml: output memory unit for clarity Make it obvious to 'dumpxml' readers what unit we are using, since our default of KiB for memory (1024) differs from qemu's default of MiB; and differs from our use of bytes for storage. Tests were updated via: $ find tests/data tests/out -name '.xml' \| \ xargs sed -i 's/<\(memory\\|currentMemory\\|hard_limit\\|soft_limit\\|min_guarantee\\|swap_hard_limit\)>/<\1 unit='"'KiB'>/" $ find tests/data tests/out -name '.xml' \| \ xargs sed -i 's/<\(capacity\\|allocation\\|available\)>/<\1 unit='"'bytes'>/" followed by a few fixes for the stragglers. Note that with this patch, the RNG for <memory> still forbids validation of anything except unit='KiB', since the code silently ignores the attribute; a later patch will expand <memory> to allow scaled input in the code and update the RNG to match. * docs/schemas/basictypes.rng (unit): Add 'bytes'. (scaledInteger): New define. * docs/schemas/storagevol.rng (sizing): Use it. * docs/schemas/storagepool.rng (sizing): Likewise. * docs/schemas/domaincommon.rng (memoryKBElement): New define; use for memory elements. * src/conf/storage_conf.c (virStoragePoolDefFormat) (virStorageVolDefFormat): Likewise. * src/conf/domain_conf.h (_virDomainDef): Document unit used internally. * src/conf/storage_conf.h (_virStoragePoolDef, _virStorageVolDef): Likewise. * tests/data/.xml: Update all tests. * tests/out/.xml: Likewise. * tests/define-dev-segfault: Likewise. * tests/openvzutilstest.c (testReadNetworkConf): Likewise. * tests/qemuargv2xmltest.c (blankProblemElements): Likewise. 2012-02-23 00:48:38 +00:00			`<capacity unit='bytes'>1099511627776</capacity>`
			`<allocation unit='bytes'>0</allocation>`
tests: Add storage volume XML 2 XML tests. 2009-10-09 18:17:21 +00:00			`<target>`
			`<path>/var/lib/libvirt/images/sparse.img</path>`
			`<format type='raw'/>`
			`<permissions>`
			`<mode>00</mode>`
			`<owner>744</owner>`
			`<group>0</group>`
			`<label>virt_image_t</label>`
			`</permissions>`
			`</target>`
			`</volume>`