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/vmx2xmldata | |
| 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/vmx2xmldata')
46 files changed, 93 insertions, 93 deletions
diff --git a/tests/vmx2xmldata/vmx2xml-annotation.xml b/tests/vmx2xmldata/vmx2xml-annotation.xml index f42f77b5c..07187e076 100644 --- a/tests/vmx2xmldata/vmx2xml-annotation.xml +++ b/tests/vmx2xmldata/vmx2xml-annotation.xml @@ -1,8 +1,8 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> <description>Some |text| to test the "escaping": ||""||"| Escaped!</description> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml index d07d60819..a3397f6e1 100644 --- a/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml +++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-1.xml @@ -1,8 +1,8 @@ <domain type='vmware'> <name>FEDORA11</name> <uuid>50115e16-9bdc-49d7-f171-53c4d7f91710</uuid> - <memory>1048576</memory> - <currentMemory>1048576</currentMemory> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> <vcpu>1</vcpu> <cputune> <shares>4223</shares> diff --git a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml b/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml index 87dd3b870..272f85a4b 100644 --- a/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml +++ b/tests/vmx2xmldata/vmx2xml-case-insensitive-2.xml @@ -1,8 +1,8 @@ <domain type='vmware'> <name>fedora11</name> <uuid>50115e16-9bdc-49d7-f171-53c4d7f91710</uuid> - <memory>1048576</memory> - <currentMemory>1048576</currentMemory> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> <vcpu>1</vcpu> <cputune> <shares>1000</shares> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml index 6cbdfe9d9..726e4cf8f 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-device.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml index 3bdb70b99..7fc6b3b2b 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-ide-file.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml index 00fbf4e41..7e823e8c4 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-device.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml index e8f2e9fae..d4179af74 100644 --- a/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml +++ b/tests/vmx2xmldata/vmx2xml-cdrom-scsi-file.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml index 74f49a515..d54788f99 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-1.xml @@ -1,8 +1,8 @@ <domain type='vmware'> <name>Fedora11</name> <uuid>50115e16-9bdc-49d7-f171-53c4d7f91710</uuid> - <memory>1048576</memory> - <currentMemory>1048576</currentMemory> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> <vcpu>1</vcpu> <cputune> <shares>500</shares> diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml index 2e079632d..de678c122 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-2.xml @@ -1,8 +1,8 @@ <domain type='vmware'> <name>virtDebian1</name> <uuid>564dcd37-3685-8889-35ea-719fc93c983e</uuid> - <memory>1024000</memory> - <currentMemory>120832</currentMemory> + <memory unit='KiB'>1024000</memory> + <currentMemory unit='KiB'>120832</currentMemory> <vcpu cpuset='0-2,5-7'>4</vcpu> <os> <type arch='x86_64'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml index 0bc8eed64..41016343b 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-3.xml @@ -1,8 +1,8 @@ <domain type='vmware'> <name>virtDebian2</name> <uuid>564db768-f332-42ee-6201-06973cf5c30c</uuid> - <memory>1048576</memory> - <currentMemory>1048576</currentMemory> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> <vcpu cpuset='0,3-5'>2</vcpu> <os> <type arch='x86_64'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml index 0844cb25c..ab3467402 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-4.xml @@ -1,8 +1,8 @@ <domain type='vmware'> <name>virtMonServ1</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>524288</memory> - <currentMemory>524288</currentMemory> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> <vcpu>1</vcpu> <cputune> <shares>1000</shares> diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml index ee231208d..e1b7040a0 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-5.xml @@ -2,10 +2,10 @@ <name>vmtest.local</name> <uuid>423e94a9-a1c7-b31d-7161-76c7586c830e</uuid> <description>Centos 5.5 64bit Server</description> - <memory>2097152</memory> - <currentMemory>2097152</currentMemory> + <memory unit='KiB'>2097152</memory> + <currentMemory unit='KiB'>2097152</currentMemory> <memtune> - <min_guarantee>262144</min_guarantee> + <min_guarantee unit='KiB'>262144</min_guarantee> </memtune> <vcpu>2</vcpu> <cputune> diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml index 227308b81..5583cffef 100644 --- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml +++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-6.xml @@ -1,8 +1,8 @@ <domain type='vmware'> <name>el6-test</name> <uuid>564d15d4-d062-fe9a-80f5-eb8e1a2c3afc</uuid> - <memory>1048576</memory> - <currentMemory>1048576</currentMemory> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml b/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml index cec329d1f..0e94f25c2 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-bridged.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml b/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml index 8c7b83352..e36f3ded5 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-custom.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml b/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml index 9b356ea79..7818c0ab3 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-e1000.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml b/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml index aead831af..c0c825d6b 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-generated.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml b/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml index 8631049e8..068f03846 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-nat.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-other.xml b/tests/vmx2xmldata/vmx2xml-ethernet-other.xml index a74611565..e60f7153e 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-other.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-other.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-static.xml b/tests/vmx2xmldata/vmx2xml-ethernet-static.xml index cec329d1f..0e94f25c2 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-static.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-static.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml index b7773ad2a..013ca33a8 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vmxnet2.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml index bdc8d8c12..f19e3f761 100644 --- a/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml +++ b/tests/vmx2xmldata/vmx2xml-ethernet-vpx.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-floppy-device.xml b/tests/vmx2xmldata/vmx2xml-floppy-device.xml index 8aef9c079..41cda933b 100644 --- a/tests/vmx2xmldata/vmx2xml-floppy-device.xml +++ b/tests/vmx2xmldata/vmx2xml-floppy-device.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-floppy-file.xml b/tests/vmx2xmldata/vmx2xml-floppy-file.xml index c36e3f0dd..f436a3b56 100644 --- a/tests/vmx2xmldata/vmx2xml-floppy-file.xml +++ b/tests/vmx2xmldata/vmx2xml-floppy-file.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml b/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml index 047e0349d..ca1a9e2f6 100644 --- a/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml +++ b/tests/vmx2xmldata/vmx2xml-graphics-vnc.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml index 7bc07c5cc..7a0c681a5 100644 --- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-1.xml @@ -1,8 +1,8 @@ <domain type='vmware'> <name>Server1</name> <uuid>564d1223-f835-c4b1-bbf6-e32390d62bd3</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml index 3297761a0..abd69bd47 100644 --- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml +++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-2.xml @@ -1,8 +1,8 @@ <domain type='vmware'> <name>Server2</name> <uuid>564d3301-267f-a0ef-8b7d-d45e98d6cba4</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml index 78fa951fa..8c57e3254 100644 --- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml +++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-3.xml @@ -1,8 +1,8 @@ <domain type='vmware'> <name>Router</name> <uuid>564ddebe-e86f-d586-0854-a0879cc4be5a</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml index c25e6e677..a3d02fc30 100644 --- a/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml +++ b/tests/vmx2xmldata/vmx2xml-gsx-in-the-wild-4.xml @@ -1,8 +1,8 @@ <domain type='vmware'> <name>Client</name> <uuid>564dad58-0629-d3e6-ecfe-8ff839c5e35d</uuid> - <memory>270336</memory> - <currentMemory>270336</currentMemory> + <memory unit='KiB'>270336</memory> + <currentMemory unit='KiB'>270336</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml b/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml index e2e9bdc3f..3fe6ba0b2 100644 --- a/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml +++ b/tests/vmx2xmldata/vmx2xml-harddisk-ide-file.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml b/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml index 4e9038838..ae82d7d12 100644 --- a/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml +++ b/tests/vmx2xmldata/vmx2xml-harddisk-scsi-file.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml b/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml index 188d31a5b..ef33bc663 100644 --- a/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml +++ b/tests/vmx2xmldata/vmx2xml-minimal-64bit.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-minimal.xml b/tests/vmx2xmldata/vmx2xml-minimal.xml index ce2cfd658..f165ebcaf 100644 --- a/tests/vmx2xmldata/vmx2xml-minimal.xml +++ b/tests/vmx2xmldata/vmx2xml-minimal.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-parallel-device.xml b/tests/vmx2xmldata/vmx2xml-parallel-device.xml index bc288a684..7808275fe 100644 --- a/tests/vmx2xmldata/vmx2xml-parallel-device.xml +++ b/tests/vmx2xmldata/vmx2xml-parallel-device.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-parallel-file.xml b/tests/vmx2xmldata/vmx2xml-parallel-file.xml index ad7a65fc2..1a78ee968 100644 --- a/tests/vmx2xmldata/vmx2xml-parallel-file.xml +++ b/tests/vmx2xmldata/vmx2xml-parallel-file.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml index 03a60d0de..3463e41c1 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-driver.xml +++ b/tests/vmx2xmldata/vmx2xml-scsi-driver.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml b/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml index d2b1cb7eb..0edf35d39 100644 --- a/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml +++ b/tests/vmx2xmldata/vmx2xml-scsi-writethrough.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-serial-device.xml b/tests/vmx2xmldata/vmx2xml-serial-device.xml index 51fd06f21..b7e12d0de 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-device.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-device.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-serial-file.xml b/tests/vmx2xmldata/vmx2xml-serial-file.xml index 25ade0726..a5dc91cc4 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-file.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-file.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-serial-network-client.xml b/tests/vmx2xmldata/vmx2xml-serial-network-client.xml index 7573a11dc..df0df7994 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-network-client.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-network-client.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-serial-network-server.xml b/tests/vmx2xmldata/vmx2xml-serial-network-server.xml index ed3849598..b5b7665ed 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-network-server.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-network-server.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-serial-pipe.xml b/tests/vmx2xmldata/vmx2xml-serial-pipe.xml index ca5196c9a..c6ace03bf 100644 --- a/tests/vmx2xmldata/vmx2xml-serial-pipe.xml +++ b/tests/vmx2xmldata/vmx2xml-serial-pipe.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-smbios.xml b/tests/vmx2xmldata/vmx2xml-smbios.xml index d78ac6cc0..a64fb5d38 100644 --- a/tests/vmx2xmldata/vmx2xml-smbios.xml +++ b/tests/vmx2xmldata/vmx2xml-smbios.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-svga.xml b/tests/vmx2xmldata/vmx2xml-svga.xml index 664eba4fa..07c504fd7 100644 --- a/tests/vmx2xmldata/vmx2xml-svga.xml +++ b/tests/vmx2xmldata/vmx2xml-svga.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>32768</memory> - <currentMemory>32768</currentMemory> + <memory unit='KiB'>32768</memory> + <currentMemory unit='KiB'>32768</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml index 4c958aee1..2cca409dc 100644 --- a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml +++ b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-1.xml @@ -1,8 +1,8 @@ <domain type='vmware'> <name>debian6</name> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>524288</memory> - <currentMemory>524288</currentMemory> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64'>hvm</type> diff --git a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml index 0501a453f..391e45cb0 100644 --- a/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml +++ b/tests/vmx2xmldata/vmx2xml-ws-in-the-wild-2.xml @@ -1,8 +1,8 @@ <domain type='vmware'> <name>debian6</name> <uuid>00000000-0000-0000-0000-000000000000</uuid> - <memory>524288</memory> - <currentMemory>524288</currentMemory> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64'>hvm</type> |