libvirt/tests/storagevolxml2xmlout/vol-qcow2.xml

<volume type='file'>
  <name>OtherDemo.img</name>
  <key>/var/lib/libvirt/images/OtherDemo.img</key>
  <source>
  </source>
  <capacity unit='bytes'>5368709120</capacity>
  <allocation unit='bytes'>294912</allocation>
  <target>
    <path>/var/lib/libvirt/images/OtherDemo.img</path>
    <format type='qcow2'/>
    <permissions>
      <mode>0644</mode>
      <owner>0</owner>
      <group>0</group>
      <label>unconfined_u:object_r:virt_image_t:s0</label>
    </permissions>
  </target>
  <backingStore>
    <path>/dev/null</path>
    <format type='raw'/>
    <permissions>
      <mode>0644</mode>
      <owner>0</owner>
      <group>0</group>
      <label>unconfined_u:object_r:virt_image_t:s0</label>
    </permissions>
  </backingStore>
</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-20 00:14:54 +04:00			`<volume type='file'>`
Added complete set of RNG schemas for all XML formats 2009-01-27 18:29:53 +03:00			`<name>OtherDemo.img</name>`
storage: use valid XML for awkward volume names $ touch /var/lib/libvirt/images/'a<b>c' $ virsh pool-refresh default $ virsh vol-dumpxml 'a<b>c' default \| head -n2 <volume> <name>a<b>c</name> Oops. That's not valid XML. And when we fix the XML generation, it fails RelaxNG validation. I'm also tired of seeing <key>(null)</key> in the example output for volume xml; while we used NULLSTR() to avoid a NULL deref rather than relying on glibc's printf extension behavior, it's even better if we avoid the issue in the first place. But this requires being careful that we don't invalidate any storage backends that were relying on key being unassigned during virStoragVolCreateXML[From]. I would have split this into two patches (one for escaping, one for avoiding <key>(null)</key>), but since they both end up touching a lot of the same test files, I ended up merging it into one. Note that this patch allows pretty much any volume name that can appear in a directory (excluding . and .. because those are special), but does nothing to change the current (unenforced) RelaxNG claim that pool names will consist only of letters, numbers, _, -, and +. Tightening the C code to match RelaxNG patterns and/or relaxing the grammar to match the C code for pool names is a task for another day (but remember, we DID recently tighten C code for domain names to exclude a leading '.'). * src/conf/storage_conf.c (virStoragePoolSourceFormat) (virStoragePoolDefFormat, virStorageVolTargetDefFormat) (virStorageVolDefFormat): Escape user-controlled strings. (virStorageVolDefParseXML): Parse key, for use in unit tests. * src/storage/storage_driver.c (storageVolCreateXML) (storageVolCreateXMLFrom): Ensure parsed key doesn't confuse volume creation. * docs/schemas/basictypes.rng (volName): Relax definition. * tests/storagepoolxml2xmltest.c (mymain): Test it. * tests/storagevolxml2xmltest.c (mymain): Likewise. * tests/storagepoolxml2xmlin/pool-dir-naming.xml: New file. * tests/storagepoolxml2xmlout/pool-dir-naming.xml: Likewise. * tests/storagevolxml2xmlin/vol-file-naming.xml: Likewise. * tests/storagevolxml2xmlout/vol-file-naming.xml: Likewise. * tests/storagevolxml2xmlout/vol-*.xml: Fix fallout. Signed-off-by: Eric Blake <eblake@redhat.com> 2013-11-21 04:04:05 +04:00			`<key>/var/lib/libvirt/images/OtherDemo.img</key>`
Added complete set of RNG schemas for all XML formats 2009-01-27 18:29:53 +03:00			`<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 04:48:38 +04:00			`<capacity unit='bytes'>5368709120</capacity>`
			`<allocation unit='bytes'>294912</allocation>`
Added complete set of RNG schemas for all XML formats 2009-01-27 18:29:53 +03:00			`<target>`
			`<path>/var/lib/libvirt/images/OtherDemo.img</path>`
			`<format type='qcow2'/>`
			`<permissions>`
tests: Add storage volume XML 2 XML tests. 2009-10-09 22:17:21 +04:00			`<mode>0644</mode>`
Added complete set of RNG schemas for all XML formats 2009-01-27 18:29:53 +03:00			`<owner>0</owner>`
			`<group>0</group>`
			`<label>unconfined_u:object_r:virt_image_t:s0</label>`
			`</permissions>`
			`</target>`
			`<backingStore>`
Move volume XMLs out of storagevolxml2argvdata Reuse the XML files in storagevolxml2xmlin. (This requires changing a few backing files to /dev/null, since virStorageBackendCreateQemuImgCmd checks for its presence) 2013-07-22 17:44:06 +04:00			`<path>/dev/null</path>`
Added complete set of RNG schemas for all XML formats 2009-01-27 18:29:53 +03:00			`<format type='raw'/>`
			`<permissions>`
tests: Add storage volume XML 2 XML tests. 2009-10-09 22:17:21 +04:00			`<mode>0644</mode>`
Added complete set of RNG schemas for all XML formats 2009-01-27 18:29:53 +03:00			`<owner>0</owner>`
			`<group>0</group>`
			`<label>unconfined_u:object_r:virt_image_t:s0</label>`
			`</permissions>`
			`</backingStore>`
			`</volume>`