summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Blake <eblake@redhat.com>2012-02-22 17:48:38 -0700
committerEric Blake <eblake@redhat.com>2012-03-07 18:24:43 -0700
commit265457845fc51f197d9cc0854fa5e9164565f3bb (patch)
tree17c2ef2e48d336cf288b0612e5d14a7ce575c3fe /tests/domainschemadata
parentxml: share 'unit' in RNG (diff)
downloadlibvirt-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/domainschemadata')
-rw-r--r--tests/domainschemadata/domain-lxc-simple.xml2
-rw-r--r--tests/domainschemadata/portprofile.xml2
-rw-r--r--tests/domainschemadata/qemu-simple-description-title.xml4
-rw-r--r--tests/domainschemadata/timers.xml4
4 files changed, 6 insertions, 6 deletions
diff --git a/tests/domainschemadata/domain-lxc-simple.xml b/tests/domainschemadata/domain-lxc-simple.xml
index 653bbc7fb..e61434fac 100644
--- a/tests/domainschemadata/domain-lxc-simple.xml
+++ b/tests/domainschemadata/domain-lxc-simple.xml
@@ -5,7 +5,7 @@
<type>exe</type>
<init>/sh</init>
</os>
- <memory>500000</memory>
+ <memory unit='KiB'>500000</memory>
<devices>
<filesystem type='mount'>
<source dir='/root/container'/>
diff --git a/tests/domainschemadata/portprofile.xml b/tests/domainschemadata/portprofile.xml
index e51301d95..e7849b341 100644
--- a/tests/domainschemadata/portprofile.xml
+++ b/tests/domainschemadata/portprofile.xml
@@ -1,7 +1,7 @@
<domain type='lxc'>
<name>portprofile</name>
<uuid>00000000-0000-0000-0000-000000000000</uuid>
- <memory>1048576</memory>
+ <memory unit='KiB'>1048576</memory>
<os>
<type>exe</type>
<init>/sh</init>
diff --git a/tests/domainschemadata/qemu-simple-description-title.xml b/tests/domainschemadata/qemu-simple-description-title.xml
index a8a9cac45..365801db0 100644
--- a/tests/domainschemadata/qemu-simple-description-title.xml
+++ b/tests/domainschemadata/qemu-simple-description-title.xml
@@ -1,8 +1,8 @@
<domain type='qemu'>
<name>qemu-demo</name>
<uuid>603cc28c-9841-864e-0949-8cc7d3bae9f8</uuid>
- <memory>65536</memory>
- <currentMemory>65536</currentMemory>
+ <memory unit='KiB'>65536</memory>
+ <currentMemory unit='KiB'>65536</currentMemory>
<title>A short description of this domain</title>
<description>
A longer explanation that this domain is a test domain
diff --git a/tests/domainschemadata/timers.xml b/tests/domainschemadata/timers.xml
index c1baa2ccf..0bfb45697 100644
--- a/tests/domainschemadata/timers.xml
+++ b/tests/domainschemadata/timers.xml
@@ -1,8 +1,8 @@
<domain type='qemu'>
<name>QEMUGuest1</name>
<uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
- <memory>219200</memory>
- <currentMemory>219200</currentMemory>
+ <memory unit='KiB'>219200</memory>
+ <currentMemory unit='KiB'>219200</currentMemory>
<vcpu>1</vcpu>
<os>
<type arch='i686' machine='pc'>hvm</type>