diff options
| author |   Eric Blake <eblake@redhat.com> | 2012-02-22 17:48:38 -0700 |
|---|---|---|
| committer | Eric Blake <eblake@redhat.com> | 2012-03-07 18:24:43 -0700 |
| commit | 265457845fc51f197d9cc0854fa5e9164565f3bb (patch) | |
| tree | 17c2ef2e48d336cf288b0612e5d14a7ce575c3fe /tests/storagepoolxml2xmlout/pool-disk.xml | |
| parent | xml: share 'unit' in RNG (diff) | |
| download | libvirt-265457845fc51f197d9cc0854fa5e9164565f3bb.tar.gz libvirt-265457845fc51f197d9cc0854fa5e9164565f3bb.tar.bz2 libvirt-265457845fc51f197d9cc0854fa5e9164565f3bb.zip | |
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.
Diffstat (limited to 'tests/storagepoolxml2xmlout/pool-disk.xml')
| -rw-r--r-- | tests/storagepoolxml2xmlout/pool-disk.xml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/storagepoolxml2xmlout/pool-disk.xml b/tests/storagepoolxml2xmlout/pool-disk.xml index d6c595ff2..e60cf3d83 100644 --- a/tests/storagepoolxml2xmlout/pool-disk.xml +++ b/tests/storagepoolxml2xmlout/pool-disk.xml @@ -1,9 +1,9 @@ <pool type='disk'> <name>sda</name> <uuid>e3509a62-1b4c-e20b-94bd-9168963f9b97</uuid> - <capacity>0</capacity> - <allocation>0</allocation> - <available>0</available> + <capacity unit='bytes'>0</capacity> + <allocation unit='bytes'>0</allocation> + <available unit='bytes'>0</available> <source> <device path='/dev/sda'/> <format type='dos'/> |