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/xml2vmxdata/xml2vmx-serial-network-server.xml | |
| parent | cb7583e161570a8ae5dfdf83635f797edc7e77c2 (diff) | |
| download | libvirt-265457845fc51f197d9cc0854fa5e9164565f3bb.tar.gz | |
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/xml2vmxdata/xml2vmx-serial-network-server.xml')
| -rw-r--r-- | tests/xml2vmxdata/xml2vmx-serial-network-server.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/xml2vmxdata/xml2vmx-serial-network-server.xml b/tests/xml2vmxdata/xml2vmx-serial-network-server.xml index a17e2fef24..49a3211532 100644 --- a/tests/xml2vmxdata/xml2vmx-serial-network-server.xml +++ b/tests/xml2vmxdata/xml2vmx-serial-network-server.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>serial-network</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> |