diff options
486 files changed, 948 insertions, 935 deletions
diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng index 4f16fa7d2..a50349c60 100644 --- a/docs/schemas/basictypes.rng +++ b/docs/schemas/basictypes.rng @@ -140,8 +140,16 @@ <define name='unit'> <data type='string'> - <param name='pattern'>[kKmMgGtTpPeE]</param> + <param name='pattern'>(bytes)|[kKmMgGtTpPeE]</param> </data> </define> + <define name='scaledInteger'> + <optional> + <attribute name='unit'> + <ref name='unit'/> + </attribute> + </optional> + <ref name='unsignedLong'/> + </define> </grammar> diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng index a905457a7..53389b078 100644 --- a/docs/schemas/domaincommon.rng +++ b/docs/schemas/domaincommon.rng @@ -412,11 +412,11 @@ <define name="resources"> <interleave> <element name="memory"> - <ref name="memoryKB"/> + <ref name='memoryKBElement'/> </element> <optional> <element name="currentMemory"> - <ref name="memoryKB"/> + <ref name='memoryKBElement'/> </element> </optional> <optional> @@ -461,25 +461,25 @@ <!-- Maximum memory the VM can use --> <optional> <element name="hard_limit"> - <ref name="memoryKB"/> + <ref name='memoryKBElement'/> </element> </optional> <!-- Minimum memory ascertained for the VM during contention --> <optional> <element name="soft_limit"> - <ref name="memoryKB"/> + <ref name='memoryKBElement'/> </element> </optional> <!-- Minimum amount of memory required to start the VM --> <optional> <element name="min_guarantee"> - <ref name="memoryKB"/> + <ref name='memoryKBElement'/> </element> </optional> <!-- Maximum swap area the VM can use --> <optional> <element name="swap_hard_limit"> - <ref name="memoryKB"/> + <ref name='memoryKBElement'/> </element> </optional> </element> @@ -3129,12 +3129,25 @@ <param name="maxInclusive">1000</param> </data> </define> + <!-- Memory as an attribute is in KiB, no way to express a unit --> <define name="memoryKB"> <data type="unsignedInt"> <param name="pattern">[0-9]+</param> <param name="minInclusive">4000</param> </data> </define> + <!-- Memory as an element, with optional unit attribute --> + <define name='memoryKBElement'> + <optional> + <attribute name='unit'> + <value>KiB</value> + </attribute> + </optional> + <data type='unsignedInt'> + <param name='pattern'>[0-9]+</param> + <param name='minInclusive'>4000</param> + </data> + </define> <define name="domainName"> <data type="string"> <!-- Use literal newline instead of \n for bug in libxml2 2.7.6 --> diff --git a/docs/schemas/storagepool.rng b/docs/schemas/storagepool.rng index 6399f12e3..d4c80da8a 100644 --- a/docs/schemas/storagepool.rng +++ b/docs/schemas/storagepool.rng @@ -136,17 +136,17 @@ <define name='sizing'> <optional> <element name='capacity'> - <ref name='unsignedLong'/> + <ref name='scaledInteger'/> </element> </optional> <optional> <element name='allocation'> - <ref name='unsignedLong'/> + <ref name='scaledInteger'/> </element> </optional> <optional> <element name='available'> - <ref name='unsignedLong'/> + <ref name='scaledInteger'/> </element> </optional> </define> diff --git a/docs/schemas/storagevol.rng b/docs/schemas/storagevol.rng index d06884c93..8edb877bc 100644 --- a/docs/schemas/storagevol.rng +++ b/docs/schemas/storagevol.rng @@ -32,22 +32,12 @@ <define name='sizing'> <optional> <element name='capacity'> - <optional> - <attribute name='unit'> - <ref name='unit'/> - </attribute> - </optional> - <ref name='unsignedLong'/> + <ref name='scaledInteger'/> </element> </optional> <optional> <element name='allocation'> - <optional> - <attribute name='unit'> - <ref name='unit'/> - </attribute> - </optional> - <ref name='unsignedLong'/> + <ref name='scaledInteger'/> </element> </optional> </define> diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c index b99471814..6162c4ed4 100644 --- a/src/conf/domain_conf.c +++ b/src/conf/domain_conf.c @@ -12026,8 +12026,9 @@ virDomainDefFormatInternal(virDomainDefPtr def, xmlIndentTreeOutput = oldIndentTreeOutput; } - virBufferAsprintf(buf, " <memory>%lu</memory>\n", def->mem.max_balloon); - virBufferAsprintf(buf, " <currentMemory>%lu</currentMemory>\n", + virBufferAsprintf(buf, " <memory unit='KiB'>%lu</memory>\n", + def->mem.max_balloon); + virBufferAsprintf(buf, " <currentMemory unit='KiB'>%lu</currentMemory>\n", def->mem.cur_balloon); /* add blkiotune only if there are any */ @@ -12068,20 +12069,20 @@ virDomainDefFormatInternal(virDomainDefPtr def, def->mem.swap_hard_limit) virBufferAddLit(buf, " <memtune>\n"); if (def->mem.hard_limit) { - virBufferAsprintf(buf, " <hard_limit>%lu</hard_limit>\n", - def->mem.hard_limit); + virBufferAsprintf(buf, " <hard_limit unit='KiB'>" + "%lu</hard_limit>\n", def->mem.hard_limit); } if (def->mem.soft_limit) { - virBufferAsprintf(buf, " <soft_limit>%lu</soft_limit>\n", - def->mem.soft_limit); + virBufferAsprintf(buf, " <soft_limit unit='KiB'>" + "%lu</soft_limit>\n", def->mem.soft_limit); } if (def->mem.min_guarantee) { - virBufferAsprintf(buf, " <min_guarantee>%lu</min_guarantee>\n", - def->mem.min_guarantee); + virBufferAsprintf(buf, " <min_guarantee unit='KiB'>" + "%lu</min_guarantee>\n", def->mem.min_guarantee); } if (def->mem.swap_hard_limit) { - virBufferAsprintf(buf, " <swap_hard_limit>%lu</swap_hard_limit>\n", - def->mem.swap_hard_limit); + virBufferAsprintf(buf, " <swap_hard_limit unit='KiB'>" + "%lu</swap_hard_limit>\n", def->mem.swap_hard_limit); } if (def->mem.hard_limit || def->mem.soft_limit || def->mem.min_guarantee || def->mem.swap_hard_limit) diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h index 87b410336..2beefcbbe 100644 --- a/src/conf/domain_conf.h +++ b/src/conf/domain_conf.h @@ -1496,13 +1496,13 @@ struct _virDomainDef { } blkio; struct { - unsigned long max_balloon; - unsigned long cur_balloon; + unsigned long max_balloon; /* in kibibytes */ + unsigned long cur_balloon; /* in kibibytes */ unsigned long hugepage_backed; - unsigned long hard_limit; - unsigned long soft_limit; - unsigned long min_guarantee; - unsigned long swap_hard_limit; + unsigned long hard_limit; /* in kibibytes */ + unsigned long soft_limit; /* in kibibytes */ + unsigned long min_guarantee; /* in kibibytes */ + unsigned long swap_hard_limit; /* in kibibytes */ } mem; unsigned short vcpus; unsigned short maxvcpus; diff --git a/src/conf/storage_conf.c b/src/conf/storage_conf.c index 87f3d6a16..07f3f5b6d 100644 --- a/src/conf/storage_conf.c +++ b/src/conf/storage_conf.c @@ -1,7 +1,7 @@ /* * storage_conf.c: config handling for storage driver * - * Copyright (C) 2006-2011 Red Hat, Inc. + * Copyright (C) 2006-2012 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -897,11 +897,11 @@ virStoragePoolDefFormat(virStoragePoolDefPtr def) { virUUIDFormat(def->uuid, uuid); virBufferAsprintf(&buf," <uuid>%s</uuid>\n", uuid); - virBufferAsprintf(&buf," <capacity>%llu</capacity>\n", + virBufferAsprintf(&buf," <capacity unit='bytes'>%llu</capacity>\n", def->capacity); - virBufferAsprintf(&buf," <allocation>%llu</allocation>\n", + virBufferAsprintf(&buf," <allocation unit='bytes'>%llu</allocation>\n", def->allocation); - virBufferAsprintf(&buf," <available>%llu</available>\n", + virBufferAsprintf(&buf," <available unit='bytes'>%llu</available>\n", def->available); if (virStoragePoolSourceFormat(&buf, options, &def->source) < 0) @@ -1262,9 +1262,9 @@ virStorageVolDefFormat(virStoragePoolDefPtr pool, } virBufferAddLit(&buf, " </source>\n"); - virBufferAsprintf(&buf," <capacity>%llu</capacity>\n", + virBufferAsprintf(&buf," <capacity unit='bytes'>%llu</capacity>\n", def->capacity); - virBufferAsprintf(&buf," <allocation>%llu</allocation>\n", + virBufferAsprintf(&buf," <allocation unit='bytes'>%llu</allocation>\n", def->allocation); if (virStorageVolTargetDefFormat(options, &buf, diff --git a/src/conf/storage_conf.h b/src/conf/storage_conf.h index dfed0bfbc..1ef929510 100644 --- a/src/conf/storage_conf.h +++ b/src/conf/storage_conf.h @@ -1,7 +1,7 @@ /* * storage_conf.h: config handling for storage driver * - * Copyright (C) 2006-2008, 2010-2011 Red Hat, Inc. + * Copyright (C) 2006-2008, 2010-2012 Red Hat, Inc. * Copyright (C) 2006-2008 Daniel P. Berrange * * This library is free software; you can redistribute it and/or @@ -92,8 +92,8 @@ struct _virStorageVolDef { unsigned int building; - unsigned long long allocation; - unsigned long long capacity; + unsigned long long allocation; /* bytes */ + unsigned long long capacity; /* bytes */ virStorageVolSource source; virStorageVolTarget target; @@ -262,9 +262,9 @@ struct _virStoragePoolDef { unsigned char uuid[VIR_UUID_BUFLEN]; int type; /* virStoragePoolType */ - unsigned long long allocation; - unsigned long long capacity; - unsigned long long available; + unsigned long long allocation; /* bytes */ + unsigned long long capacity; /* bytes */ + unsigned long long available; /* bytes */ virStoragePoolSource source; virStoragePoolTarget target; diff --git a/tests/define-dev-segfault b/tests/define-dev-segfault index 0a0532bdd..0c37f6ddd 100755 --- a/tests/define-dev-segfault +++ b/tests/define-dev-segfault @@ -20,8 +20,8 @@ cat <<\EOF > D.xml || fail=1 <domain type='test'> <name>D</name> <uuid>aaa3ae22-fed2-bfbd-ac02-3bea3bcfad82</uuid> - <memory>262144</memory> - <currentMemory>262144</currentMemory> + <memory unit='KiB'>262144</memory> + <currentMemory unit='KiB'>262144</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> 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> diff --git a/tests/domainsnapshotxml2xmlout/disk_snapshot.xml b/tests/domainsnapshotxml2xmlout/disk_snapshot.xml index c57f38fa7..29f60be55 100644 --- a/tests/domainsnapshotxml2xmlout/disk_snapshot.xml +++ b/tests/domainsnapshotxml2xmlout/disk_snapshot.xml @@ -26,8 +26,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/domainsnapshotxml2xmlout/full_domain.xml b/tests/domainsnapshotxml2xmlout/full_domain.xml index a55f353a3..f77d6b0a0 100644 --- a/tests/domainsnapshotxml2xmlout/full_domain.xml +++ b/tests/domainsnapshotxml2xmlout/full_domain.xml @@ -9,8 +9,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/domainsnapshotxml2xmlout/metadata.xml b/tests/domainsnapshotxml2xmlout/metadata.xml index 263cbbab6..1a27773ab 100644 --- a/tests/domainsnapshotxml2xmlout/metadata.xml +++ b/tests/domainsnapshotxml2xmlout/metadata.xml @@ -13,8 +13,8 @@ <app1:foo xmlns:app1="http://foo.org/">fooish</app1:foo> <app2:bar xmlns:app2="http://bar.com/" maman="baz">barish</app2:bar> </metadata> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/openvzutilstest.c b/tests/openvzutilstest.c index 7f5ddc9bc..05121fe5d 100644 --- a/tests/openvzutilstest.c +++ b/tests/openvzutilstest.c @@ -78,8 +78,8 @@ testReadNetworkConf(const void *data ATTRIBUTE_UNUSED) const char *expected = "<domain type='openvz'>\n" " <uuid>00000000-0000-0000-0000-000000000000</uuid>\n" - " <memory>0</memory>\n" - " <currentMemory>0</currentMemory>\n" + " <memory unit='KiB'>0</memory>\n" + " <currentMemory unit='KiB'>0</currentMemory>\n" " <vcpu>0</vcpu>\n" " <os>\n" " <type>exe</type>\n" diff --git a/tests/qemuargv2xmltest.c b/tests/qemuargv2xmltest.c index 51f5aed28..e13b87aff 100644 --- a/tests/qemuargv2xmltest.c +++ b/tests/qemuargv2xmltest.c @@ -22,8 +22,9 @@ static int blankProblemElements(char *data) { if (virtTestClearLineRegex("<name>[[:alnum:]]+</name>", data) < 0 || virtTestClearLineRegex("<uuid>([[:alnum:]]|-)+</uuid>", data) < 0 || - virtTestClearLineRegex("<memory>[[:digit:]]+</memory>", data) < 0 || - virtTestClearLineRegex("<currentMemory>[[:digit:]]+</currentMemory>", data) < 0 || + virtTestClearLineRegex("<memory.*>[[:digit:]]+</memory>", data) < 0 || + virtTestClearLineRegex("<currentMemory.*>[[:digit:]]+</currentMemory>", + data) < 0 || virtTestClearLineRegex("<readonly/>", data) < 0 || virtTestClearLineRegex("<sharable/>", data) < 0) return -1; diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.xml b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.xml index 931562180..fc909ae20 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.xml index 8ac3c091c..375daf45f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bios.xml b/tests/qemuxml2argvdata/qemuxml2argv-bios.xml index 9312beecc..cfc558710 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bios.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-bios.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>test-bios</name> <uuid>362d1fc1-df7d-193e-5c18-49a71bd1da66</uuid> - <memory>1048576</memory> - <currentMemory>1048576</currentMemory> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml index 828d199ac..e9a87b3db 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml index 97a81839a..7bacf9189 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <blkiotune> <weight>800</weight> <device> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml index 5be9b3700..94c0b28f8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-blkiotune.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <blkiotune> <weight>800</weight> </blkiotune> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml index 44a30de12..77c73a17b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml index 8ee42e7c9..3aab45e7f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml index 8ee42e7c9..3aab45e7f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-complex.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml index f55ee2c93..25490f18e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml index 28b1b68d7..f8eda9169 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml index 28b1b68d7..f8eda9169 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml index 28b1b68d7..f8eda9169 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml index 7847a99dd..89e1172ce 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml index 85e6d91d5..eca1307e8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml index 38f88aad7..ee7518dd1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml index 69ba3c03f..cbbc958e1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml index be074261a..d20125278 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml @@ -1,8 +1,8 @@ <domain type='kvm'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <bootloader>/usr/bin/pygrub</bootloader> <os> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml index 7b776c54f..7de7245c9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml index 6505b553d..e4945e9a4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.xml @@ -1,7 +1,7 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> + <memory unit='KiB'>219136</memory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml index 6505b553d..e4945e9a4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.xml @@ -1,7 +1,7 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> + <memory unit='KiB'>219136</memory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml index 73f2ce30f..91a973a14 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml index 9b9403e9b..960442ae0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml index aa1b3c25f..613fd8c37 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml index ff3612041..6aa18e1e6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml index c0975ac81..1a4e1215f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml index 510ccb1dc..97c0aedb4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml index 00532dcf9..d14034264 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml index 4f7dafbac..a901b5449 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml index 081cd8a7c..a4d314e70 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml index 84971b6bb..626250c6a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml index ec7334850..0eb026ebb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml index b5fd49c5f..2804b6000 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml index 11de634f3..2649c0da0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml index 831291aa9..130713efb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.xml index 7bd28a87d..e93f52e18 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml index 50f582b33..9ae9d6508 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.xml @@ -1,8 +1,8 @@ <domain type='kvm'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.xml index afb16f95b..e9ac0bcd2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-nofallback.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-nofallback.xml index c2ded1135..695fa1100 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-nofallback.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-nofallback.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.xml index 96b046cc7..63484472f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.xml index 2d7502574..827509404 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.xml @@ -1,8 +1,8 @@ <domain type='kvm'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml index 63a616392..498a6ecab 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.xml @@ -1,8 +1,8 @@ <domain type='kvm'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml index 1a2bef6dc..6e030af24 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml index 795bacabe..b8d1bf9be 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-nofallback.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-nofallback.xml index 7f1f09a90..517fafaa8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-nofallback.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-nofallback.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml index 9fcdda82a..997ef7d67 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>16</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml index 9fcdda82a..997ef7d67 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-numa2.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>16</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-qemu-host-passthrough.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-qemu-host-passthrough.xml index a7123ce77..1e82b4be7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-qemu-host-passthrough.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-qemu-host-passthrough.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml index 3dee11f49..3c0bf22bf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml index 6b37207d9..275e51e00 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml index 9f09e8172..992a7ad13 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml index 6b37207d9..275e51e00 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cputune.xml b/tests/qemuxml2argvdata/qemuxml2argv-cputune.xml index b3192c7b3..6f70571d5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cputune.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cputune.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>2</vcpu> <cputune> <shares>2048</shares> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml index f1c9a4299..e29b75e65 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml index 8fdcb1dbf..88f650f44 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml index ab09ed60b..6bdd46bee 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml index fb0bf2bf7..48c742b2a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.xml @@ -1,6 +1,6 @@ <domain type='qemu'> <name>test</name> - <memory>1048576</memory> + <memory unit='KiB'>1048576</memory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc-0.13'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml index dda54f8b1..d137231af 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml index cff1a4228..5e638cd08 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml index d32d56959..2abae66e8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml index f2362afc4..e4d29c73d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml index 078e2e74c..f3deecc1b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml index 1e575ed3c..dc0d595f3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml index ffa8aba2f..af39de07c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml index 4c33b5a72..63e82f056 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml index cad825753..14f9a28ea 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml index 1af9a9fd2..5da9d2ca4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml index e0182d6a3..d3b446b61 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml index a1d55f96f..721a5f6e9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml index b52d3972d..07a4cf7b8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml index 2345bae12..163fc1d55 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml index 599993c40..0fa589751 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml index a761f6a55..11371a21e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.xml index ac6c69852..10cef28d8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml index 8d02517f9..5d4fc9fc5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ceph-env.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml index 8d02517f9..5d4fc9fc5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml index 30e2a75c0..04cfd3c11 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.xml index 2ce27a563..5750ab287 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml index a3ecd9c24..ab7506725 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml index a3ecd9c24..ab7506725 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml index 674bbede3..0760afa79 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml index 68e4f06b3..b9240cf91 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml index 00edadaf7..82a699903 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.xml @@ -1,6 +1,6 @@ <domain type='qemu'> <name>test</name> - <memory>1048576</memory> + <memory unit='KiB'>1048576</memory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc-0.13'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml index 055883a5d..1b0081857 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml index d89e57bde..10cdee7c1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-order.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.xml index 3d7fa545e..add074c31 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.xml index fbbf6ed84..3db59e691 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml index 8613b5dc0..7599346c5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.xml index 8b353071e..287e0ee92 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.xml index c12688620..cd30b3cc3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.xml index 0544c056a..019603d1a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-transient.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-transient.xml index aac1b5793..7e4d6ac4b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-transient.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-transient.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.xml index 7ad35e3d5..4c7b9da9a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml index da238fa91..d61fd15d6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml index 02d1fd3ee..00111bef5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml index 9606a52ac..2fa1e3886 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml index 636f7e42a..0a3af7fc8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.xml @@ -1,8 +1,8 @@ <domain type='kvm'> <name>encryptdisk</name> <uuid>496898a6-e6ff-f7c8-5dc2-3cf410945ee9</uuid> - <memory>1048576</memory> - <currentMemory>524288</currentMemory> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>524288</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc-0.13'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml index a8131b99c..5c4664c2c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-event_idx.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>test</name> <uuid>bba65c0e-c049-934f-b6aa-4e2c0582acdf</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' machine='pc-0.13'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml index 48bcdb76f..c31bb2996 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml index 2e484cb69..026b38492 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml index 36f0e30ff..0c5188fc4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml index 3915b8294..e990aa8d8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-listen-network2.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml index 13f7a1f18..6eeb21d44 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml index 64cadd8ad..400cc5884 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml index ca3226744..5504b2a58 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml index 8d7eb5c89..df8753662 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml index 17fb06cfd..8f751fff1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>f14</name> <uuid>553effab-b5e1-2d80-dfe3-da4344826c43</uuid> - <memory>1048576</memory> - <currentMemory>1048576</currentMemory> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> <vcpu>2</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml index 35cf26dc9..8930b6088 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml index cd2446823..f0cdc6664 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml index 88b67105c..952843f6e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml index cd2446823..f0cdc6664 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml index 49ad691f5..4fbe7a67b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.xml index 4ef8af456..64b94e0c5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest2</name> <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml index 2de4c6de0..aeee13f72 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest2</name> <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.xml index 04dc7da34..18d5e9b5b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml index f6e17ee18..6ee20f2b8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml index 79fe83d95..68bdf9e71 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <memoryBacking> <hugepages/> </memoryBacking> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.xml index bdf81b222..d2e94dcc3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml index 968cc44f5..5467001c3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml index d62e7fd08..5ea46a78c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml index 4dc18c5c8..2d73ed3f0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml @@ -1,8 +1,8 @@ <domain type='kvm'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <bootloader>/foo</bootloader> <os> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml index fbd31ec94..88fc2b816 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-kvmclock.xml @@ -1,8 +1,8 @@ <domain type='kvm'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>6</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-lease.xml b/tests/qemuxml2argvdata/qemuxml2argv-lease.xml index d42239c22..c915cd7f2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-lease.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-lease.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> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.xml index 1b5661fa5..b4bc101cc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml index c077458f3..93e32db0f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml @@ -1,8 +1,8 @@ <domain type='kvm'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='x86_64'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune.xml b/tests/qemuxml2argvdata/qemuxml2argv-memtune.xml index 1c318040c..b6c8c95ba 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memtune.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune.xml @@ -1,12 +1,12 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <memtune> - <hard_limit>512000</hard_limit> - <soft_limit>128000</soft_limit> - <swap_hard_limit>1024000</swap_hard_limit> + <hard_limit unit='KiB'>512000</hard_limit> + <soft_limit unit='KiB'>128000</soft_limit> + <swap_hard_limit unit='KiB'>1024000</swap_hard_limit> </memtune> <vcpu>1</vcpu> <os> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml b/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml index 1e0b63e0a..e3c2b1078 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-metadata.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml b/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml index 7470c8d50..0ff3ca5e3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml b/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml index d48d755df..26790b1df 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml @@ -6,8 +6,8 @@ A test of qemu's minimal configuration. This test also tests the description and title elements. </description> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml index d43251f4c..f64ad6b2b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml index 8c6b861ba..b81acbe4e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml index d43251f4c..f64ad6b2b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.xml b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.xml index 676030406..ad87294a8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-monitor-json.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>encryptdisk</name> <uuid>496898a6-e6ff-f7c8-5dc2-3cf410945ee9</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.xml index 6568bacd3..c755bcef8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml index 4b2e70c4c..e1cfdc69c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-bandwidth.xml @@ -1,8 +1,8 @@ <domain type='kvm'> <name>f14-60</name> <uuid>38644c45-5227-a936-3b38-bc4f72c355bb</uuid> - <memory>1048576</memory> - <currentMemory>1048576</currentMemory> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> <vcpu>2</vcpu> <os> <type arch='x86_64' machine='pc-0.13'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-client.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-client.xml index f63d1769f..2c2b21a11 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-client.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-client.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml index aff3f0fb0..0a8f55027 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.xml index b39f0a23d..26a8cc4cb 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml index 28758a325..bbcb20445 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.xml index 65cd55df6..b6bf1d4b8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml index 51bc247de..62c838a59 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-mcast.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-server.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-server.xml index a53d594c7..4c20d3fd8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-server.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-server.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml index 32693c59a..5d4a3e98a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.xml index 149e56c5d..5be315525 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.xml index 2e46562c6..5d045df00 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-network-portgroup.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-network-portgroup.xml index 1f2af9794..862b1dfac 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-network-portgroup.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-network-portgroup.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml index bcd54b37a..bd066f655 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.xml b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.xml index 1901715de..09896e7c4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>encryptdisk</name> <uuid>496898a6-e6ff-f7c8-5dc2-3cf410945ee9</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml index 7470c8d50..0ff3ca5e3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics.xml b/tests/qemuxml2argvdata/qemuxml2argv-nographics.xml index 97ff16d8b..118c86ff6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nographics.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.xml b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.xml index a717f5c15..e91307c3c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>2</vcpu> <numatune> <memory mode="strict" nodeset="0-5,^4"/> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml index e36f98ca3..b82f62712 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml index 33132ae59..8c7484ee2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml index 327131f38..6352e1f3e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pci-rom.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest2</name> <uuid>c7a5fdbd-edaf-9466-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.xml index 1b164f9e7..b64ccf06e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.xml @@ -1,7 +1,7 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>1ccfd97d-5eb4-478a-bbe6-88d254c16db7</uuid> - <memory>524288</memory> + <memory unit='KiB'>524288</memory> <vcpu>1</vcpu> <os> <type arch='ppc64' machine='pseries'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-address-clash.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-address-clash.xml index 4504f060d..68d3e893d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-address-clash.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-address-clash.xml @@ -1,7 +1,7 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>2754dd7b-ac8a-4850-aec0-1f3fcd43235b</uuid> - <memory>524288</memory> + <memory unit='KiB'>524288</memory> <vcpu>1</vcpu> <os> <type arch='ppc64' machine='pseries'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.xml index cf6547879..b9e50003c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.xml @@ -1,7 +1,7 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>2754dd7b-ac8a-4850-aec0-1f3fcd43235b</uuid> - <memory>524288</memory> + <memory unit='KiB'>524288</memory> <vcpu>1</vcpu> <os> <type arch='ppc64' machine='pseries'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.xml b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.xml index 68f42164d..1f4d14bd8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.xml @@ -1,7 +1,7 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>2754dd7b-ac8a-4850-aec0-1f3fcd43235b</uuid> - <memory>524288</memory> + <memory unit='KiB'>524288</memory> <vcpu>1</vcpu> <os> <type arch='ppc64' machine='pseries'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml index dd128ca24..06e63ed5e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml @@ -1,8 +1,8 @@ <domain type='qemu' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.xml index 19bcd2f45..81b96d68b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.xml @@ -1,8 +1,8 @@ <domain type='qemu' xmlns:qemu='http://libvirt.org/schemas/domain/qemu/1.0'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml index c0975ac81..1a4e1215f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.xml index 7470c8d50..0ff3ca5e3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml index 7470c8d50..0ff3ca5e3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.xml index 31c3190e0..f27dc2eca 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml index be805fe6e..233501f5a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.xml index e0463673a..d9fa37c1e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml index 6afc3c146..ec8e8c77d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.xml index 969fdbd79..d1ea84184 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.xml b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.xml index 9e33a061c..a792d9b14 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml index 878a0aa45..105b71693 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml index ac944f347..5c7b0b2bf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml index afbcd3428..659635868 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml index b4d7c5203..581d3d396 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml index eaa80b1d9..c41e51304 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml index c3160e685..ea33b34b5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml index 6da038dbd..4b2089f1b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml index af765ef61..90d21c383 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-target-port-auto.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-target-port-auto.xml index 2e0b2ee1e..af8841e07 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-target-port-auto.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-target-port-auto.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml index 76af25565..256fdee05 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml index d86934892..33585bd9a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml index 15014559b..2227a7068 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml index 19496d7ec..ee0096aa7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml index 1ac39ff46..992cda1a7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml index e30d1dcf6..67a6aecac 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml index 46b0d61ca..bab78e454 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml index c92804874..0490735f8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml index f6a943ca6..c19ef68cc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml index 9dfc7c327..2668d2dec 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.xml b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.xml index 2a53dbb62..1914c6bcc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219200</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219200</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.xml b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.xml index 5a9844b48..2f5806808 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219200</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219200</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.xml b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.xml index 95790f205..b0415b341 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219200</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219200</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.xml b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.xml index 19512eb29..33e2ee406 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219200</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219200</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.xml index f133391db..92fb31d10 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219200</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219200</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml b/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml index fbffb2907..c9bc6d503 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <sysinfo type='smbios'> <bios> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.xml b/tests/qemuxml2argvdata/qemuxml2argv-smp.xml index b79ff28a4..e3dca51e0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu current='1'>2</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml index 0f5df4d6d..bd43eef52 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml index 921d8eeaf..a7e73a164 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.xml index eb8f5ba16..45d81b695 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-controller.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219200</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219200</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.xml index 5e0b256c8..14490e505 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-hub.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219200</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219200</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.xml index 5a43638be..b7b47cdac 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219200</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219200</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml index 49a57e229..3237ef9e2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219200</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219200</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.xml index 1996d2092..d233544d9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219200</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219200</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.xml index e31e5bc85..0cedf8714 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-ports.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219200</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219200</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml index a359a3d41..b0e8b4545 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb-redir.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219200</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219200</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.xml b/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.xml index b12b841b2..572cb2b51 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219200</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219200</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml index 1b183aa96..f6548a6d2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>test</name> <uuid>bba65c0e-c049-934f-b6aa-4e2c0582acdf</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' machine='pc-0.13'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.xml index 48e969f14..9cc7b7723 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.xml b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.xml index d7c1f848c..44ece06d2 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml index cf427f27f..db4f1ea5e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml index c0975ac81..1a4e1215f 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml index c42d60ebe..cb345aa18 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml index 081cd8a7c..a4d314e70 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml index a7cb73dfc..93255a9ea 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml index b394edf7f..89c31ad38 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-cdrom-empty.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml index c6811bb9b..7066ecc3c 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml index 76731e069..f03699701 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-listen-network2.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml index 16efb69b7..14df58a0d 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-graphics-spice-timeout.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>f14</name> <uuid>553effab-b5e1-2d80-dfe3-da4344826c43</uuid> - <memory>1048576</memory> - <currentMemory>1048576</currentMemory> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> <vcpu>2</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml index 026bcf84e..772ad173d 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-metadata.xml @@ -5,8 +5,8 @@ <app1:foo xmlns:app1="http://foo.org/">fooish</app1:foo> <app2:bar xmlns:app2="http://bar.com/" maman="baz">barish</app2:bar> </metadata> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu cpuset='1-4,8-20,525'>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-target-port-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-target-port-auto.xml index 42a8557cd..52297b8fb 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-target-port-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-serial-target-port-auto.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219100</memory> - <currentMemory>219100</currentMemory> + <memory unit='KiB'>219100</memory> + <currentMemory unit='KiB'>219100</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.xml b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.xml index efa2c25bf..559b1a844 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.xml +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns0.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.xml b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.xml index 0217d1caf..56afe6f70 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.xml +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline-ns1.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.xml b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.xml index 626c07d7a..05d1a0695 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.xml +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-commandline.xml @@ -1,8 +1,8 @@ <domain type='qemu'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.xml b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.xml index 93989b191..e0eb0495f 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.xml +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline-ns0.xml @@ -1,8 +1,8 @@ <domain type='qemu' xmlns:qemu='urn:dummy'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.xml b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.xml index 987bd8d13..873a048ca 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.xml +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-commandline.xml @@ -1,8 +1,8 @@ <domain type='qemu' xmlns:qemu='urn:dummy'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.xml b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.xml index d9413cd0d..02acd80dd 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.xml +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain-ns0.xml @@ -1,8 +1,8 @@ <domain type='qemu' xmlns:ns0='http://libvirt.org/schemas/domain/qemu/1.0'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.xml b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.xml index 3afa5b75f..5d697fc86 100644 --- a/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.xml +++ b/tests/qemuxmlnsdata/qemuxmlns-qemu-ns-domain.xml @@ -1,8 +1,8 @@ <domain type='qemu' xmlns:qemu='urn:dummy'> <name>QEMUGuest1</name> <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid> - <memory>219136</memory> - <currentMemory>219136</currentMemory> + <memory unit='KiB'>219136</memory> + <currentMemory unit='KiB'>219136</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='pc'>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml b/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml index 9221bdd7f..7033088e5 100644 --- a/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml +++ b/tests/sexpr2xmldata/sexpr2xml-boot-grub.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>linux</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml index bfac0f416..6bd0a2fee 100644 --- a/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml +++ b/tests/sexpr2xmldata/sexpr2xml-bridge-ipaddr.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>linux</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-curmem.xml b/tests/sexpr2xmldata/sexpr2xml-curmem.xml index 6be4d5d97..8c11c16b9 100644 --- a/tests/sexpr2xmldata/sexpr2xml-curmem.xml +++ b/tests/sexpr2xmldata/sexpr2xml-curmem.xml @@ -1,8 +1,8 @@ <domain type='xen' id='5'> <name>rhel5</name> <uuid>4f77abd2-3019-58e8-3bab-6fbf2118f880</uuid> - <memory>394240</memory> - <currentMemory>179200</currentMemory> + <memory unit='KiB'>394240</memory> + <currentMemory unit='KiB'>179200</currentMemory> <vcpu>1</vcpu> <bootloader>/usr/bin/pygrub</bootloader> <os> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml index d7e305401..9764fbc68 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-block-shareable.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>49a0c6ff-c066-5392-6498-3632d093c2e7</uuid> - <memory>524288</memory> - <currentMemory>393216</currentMemory> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>393216</currentMemory> <vcpu>1</vcpu> <bootloader>/usr/bin/pygrub</bootloader> <os> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml b/tests/sexpr2xmldata/sexpr2xml-disk-block.xml index d9d7552b3..2ab4950e0 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-block.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-block.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>linux</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml index 04824ba68..206542e73 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-qcow.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>linux</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml index 3e935dbff..d8449d37d 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap-raw.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>linux</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml index c6951de9f..f8f907df0 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-drv-blktap2-raw.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>linux</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml b/tests/sexpr2xmldata/sexpr2xml-disk-file.xml index 8aa321492..fd7ad4a98 100644 --- a/tests/sexpr2xmldata/sexpr2xml-disk-file.xml +++ b/tests/sexpr2xmldata/sexpr2xml-disk-file.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>linux</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml index 3f501e7ac..79972c438 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-autoport.xml @@ -1,8 +1,8 @@ <domain type='xen' id='21'> <name>domu-224</name> <uuid>e0c172e6-4ad8-7353-0ece-515d2f181365</uuid> - <memory>524288</memory> - <currentMemory>524288</currentMemory> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml index 2c1c75683..b336128d0 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-empty-kernel.xml @@ -1,8 +1,8 @@ <domain type='xen' id='3'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml index d0ead27cc..6ec16ae63 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-hpet.xml @@ -1,8 +1,8 @@ <domain type='xen' id='1'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml index 9e6deae97..4dffdd3da 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-force-nohpet.xml @@ -1,8 +1,8 @@ <domain type='xen' id='1'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml index bd38a2541..9ca9ce0c6 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-kernel.xml @@ -1,8 +1,8 @@ <domain type='xen' id='15'> <name>fvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml index f4836fb93..6bf48f76d 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-legacy-vfb.xml @@ -1,8 +1,8 @@ <domain type='xen' id='1'> <name>s10u4</name> <uuid>fde0533d-d043-88c6-dfba-4822fa32f309</uuid> - <memory>1048576</memory> - <currentMemory>1048576</currentMemory> + <memory unit='KiB'>1048576</memory> + <currentMemory unit='KiB'>1048576</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml index da3b3aef7..06e97018b 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-localtime.xml @@ -1,8 +1,8 @@ <domain type='xen' id='3'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml index 4dc218f7f..a1fb4a96c 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-ioemu.xml @@ -1,8 +1,8 @@ <domain type='xen' id='3'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml index 57b8d27ba..ede22bc4b 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-net-netfront.xml @@ -1,8 +1,8 @@ <domain type='xen' id='3'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml index e39b638b1..0aaeeef4b 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-parallel-tcp.xml @@ -1,8 +1,8 @@ <domain type='xen' id='1'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml index 5e085f96c..0617439c6 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2-ports.xml @@ -1,8 +1,8 @@ <domain type='xen' id='1'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8ff</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml index 561937694..f5c8070fc 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-dev-2nd-port.xml @@ -1,8 +1,8 @@ <domain type='xen' id='1'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8ff</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml index db010ad26..69030199a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-file.xml @@ -1,8 +1,8 @@ <domain type='xen' id='1'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml index faeed7736..48b1b1414 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-null.xml @@ -1,8 +1,8 @@ <domain type='xen' id='1'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml index 0967ac7a6..ceaddd27f 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pipe.xml @@ -1,8 +1,8 @@ <domain type='xen' id='1'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml index 3773d3b26..69eae958a 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-pty.xml @@ -1,8 +1,8 @@ <domain type='xen' id='1'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml index d46df0944..164ebd4a4 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-stdio.xml @@ -1,8 +1,8 @@ <domain type='xen' id='1'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml index 34f25ac0c..c1c849ae8 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp-telnet.xml @@ -1,8 +1,8 @@ <domain type='xen' id='1'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml index 6c692145d..5f5fbb469 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-tcp.xml @@ -1,8 +1,8 @@ <domain type='xen' id='1'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml index bcc20ddcc..0edc79a35 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-udp.xml @@ -1,8 +1,8 @@ <domain type='xen' id='1'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml index 93f20fa26..7a9ef8963 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-serial-unix.xml @@ -1,8 +1,8 @@ <domain type='xen' id='1'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml index 16355842d..b6fa10594 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound-all.xml @@ -1,8 +1,8 @@ <domain type='xen' id='3'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml index 16355842d..b6fa10594 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-sound.xml @@ -1,8 +1,8 @@ <domain type='xen' id='3'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml index 48708634c..974d78483 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbmouse.xml @@ -1,8 +1,8 @@ <domain type='xen' id='3'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml index 74f4bdf08..75c16daac 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-usbtablet.xml @@ -1,8 +1,8 @@ <domain type='xen' id='3'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml index 5dbc64dbe..d80b9a7d3 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-utc.xml @@ -1,8 +1,8 @@ <domain type='xen' id='3'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml index e3c4e20c6..89c956987 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv-v2.xml @@ -1,8 +1,8 @@ <domain type='xen' id='3'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-fv.xml b/tests/sexpr2xmldata/sexpr2xml-fv.xml index 5dbc64dbe..d80b9a7d3 100644 --- a/tests/sexpr2xmldata/sexpr2xml-fv.xml +++ b/tests/sexpr2xmldata/sexpr2xml-fv.xml @@ -1,8 +1,8 @@ <domain type='xen' id='3'> <name>fvtest</name> <uuid>b5d70dd2-75cd-aca5-1776-9660b059d8bc</uuid> - <memory>409600</memory> - <currentMemory>409600</currentMemory> + <memory unit='KiB'>409600</memory> + <currentMemory unit='KiB'>409600</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml index a1249baa4..6c5e04720 100644 --- a/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml +++ b/tests/sexpr2xmldata/sexpr2xml-net-bridged.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>linux</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml index 91fd65606..482e6a958 100644 --- a/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml +++ b/tests/sexpr2xmldata/sexpr2xml-net-e1000.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>linux</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml index a51955111..d79f31382 100644 --- a/tests/sexpr2xmldata/sexpr2xml-net-routed.xml +++ b/tests/sexpr2xmldata/sexpr2xml-net-routed.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>linux</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml index 5a8277551..873aedfa2 100644 --- a/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml +++ b/tests/sexpr2xmldata/sexpr2xml-no-source-cdrom.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>test</name> <uuid>cc2315e7-d26a-307a-438c-6d188ec4c09c</uuid> - <memory>391168</memory> - <currentMemory>358400</currentMemory> + <memory unit='KiB'>391168</memory> + <currentMemory unit='KiB'>358400</currentMemory> <vcpu>1</vcpu> <os> <type>hvm</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml b/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml index fe0ecb6ba..63dfb5b86 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pci-devs.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>linux</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml index b336d77e4..f1ebfeb50 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader-cmdline.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <bootloader>/usr/bin/pygrub</bootloader> <bootloader_args>-q</bootloader_args> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml index 920c05827..e3e6d7f04 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-bootloader.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <bootloader>/usr/bin/pypxeboot</bootloader> <bootloader_args>mac=AA:00:86:e2:35:72</bootloader_args> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml index 646619256..460f0d645 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-localtime.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>linux</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml index 0d6bf11bc..cf85ea535 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vcpus.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu current='2'>4</vcpu> <os> <type>linux</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml index f5e784312..806d0c5c4 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new-vncdisplay.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>linux</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml index 70f44fccf..be6d789d1 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-new.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>linux</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml index 70f44fccf..be6d789d1 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-orig.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>linux</type> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml index 766c78d71..06e5729f1 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv-vfb-type-crash.xml @@ -1,8 +1,8 @@ <domain type='xen' id='1'> <name>test2vm</name> <uuid>a36f6e38-f498-b06c-5fad-b04947392dbe</uuid> - <memory>524288</memory> - <currentMemory>524288</currentMemory> + <memory unit='KiB'>524288</memory> + <currentMemory unit='KiB'>524288</currentMemory> <vcpu>1</vcpu> <bootloader>/usr/bin/pygrub</bootloader> <os> diff --git a/tests/sexpr2xmldata/sexpr2xml-pv.xml b/tests/sexpr2xmldata/sexpr2xml-pv.xml index 8aa321492..fd7ad4a98 100644 --- a/tests/sexpr2xmldata/sexpr2xml-pv.xml +++ b/tests/sexpr2xmldata/sexpr2xml-pv.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <os> <type>linux</type> diff --git a/tests/storagepoolxml2xmlout/pool-dir.xml b/tests/storagepoolxml2xmlout/pool-dir.xml index 361e38310..85b9d8d52 100644 --- a/tests/storagepoolxml2xmlout/pool-dir.xml +++ b/tests/storagepoolxml2xmlout/pool-dir.xml @@ -1,9 +1,9 @@ <pool type='dir'> <name>virtimages</name> <uuid>70a7eb15-6c34-ee9c-bf57-69e8e5ff3fb2</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> </source> <target> 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'/> diff --git a/tests/storagepoolxml2xmlout/pool-fs.xml b/tests/storagepoolxml2xmlout/pool-fs.xml index ee2bb552f..5e9875e6c 100644 --- a/tests/storagepoolxml2xmlout/pool-fs.xml +++ b/tests/storagepoolxml2xmlout/pool-fs.xml @@ -1,9 +1,9 @@ <pool type='fs'> <name>images</name> <uuid>7641d5a8-af11-f730-a34e-0a7dfcede71f</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/sda6'/> <format type='ext3'/> diff --git a/tests/storagepoolxml2xmlout/pool-iscsi-auth.xml b/tests/storagepoolxml2xmlout/pool-iscsi-auth.xml index 557295d7f..4fa8f6493 100644 --- a/tests/storagepoolxml2xmlout/pool-iscsi-auth.xml +++ b/tests/storagepoolxml2xmlout/pool-iscsi-auth.xml @@ -1,9 +1,9 @@ <pool type='iscsi'> <name>virtimages</name> <uuid>e9392370-2917-565e-692b-d057f46512d6</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> <host name='iscsi.example.com'/> <device path='demo-target'/> diff --git a/tests/storagepoolxml2xmlout/pool-iscsi-multiiqn.xml b/tests/storagepoolxml2xmlout/pool-iscsi-multiiqn.xml index 4c7708639..5724fdeec 100644 --- a/tests/storagepoolxml2xmlout/pool-iscsi-multiiqn.xml +++ b/tests/storagepoolxml2xmlout/pool-iscsi-multiiqn.xml @@ -1,9 +1,9 @@ <pool type='iscsi'> <name>multiiqn</name> <uuid>e9392370-2917-565e-792c-e057f46512d7</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> <host name='iscsi.example.com'/> <device path='demo-target'/> diff --git a/tests/storagepoolxml2xmlout/pool-iscsi-vendor-product.xml b/tests/storagepoolxml2xmlout/pool-iscsi-vendor-product.xml index baab6c023..6ae1c393d 100644 --- a/tests/storagepoolxml2xmlout/pool-iscsi-vendor-product.xml +++ b/tests/storagepoolxml2xmlout/pool-iscsi-vendor-product.xml @@ -1,9 +1,9 @@ <pool type='iscsi'> <name>virtimages</name> <uuid>e9392370-2917-565e-692b-d057f46512d6</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> <host name='iscsi.example.com'/> <device path='demo-target'/> diff --git a/tests/storagepoolxml2xmlout/pool-iscsi.xml b/tests/storagepoolxml2xmlout/pool-iscsi.xml index 774bdd3c5..31c05ac06 100644 --- a/tests/storagepoolxml2xmlout/pool-iscsi.xml +++ b/tests/storagepoolxml2xmlout/pool-iscsi.xml @@ -1,9 +1,9 @@ <pool type='iscsi'> <name>virtimages</name> <uuid>e9392370-2917-565e-692b-d057f46512d6</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> <host name='iscsi.example.com'/> <device path='demo-target'/> diff --git a/tests/storagepoolxml2xmlout/pool-logical-create.xml b/tests/storagepoolxml2xmlout/pool-logical-create.xml index c30359b0e..7413f1cfe 100644 --- a/tests/storagepoolxml2xmlout/pool-logical-create.xml +++ b/tests/storagepoolxml2xmlout/pool-logical-create.xml @@ -1,9 +1,9 @@ <pool type='logical'> <name>HostVG</name> <uuid>1c13165a-d0f4-3aee-b447-30fb38789091</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/sdb1'/> <device path='/dev/sdb2'/> diff --git a/tests/storagepoolxml2xmlout/pool-logical.xml b/tests/storagepoolxml2xmlout/pool-logical.xml index 6ce41e171..07860ef96 100644 --- a/tests/storagepoolxml2xmlout/pool-logical.xml +++ b/tests/storagepoolxml2xmlout/pool-logical.xml @@ -1,9 +1,9 @@ <pool type='logical'> <name>HostVG</name> <uuid>1c13165a-d0f4-3aee-b447-30fb38789091</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> <name>HostVG</name> <format type='lvm2'/> diff --git a/tests/storagepoolxml2xmlout/pool-mpath.xml b/tests/storagepoolxml2xmlout/pool-mpath.xml index 8f5d2c70f..6883e1999 100644 --- a/tests/storagepoolxml2xmlout/pool-mpath.xml +++ b/tests/storagepoolxml2xmlout/pool-mpath.xml @@ -1,9 +1,9 @@ <pool type='mpath'> <name>mpath</name> <uuid>e9392370-2917-565e-692b-d057f46512d6</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> </source> <target> diff --git a/tests/storagepoolxml2xmlout/pool-netfs.xml b/tests/storagepoolxml2xmlout/pool-netfs.xml index 4bd18c585..8a5f27213 100644 --- a/tests/storagepoolxml2xmlout/pool-netfs.xml +++ b/tests/storagepoolxml2xmlout/pool-netfs.xml @@ -1,9 +1,9 @@ <pool type='netfs'> <name>nfsimages</name> <uuid>7641d5a8-af11-f730-a34e-0a7dfcede71f</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> <host name='localhost'/> <dir path='/var/lib/libvirt/images'/> diff --git a/tests/storagepoolxml2xmlout/pool-scsi.xml b/tests/storagepoolxml2xmlout/pool-scsi.xml index b24a9f27e..321dc2bde 100644 --- a/tests/storagepoolxml2xmlout/pool-scsi.xml +++ b/tests/storagepoolxml2xmlout/pool-scsi.xml @@ -1,9 +1,9 @@ <pool type='scsi'> <name>hba0</name> <uuid>e9392370-2917-565e-692b-d057f46512d6</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> <adapter name='host0'/> </source> diff --git a/tests/storagevolxml2xmlout/vol-file-backing.xml b/tests/storagevolxml2xmlout/vol-file-backing.xml index 2d7b9d03e..c0f152e84 100644 --- a/tests/storagevolxml2xmlout/vol-file-backing.xml +++ b/tests/storagevolxml2xmlout/vol-file-backing.xml @@ -3,8 +3,8 @@ <key>(null)</key> <source> </source> - <capacity>10000000000</capacity> - <allocation>0</allocation> + <capacity unit='bytes'>10000000000</capacity> + <allocation unit='bytes'>0</allocation> <target> <path>/var/lib/libvirt/images/sparse.img</path> <format type='raw'/> diff --git a/tests/storagevolxml2xmlout/vol-file.xml b/tests/storagevolxml2xmlout/vol-file.xml index c4cc91e36..a3d647386 100644 --- a/tests/storagevolxml2xmlout/vol-file.xml +++ b/tests/storagevolxml2xmlout/vol-file.xml @@ -3,8 +3,8 @@ <key>(null)</key> <source> </source> - <capacity>1099511627776</capacity> - <allocation>0</allocation> + <capacity unit='bytes'>1099511627776</capacity> + <allocation unit='bytes'>0</allocation> <target> <path>/var/lib/libvirt/images/sparse.img</path> <format type='raw'/> diff --git a/tests/storagevolxml2xmlout/vol-logical-backing.xml b/tests/storagevolxml2xmlout/vol-logical-backing.xml index 45b8f3a9f..6b010e33b 100644 --- a/tests/storagevolxml2xmlout/vol-logical-backing.xml +++ b/tests/storagevolxml2xmlout/vol-logical-backing.xml @@ -3,8 +3,8 @@ <key>(null)</key> <source> </source> - <capacity>2080374784</capacity> - <allocation>2080374784</allocation> + <capacity unit='bytes'>2080374784</capacity> + <allocation unit='bytes'>2080374784</allocation> <target> <path>/dev/HostVG/Swap</path> <permissions> diff --git a/tests/storagevolxml2xmlout/vol-logical.xml b/tests/storagevolxml2xmlout/vol-logical.xml index 570956e1a..7bf309edd 100644 --- a/tests/storagevolxml2xmlout/vol-logical.xml +++ b/tests/storagevolxml2xmlout/vol-logical.xml @@ -3,8 +3,8 @@ <key>(null)</key> <source> </source> - <capacity>2080374784</capacity> - <allocation>2080374784</allocation> + <capacity unit='bytes'>2080374784</capacity> + <allocation unit='bytes'>2080374784</allocation> <target> <path>/dev/HostVG/Swap</path> <permissions> diff --git a/tests/storagevolxml2xmlout/vol-partition.xml b/tests/storagevolxml2xmlout/vol-partition.xml index c3d861e7f..271964f5b 100644 --- a/tests/storagevolxml2xmlout/vol-partition.xml +++ b/tests/storagevolxml2xmlout/vol-partition.xml @@ -3,8 +3,8 @@ <key>(null)</key> <source> </source> - <capacity>106896384</capacity> - <allocation>106896384</allocation> + <capacity unit='bytes'>106896384</capacity> + <allocation unit='bytes'>106896384</allocation> <target> <path>/dev/sda1</path> <format type='none'/> diff --git a/tests/storagevolxml2xmlout/vol-qcow2.xml b/tests/storagevolxml2xmlout/vol-qcow2.xml index 30fea1ecb..4490931f1 100644 --- a/tests/storagevolxml2xmlout/vol-qcow2.xml +++ b/tests/storagevolxml2xmlout/vol-qcow2.xml @@ -3,8 +3,8 @@ <key>(null)</key> <source> </source> - <capacity>5368709120</capacity> - <allocation>294912</allocation> + <capacity unit='bytes'>5368709120</capacity> + <allocation unit='bytes'>294912</allocation> <target> <path>/var/lib/libvirt/images/OtherDemo.img</path> <format type='qcow2'/> 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> diff --git a/tests/xmconfigdata/sexpr2xml-pv-bootloader.xml b/tests/xmconfigdata/sexpr2xml-pv-bootloader.xml index 920c05827..e3e6d7f04 100644 --- a/tests/xmconfigdata/sexpr2xml-pv-bootloader.xml +++ b/tests/xmconfigdata/sexpr2xml-pv-bootloader.xml @@ -1,8 +1,8 @@ <domain type='xen' id='6'> <name>pvtest</name> <uuid>596a5d21-71f4-8fb2-e068-e2386a5c413e</uuid> - <memory>430080</memory> - <currentMemory>430080</currentMemory> + <memory unit='KiB'>430080</memory> + <currentMemory unit='KiB'>430080</currentMemory> <vcpu>2</vcpu> <bootloader>/usr/bin/pypxeboot</bootloader> <bootloader_args>mac=AA:00:86:e2:35:72</bootloader_args> diff --git a/tests/xmconfigdata/test-escape-paths.xml b/tests/xmconfigdata/test-escape-paths.xml index 05a48603e..854c2505b 100644 --- a/tests/xmconfigdata/test-escape-paths.xml +++ b/tests/xmconfigdata/test-escape-paths.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2&test</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-force-hpet.xml b/tests/xmconfigdata/test-fullvirt-force-hpet.xml index 20c6d9437..e9bd07fef 100644 --- a/tests/xmconfigdata/test-fullvirt-force-hpet.xml +++ b/tests/xmconfigdata/test-fullvirt-force-hpet.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml index 4afe38a39..41fe32d20 100644 --- a/tests/xmconfigdata/test-fullvirt-force-nohpet.xml +++ b/tests/xmconfigdata/test-fullvirt-force-nohpet.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-localtime.xml b/tests/xmconfigdata/test-fullvirt-localtime.xml index 6826cdee4..810fd5322 100644 --- a/tests/xmconfigdata/test-fullvirt-localtime.xml +++ b/tests/xmconfigdata/test-fullvirt-localtime.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-net-ioemu.xml b/tests/xmconfigdata/test-fullvirt-net-ioemu.xml index a8dfaf50a..449329623 100644 --- a/tests/xmconfigdata/test-fullvirt-net-ioemu.xml +++ b/tests/xmconfigdata/test-fullvirt-net-ioemu.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-net-netfront.xml b/tests/xmconfigdata/test-fullvirt-net-netfront.xml index 2b920334f..3eeb302ec 100644 --- a/tests/xmconfigdata/test-fullvirt-net-netfront.xml +++ b/tests/xmconfigdata/test-fullvirt-net-netfront.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml index a8dfaf50a..449329623 100644 --- a/tests/xmconfigdata/test-fullvirt-new-cdrom.xml +++ b/tests/xmconfigdata/test-fullvirt-new-cdrom.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml index 5a7ebde8a..8b479acf2 100644 --- a/tests/xmconfigdata/test-fullvirt-old-cdrom.xml +++ b/tests/xmconfigdata/test-fullvirt-old-cdrom.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml index 2c36bd58a..7b93607cc 100644 --- a/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml +++ b/tests/xmconfigdata/test-fullvirt-parallel-tcp.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml index 5dcb3ce06..3506f8530 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2-ports.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml index 539aeae61..b4f93eac8 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-dev-2nd-port.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-serial-file.xml b/tests/xmconfigdata/test-fullvirt-serial-file.xml index d9dfc7401..4b267b1e7 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-file.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-file.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-serial-null.xml b/tests/xmconfigdata/test-fullvirt-serial-null.xml index d7fd23d59..7ff0b3ce9 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-null.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-null.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml index fdfb3446d..e1a3be3b0 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pipe.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-pipe.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-serial-pty.xml b/tests/xmconfigdata/test-fullvirt-serial-pty.xml index 0afe4e920..64355ec82 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-pty.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-pty.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml index 91f4c1ecc..8fdb814f5 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-stdio.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-stdio.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml index 64d818310..eb2ab0c62 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp-telnet.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml index 9307710e5..3d0168bfc 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-tcp.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-tcp.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-serial-udp.xml b/tests/xmconfigdata/test-fullvirt-serial-udp.xml index 16abde380..26228446e 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-udp.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-udp.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-serial-unix.xml b/tests/xmconfigdata/test-fullvirt-serial-unix.xml index 3ba9fc48c..b4fb13cd0 100644 --- a/tests/xmconfigdata/test-fullvirt-serial-unix.xml +++ b/tests/xmconfigdata/test-fullvirt-serial-unix.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-sound.xml b/tests/xmconfigdata/test-fullvirt-sound.xml index 6d82e3807..357891896 100644 --- a/tests/xmconfigdata/test-fullvirt-sound.xml +++ b/tests/xmconfigdata/test-fullvirt-sound.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-usbmouse.xml b/tests/xmconfigdata/test-fullvirt-usbmouse.xml index 709f084c7..7a2d3a7f9 100644 --- a/tests/xmconfigdata/test-fullvirt-usbmouse.xml +++ b/tests/xmconfigdata/test-fullvirt-usbmouse.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml index 5eeb9c032..475cce3cd 100644 --- a/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml +++ b/tests/xmconfigdata/test-fullvirt-usbtablet-no-bus.xml @@ -6,8 +6,8 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='cdrom'/> </os> - <currentMemory>403456</currentMemory> - <memory>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> + <memory unit='KiB'>592896</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xmconfigdata/test-fullvirt-usbtablet.xml b/tests/xmconfigdata/test-fullvirt-usbtablet.xml index b4f309e94..c7ca0a37b 100644 --- a/tests/xmconfigdata/test-fullvirt-usbtablet.xml +++ b/tests/xmconfigdata/test-fullvirt-usbtablet.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-fullvirt-utc.xml b/tests/xmconfigdata/test-fullvirt-utc.xml index a8dfaf50a..449329623 100644 --- a/tests/xmconfigdata/test-fullvirt-utc.xml +++ b/tests/xmconfigdata/test-fullvirt-utc.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest2</name> <uuid>c7a5fdb2-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-no-source-cdrom.xml b/tests/xmconfigdata/test-no-source-cdrom.xml index a7a27d35d..baceee0cc 100644 --- a/tests/xmconfigdata/test-no-source-cdrom.xml +++ b/tests/xmconfigdata/test-no-source-cdrom.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>test</name> <uuid>cc2315e7-d26a-307a-438c-6d188ec4c09c</uuid> - <memory>391168</memory> - <currentMemory>358400</currentMemory> + <memory unit='KiB'>391168</memory> + <currentMemory unit='KiB'>358400</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xmconfigdata/test-paravirt-net-e1000.xml b/tests/xmconfigdata/test-paravirt-net-e1000.xml index 9e6505e23..8f6bef90f 100644 --- a/tests/xmconfigdata/test-paravirt-net-e1000.xml +++ b/tests/xmconfigdata/test-paravirt-net-e1000.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest1</name> <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <bootloader>/usr/bin/pygrub</bootloader> <os> diff --git a/tests/xmconfigdata/test-paravirt-net-vifname.xml b/tests/xmconfigdata/test-paravirt-net-vifname.xml index 22c908f25..631dc9237 100644 --- a/tests/xmconfigdata/test-paravirt-net-vifname.xml +++ b/tests/xmconfigdata/test-paravirt-net-vifname.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest1</name> <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <bootloader>/usr/bin/pygrub</bootloader> <os> diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml index 2c1d50e97..04bb94ccf 100644 --- a/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml +++ b/tests/xmconfigdata/test-paravirt-new-pvfb-vncdisplay.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest1</name> <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <bootloader>/usr/bin/pygrub</bootloader> <os> diff --git a/tests/xmconfigdata/test-paravirt-new-pvfb.xml b/tests/xmconfigdata/test-paravirt-new-pvfb.xml index 9cbaec04b..f9624ba44 100644 --- a/tests/xmconfigdata/test-paravirt-new-pvfb.xml +++ b/tests/xmconfigdata/test-paravirt-new-pvfb.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest1</name> <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <bootloader>/usr/bin/pygrub</bootloader> <os> diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml index 2c1d50e97..04bb94ccf 100644 --- a/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml +++ b/tests/xmconfigdata/test-paravirt-old-pvfb-vncdisplay.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest1</name> <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <bootloader>/usr/bin/pygrub</bootloader> <os> diff --git a/tests/xmconfigdata/test-paravirt-old-pvfb.xml b/tests/xmconfigdata/test-paravirt-old-pvfb.xml index 9cbaec04b..f9624ba44 100644 --- a/tests/xmconfigdata/test-paravirt-old-pvfb.xml +++ b/tests/xmconfigdata/test-paravirt-old-pvfb.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest1</name> <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu>1</vcpu> <bootloader>/usr/bin/pygrub</bootloader> <os> diff --git a/tests/xmconfigdata/test-paravirt-vcpu.xml b/tests/xmconfigdata/test-paravirt-vcpu.xml index 5817f8039..85e8891ee 100644 --- a/tests/xmconfigdata/test-paravirt-vcpu.xml +++ b/tests/xmconfigdata/test-paravirt-vcpu.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>XenGuest1</name> <uuid>c7a5fdb0-cdaf-9455-926a-d65c16db1809</uuid> - <memory>592896</memory> - <currentMemory>403456</currentMemory> + <memory unit='KiB'>592896</memory> + <currentMemory unit='KiB'>403456</currentMemory> <vcpu current='2'>4</vcpu> <bootloader>/usr/bin/pygrub</bootloader> <os> diff --git a/tests/xmconfigdata/test-pci-devs.xml b/tests/xmconfigdata/test-pci-devs.xml index 31df1c79b..0cb3ad49d 100644 --- a/tests/xmconfigdata/test-pci-devs.xml +++ b/tests/xmconfigdata/test-pci-devs.xml @@ -1,8 +1,8 @@ <domain type='xen'> <name>test</name> <uuid>cc2315e7-d26a-307a-438c-6d188ec4c09c</uuid> - <memory>391168</memory> - <currentMemory>358400</currentMemory> + <memory unit='KiB'>391168</memory> + <currentMemory unit='KiB'>358400</currentMemory> <vcpu>1</vcpu> <os> <type arch='i686' machine='xenfv'>hvm</type> diff --git a/tests/xml2sexprdata/xml2sexpr-boot-grub.xml b/tests/xml2sexprdata/xml2sexpr-boot-grub.xml index b9b1c9f78..c4b92dcd0 100644 --- a/tests/xml2sexprdata/xml2sexpr-boot-grub.xml +++ b/tests/xml2sexprdata/xml2sexpr-boot-grub.xml @@ -6,7 +6,7 @@ <kernel>/usr/lib/xen/boot/pv-grub-x86_64.gz</kernel> <cmdline>(hd0,0)/grub/menu.lst</cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml index 83daf82d3..d72f98691 100644 --- a/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml +++ b/tests/xml2sexprdata/xml2sexpr-bridge-ipaddr.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-curmem.xml b/tests/xml2sexprdata/xml2sexpr-curmem.xml index 0d5f5612e..826effb2a 100644 --- a/tests/xml2sexprdata/xml2sexpr-curmem.xml +++ b/tests/xml2sexprdata/xml2sexpr-curmem.xml @@ -2,8 +2,8 @@ <name>rhel5</name> <uuid>4f77abd2301958e83bab6fbf2118f880</uuid> <bootloader>/usr/bin/pygrub</bootloader> - <memory>394240</memory> - <currentMemory>179200</currentMemory> + <memory unit='KiB'>394240</memory> + <currentMemory unit='KiB'>179200</currentMemory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml b/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml index 1b5138917..b7bb21438 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml +++ b/tests/xml2sexprdata/xml2sexpr-disk-block-shareable.xml @@ -8,8 +8,8 @@ <initrd>/var/lib/xen/boot_ramdisk.sjOK9_</initrd> <cmdline>ro root=/dev/VolGroup00/LogVol00</cmdline> </os> - <currentMemory>393216</currentMemory> - <memory>524288</memory> + <currentMemory unit='KiB'>393216</currentMemory> + <memory unit='KiB'>524288</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-disk-block.xml b/tests/xml2sexprdata/xml2sexpr-disk-block.xml index 285b38218..c38717614 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-block.xml +++ b/tests/xml2sexprdata/xml2sexpr-disk-block.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml b/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml index 97d88e0e2..a1c528f50 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blkback.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml index 008658cbf..e6ad42b09 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-qcow.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml index 630b3f9ae..f5670d2d2 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap-raw.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml index 324b6d005..a32cd278d 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.xml b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.xml index 0cc37cc63..f531250c9 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.xml +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2-raw.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.xml b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.xml index 67cce17c1..e0384b266 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.xml +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-blktap2.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml b/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml index 978ca7cc4..a7e662c8b 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml +++ b/tests/xml2sexprdata/xml2sexpr-disk-drv-loop.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-disk-file.xml b/tests/xml2sexprdata/xml2sexpr-disk-file.xml index 5274afef9..828d450d2 100644 --- a/tests/xml2sexprdata/xml2sexpr-disk-file.xml +++ b/tests/xml2sexprdata/xml2sexpr-disk-file.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-escape.xml b/tests/xml2sexprdata/xml2sexpr-escape.xml index 6eed578c0..7cc847721 100644 --- a/tests/xml2sexprdata/xml2sexpr-escape.xml +++ b/tests/xml2sexprdata/xml2sexpr-escape.xml @@ -8,7 +8,7 @@ <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os&version="devel" </cmdline> <loader>/usr/lib/xen/boot/hvmloader</loader> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml b/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml index 1065f0eb6..fbf360573 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-force-hpet.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml b/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml index decfd67db..e7144cf9b 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-force-nohpet.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml b/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml index b0ced3cf6..144e09f33 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-kernel.xml @@ -8,7 +8,7 @@ <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> <loader>/usr/lib/xen/boot/hvmloader</loader> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-localtime.xml b/tests/xml2sexprdata/xml2sexpr-fv-localtime.xml index b5d0020d7..2360ec776 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-localtime.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-localtime.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.xml b/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.xml index 4cdd1e620..42185d567 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-net-ioemu.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml b/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml index f278f1fb6..efabc3633 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-net-netfront.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml index 2a7988113..667ecbd4c 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-parallel-tcp.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.xml index e5d181791..643db65e3 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2-ports.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.xml index a310e5da8..3afaa4c29 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-dev-2nd-port.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml index 697762c1f..411530d82 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-file.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml index be7ef1dd3..b8285bcf4 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-null.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml index 1e40189da..4316cdef3 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-pipe.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml index 8c6b0c98e..9e162499d 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-pty.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml index faafd9933..068b188ce 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-stdio.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml index 8b048cd50..f510e40e7 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp-telnet.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml index 1f34f1fae..72915b0a3 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-tcp.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml index 4b640e868..ec94ebf18 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-udp.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml index d86dca1b6..6d87bea57 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-serial-unix.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-sound.xml b/tests/xml2sexprdata/xml2sexpr-fv-sound.xml index b649e17d8..ec55ef330 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-sound.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-sound.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml index 98a34fe66..9af0df4f4 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-usbmouse.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml b/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml index 45a9b8555..d619e8f9f 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-usbtablet.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-utc.xml b/tests/xml2sexprdata/xml2sexpr-fv-utc.xml index 11ad760d5..a916e4147 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-utc.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-utc.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml index f8dde852f..92e7cf1be 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv-vncunused.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-fv.xml b/tests/xml2sexprdata/xml2sexpr-fv.xml index 690fd63dc..4e77f5d80 100644 --- a/tests/xml2sexprdata/xml2sexpr-fv.xml +++ b/tests/xml2sexprdata/xml2sexpr-fv.xml @@ -6,7 +6,7 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>409600</memory> + <memory unit='KiB'>409600</memory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-net-bridged.xml b/tests/xml2sexprdata/xml2sexpr-net-bridged.xml index 5f68a6d57..d995d19c8 100644 --- a/tests/xml2sexprdata/xml2sexpr-net-bridged.xml +++ b/tests/xml2sexprdata/xml2sexpr-net-bridged.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-net-e1000.xml b/tests/xml2sexprdata/xml2sexpr-net-e1000.xml index 6e9ce94f9..e49518d87 100644 --- a/tests/xml2sexprdata/xml2sexpr-net-e1000.xml +++ b/tests/xml2sexprdata/xml2sexpr-net-e1000.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-net-routed.xml b/tests/xml2sexprdata/xml2sexpr-net-routed.xml index 778c9112b..f34dbaa5a 100644 --- a/tests/xml2sexprdata/xml2sexpr-net-routed.xml +++ b/tests/xml2sexprdata/xml2sexpr-net-routed.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml b/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml index d2b6d5e0c..65a6c019b 100644 --- a/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml +++ b/tests/xml2sexprdata/xml2sexpr-no-source-cdrom.xml @@ -6,8 +6,8 @@ <loader>/usr/lib/xen/boot/hvmloader</loader> <boot dev='hd'/> </os> - <memory>391168</memory> - <currentMemory>358400</currentMemory> + <memory unit='KiB'>391168</memory> + <currentMemory unit='KiB'>358400</currentMemory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-pci-devs.xml b/tests/xml2sexprdata/xml2sexpr-pci-devs.xml index 264600234..a2d9d7e8e 100644 --- a/tests/xml2sexprdata/xml2sexpr-pci-devs.xml +++ b/tests/xml2sexprdata/xml2sexpr-pci-devs.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml b/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml index 40bff6bae..e4f468504 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml +++ b/tests/xml2sexprdata/xml2sexpr-pv-bootloader-cmdline.xml @@ -7,7 +7,7 @@ <type>linux</type> <cmdline>xenfb.video=8,1280,1024</cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml b/tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml index 3cf4ca332..98bd8ecf5 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml +++ b/tests/xml2sexprdata/xml2sexpr-pv-bootloader.xml @@ -3,7 +3,7 @@ <uuid>596a5d2171f48fb2e068e2386a5c413e</uuid> <bootloader>/usr/bin/pypxeboot</bootloader> <bootloader_args>mac=AA:00:86:e2:35:72</bootloader_args> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-pv-localtime.xml b/tests/xml2sexprdata/xml2sexpr-pv-localtime.xml index 2ce1e44ac..d4ea7ee2c 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-localtime.xml +++ b/tests/xml2sexprdata/xml2sexpr-pv-localtime.xml @@ -2,8 +2,8 @@ <name>rhel5</name> <uuid>4f77abd2301958e83bab6fbf2118f880</uuid> <bootloader>/usr/bin/pygrub</bootloader> - <memory>394240</memory> - <currentMemory>179200</currentMemory> + <memory unit='KiB'>394240</memory> + <currentMemory unit='KiB'>179200</currentMemory> <vcpu>1</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>restart</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml index d061e1139..c416c5202 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml +++ b/tests/xml2sexprdata/xml2sexpr-pv-vcpus.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu current='2'>4</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.xml b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.xml index c17d9d5ff..0fb6ba067 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.xml +++ b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new-auto.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml index a8430eb1e..f5f15a8b0 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml +++ b/tests/xml2sexprdata/xml2sexpr-pv-vfb-new.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.xml b/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.xml index a8430eb1e..f5f15a8b0 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.xml +++ b/tests/xml2sexprdata/xml2sexpr-pv-vfb-orig.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2sexprdata/xml2sexpr-pv.xml b/tests/xml2sexprdata/xml2sexpr-pv.xml index 5274afef9..828d450d2 100644 --- a/tests/xml2sexprdata/xml2sexpr-pv.xml +++ b/tests/xml2sexprdata/xml2sexpr-pv.xml @@ -7,7 +7,7 @@ <initrd>/var/lib/xen/initrd.img.0u-Vhq</initrd> <cmdline> method=http://download.fedora.devel.redhat.com/pub/fedora/linux/core/test/5.91/x86_64/os </cmdline> </os> - <memory>430080</memory> + <memory unit='KiB'>430080</memory> <vcpu>2</vcpu> <on_poweroff>destroy</on_poweroff> <on_reboot>destroy</on_reboot> diff --git a/tests/xml2vmxdata/xml2vmx-annotation.xml b/tests/xml2vmxdata/xml2vmx-annotation.xml index 402537e73..0caa0048b 100644 --- a/tests/xml2vmxdata/xml2vmx-annotation.xml +++ b/tests/xml2vmxdata/xml2vmx-annotation.xml @@ -2,7 +2,7 @@ <name>annotation</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> <description>Some |text| to test the "escaping": ||""||"| Unescaped!</description> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-ide-device.xml b/tests/xml2vmxdata/xml2vmx-cdrom-ide-device.xml index 17199a945..a4ca28f4c 100644 --- a/tests/xml2vmxdata/xml2vmx-cdrom-ide-device.xml +++ b/tests/xml2vmxdata/xml2vmx-cdrom-ide-device.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>cdrom-ide-device</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-ide-file.xml b/tests/xml2vmxdata/xml2vmx-cdrom-ide-file.xml index a2404da1b..0ea16501a 100644 --- a/tests/xml2vmxdata/xml2vmx-cdrom-ide-file.xml +++ b/tests/xml2vmxdata/xml2vmx-cdrom-ide-file.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>cdrom-ide-file</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.xml b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.xml index 931e99d27..324253d9d 100644 --- a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.xml +++ b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-device.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>cdrom-scsi-device</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.xml b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.xml index 2f2850920..82d2d7ae9 100644 --- a/tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.xml +++ b/tests/xml2vmxdata/xml2vmx-cdrom-scsi-file.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>cdrom-scsi-file</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.xml b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.xml index ea597785c..0c7dfccb0 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-1.xml +++ b/tests/xml2vmxdata/xml2vmx-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/xml2vmxdata/xml2vmx-esx-in-the-wild-2.xml b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.xml index 774b44144..affb5cf04 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-2.xml +++ b/tests/xml2vmxdata/xml2vmx-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/xml2vmxdata/xml2vmx-esx-in-the-wild-3.xml b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.xml index c8719817e..4d24e0da9 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-3.xml +++ b/tests/xml2vmxdata/xml2vmx-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/xml2vmxdata/xml2vmx-esx-in-the-wild-4.xml b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.xml index 443aacd4a..277bac479 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-4.xml +++ b/tests/xml2vmxdata/xml2vmx-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/xml2vmxdata/xml2vmx-esx-in-the-wild-5.xml b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.xml index f28c15e97..4d1e5b8e5 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-5.xml +++ b/tests/xml2vmxdata/xml2vmx-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/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml b/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml index 0c4e4d56c..fa416a9de 100644 --- a/tests/xml2vmxdata/xml2vmx-esx-in-the-wild-6.xml +++ b/tests/xml2vmxdata/xml2vmx-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/xml2vmxdata/xml2vmx-ethernet-bridged.xml b/tests/xml2vmxdata/xml2vmx-ethernet-bridged.xml index 12a87885b..f34c4f1f0 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-bridged.xml +++ b/tests/xml2vmxdata/xml2vmx-ethernet-bridged.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>ethernet-bridged</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-custom.xml b/tests/xml2vmxdata/xml2vmx-ethernet-custom.xml index cd1d88f41..1aefedc26 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-custom.xml +++ b/tests/xml2vmxdata/xml2vmx-ethernet-custom.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>ethernet-custom</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-e1000.xml b/tests/xml2vmxdata/xml2vmx-ethernet-e1000.xml index 7e9536393..0ed3d79ce 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-e1000.xml +++ b/tests/xml2vmxdata/xml2vmx-ethernet-e1000.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>ethernet-e1000</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-generated.xml b/tests/xml2vmxdata/xml2vmx-ethernet-generated.xml index aac8a74fb..bf17bb5fe 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-generated.xml +++ b/tests/xml2vmxdata/xml2vmx-ethernet-generated.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>ethernet-generated</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-other.xml b/tests/xml2vmxdata/xml2vmx-ethernet-other.xml index cf1ce7c9c..34ad27405 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-other.xml +++ b/tests/xml2vmxdata/xml2vmx-ethernet-other.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>ethernet-static</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-static.xml b/tests/xml2vmxdata/xml2vmx-ethernet-static.xml index b803de422..c19742aaa 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-static.xml +++ b/tests/xml2vmxdata/xml2vmx-ethernet-static.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>ethernet-static</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml index 7d6d0e581..b53136484 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vmxnet2.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>ethernet-vmxnet2</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-ethernet-vpx.xml b/tests/xml2vmxdata/xml2vmx-ethernet-vpx.xml index 1490238ec..1b4fd646c 100644 --- a/tests/xml2vmxdata/xml2vmx-ethernet-vpx.xml +++ b/tests/xml2vmxdata/xml2vmx-ethernet-vpx.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>ethernet-vpx</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-floppy-device.xml b/tests/xml2vmxdata/xml2vmx-floppy-device.xml index 91bac2645..4a30a6d20 100644 --- a/tests/xml2vmxdata/xml2vmx-floppy-device.xml +++ b/tests/xml2vmxdata/xml2vmx-floppy-device.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>floppy-device</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-floppy-file.xml b/tests/xml2vmxdata/xml2vmx-floppy-file.xml index deff02e06..83598b3fd 100644 --- a/tests/xml2vmxdata/xml2vmx-floppy-file.xml +++ b/tests/xml2vmxdata/xml2vmx-floppy-file.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>floppy-file</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-graphics-vnc.xml b/tests/xml2vmxdata/xml2vmx-graphics-vnc.xml index 400dcdd8c..70e55d51e 100644 --- a/tests/xml2vmxdata/xml2vmx-graphics-vnc.xml +++ b/tests/xml2vmxdata/xml2vmx-graphics-vnc.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>minimal</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.xml b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.xml index 44e1c13d5..56b98f7cb 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-1.xml +++ b/tests/xml2vmxdata/xml2vmx-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>hvm</type> diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.xml b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.xml index 7c2a57d15..a7732b74d 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-2.xml +++ b/tests/xml2vmxdata/xml2vmx-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>hvm</type> diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.xml b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.xml index 49f023868..e4fc5b61a 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-3.xml +++ b/tests/xml2vmxdata/xml2vmx-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>hvm</type> diff --git a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.xml b/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.xml index 059c5241d..7442025b6 100644 --- a/tests/xml2vmxdata/xml2vmx-gsx-in-the-wild-4.xml +++ b/tests/xml2vmxdata/xml2vmx-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>hvm</type> diff --git a/tests/xml2vmxdata/xml2vmx-harddisk-ide-file.xml b/tests/xml2vmxdata/xml2vmx-harddisk-ide-file.xml index f83ad0183..e57e249dc 100644 --- a/tests/xml2vmxdata/xml2vmx-harddisk-ide-file.xml +++ b/tests/xml2vmxdata/xml2vmx-harddisk-ide-file.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>harddisk-ide-file</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.xml b/tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.xml index 63eeff786..70a9b5749 100644 --- a/tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.xml +++ b/tests/xml2vmxdata/xml2vmx-harddisk-scsi-file.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>harddisk-scsi-file</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-minimal-64bit.xml b/tests/xml2vmxdata/xml2vmx-minimal-64bit.xml index 42ef4ca5a..fdd248ebc 100644 --- a/tests/xml2vmxdata/xml2vmx-minimal-64bit.xml +++ b/tests/xml2vmxdata/xml2vmx-minimal-64bit.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>minimal-64bit</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type arch='x86_64'>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-minimal.xml b/tests/xml2vmxdata/xml2vmx-minimal.xml index 8e4e988a3..499de84f5 100644 --- a/tests/xml2vmxdata/xml2vmx-minimal.xml +++ b/tests/xml2vmxdata/xml2vmx-minimal.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>minimal</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-parallel-device.xml b/tests/xml2vmxdata/xml2vmx-parallel-device.xml index 2ddfb35df..cb40e3a9f 100644 --- a/tests/xml2vmxdata/xml2vmx-parallel-device.xml +++ b/tests/xml2vmxdata/xml2vmx-parallel-device.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>parallel-device</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-parallel-file.xml b/tests/xml2vmxdata/xml2vmx-parallel-file.xml index 69f5effa6..8f686ddde 100644 --- a/tests/xml2vmxdata/xml2vmx-parallel-file.xml +++ b/tests/xml2vmxdata/xml2vmx-parallel-file.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>parallel-file</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-scsi-driver.xml b/tests/xml2vmxdata/xml2vmx-scsi-driver.xml index ac630ee5b..360d7d23c 100644 --- a/tests/xml2vmxdata/xml2vmx-scsi-driver.xml +++ b/tests/xml2vmxdata/xml2vmx-scsi-driver.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>scsi-buslogic</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-scsi-writethrough.xml b/tests/xml2vmxdata/xml2vmx-scsi-writethrough.xml index cbf5924fe..d0b17029f 100644 --- a/tests/xml2vmxdata/xml2vmx-scsi-writethrough.xml +++ b/tests/xml2vmxdata/xml2vmx-scsi-writethrough.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>scsi-writethrough</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-serial-device.xml b/tests/xml2vmxdata/xml2vmx-serial-device.xml index 050eff7f4..f3b3c78fd 100644 --- a/tests/xml2vmxdata/xml2vmx-serial-device.xml +++ b/tests/xml2vmxdata/xml2vmx-serial-device.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>serial-device</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-serial-file.xml b/tests/xml2vmxdata/xml2vmx-serial-file.xml index 58a5a5ec0..647a3ca55 100644 --- a/tests/xml2vmxdata/xml2vmx-serial-file.xml +++ b/tests/xml2vmxdata/xml2vmx-serial-file.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>serial-file</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-serial-network-client.xml b/tests/xml2vmxdata/xml2vmx-serial-network-client.xml index e2a5afe45..2775da4a0 100644 --- a/tests/xml2vmxdata/xml2vmx-serial-network-client.xml +++ b/tests/xml2vmxdata/xml2vmx-serial-network-client.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> diff --git a/tests/xml2vmxdata/xml2vmx-serial-network-server.xml b/tests/xml2vmxdata/xml2vmx-serial-network-server.xml index a17e2fef2..49a321153 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> diff --git a/tests/xml2vmxdata/xml2vmx-serial-pipe.xml b/tests/xml2vmxdata/xml2vmx-serial-pipe.xml index 9a6db530f..df4d1283c 100644 --- a/tests/xml2vmxdata/xml2vmx-serial-pipe.xml +++ b/tests/xml2vmxdata/xml2vmx-serial-pipe.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>serial-pipe</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> diff --git a/tests/xml2vmxdata/xml2vmx-smbios.xml b/tests/xml2vmxdata/xml2vmx-smbios.xml index b19e9c749..153ca62d7 100644 --- a/tests/xml2vmxdata/xml2vmx-smbios.xml +++ b/tests/xml2vmxdata/xml2vmx-smbios.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>smbios</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> <smbios mode='host'/> diff --git a/tests/xml2vmxdata/xml2vmx-svga.xml b/tests/xml2vmxdata/xml2vmx-svga.xml index b7db4c887..11488487f 100644 --- a/tests/xml2vmxdata/xml2vmx-svga.xml +++ b/tests/xml2vmxdata/xml2vmx-svga.xml @@ -1,7 +1,7 @@ <domain type='vmware'> <name>minimal</name> <uuid>564d9bef-acd9-b4e0-c8f0-aea8b9103515</uuid> - <memory>4096</memory> + <memory unit='KiB'>4096</memory> <os> <type>hvm</type> </os> |