diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng
index 4f16fa7d216fab60cb52ccc953a759cdadd4708b..a50349c60234c2c682a07a274e29ac198264e69d 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 a905457a767bf1c0f525ac35642e23e83882f17e..53389b07825d142f016676418f4eb4e0b21a9c6e 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 6399f12e34a245602405989dde160bfce848b42f..d4c80da8a7c650fb3d4df7c99b9602c3d6f4f565 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 d06884c9309d25319fa4813472213dbd3f28e68d..8edb877bcbb73bbea80658401f5c88e97451868d 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 b99471814c1a21e9688806f9a9c4005d2d5b66d1..6162c4ed4e4bed804cd3c9bab0ef577e6d59cc72 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 87b410336fe8bd600b9c218035fb067178362833..2beefcbbe1ce5f5a41a1d928655fa5221610b9bd 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 87f3d6a161ce0dbdfcd7a8e7079f26daf4e4889e..07f3f5b6dc8a56af9a432745ec54233769d8b691 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 dfed0bfbc42164db63b4dcd300338d51c356f7f4..1ef929510e15afb167bbe4d1721466ddb94f256f 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 0a0532bdd8416fc01414ef2db8ab427bf61def4a..0c37f6ddd9087fe7eb0a5092830316d84699ea8c 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 653bbc7fbaa97898327e0081b1d49ad0069ade06..e61434faccb76c13514b66c8f95e14e2de04b747 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 e51301d952b4072b2dad1359fb1bc0390964d26e..e7849b341e6abea0bbbf9e0894bcb3f2022caba1 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 a8a9cac4521e2cc1ba0c056f05b81c322024611b..365801db0804004229084640a21d3e4a089cfdf0 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 c1baa2ccfe3547a0c9501977f91c41892986133d..0bfb45697155fdc81d89bfea505137c9d26dbae0 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 c57f38fa7e615a9881ba0dfb674eae52dbf2f5a0..29f60be5519b0bf4a5b273b31175a93e62fe33af 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 a55f353a3c01224b1a65862ca093f1ebb34bc7f4..f77d6b0a08db9dd234027a013697dcff5a382ffb 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 263cbbab6f1a54159aac1308f44a783187174a75..1a27773ab4baf7306454d63fd6ef148085a8d202 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 7f5ddc9bc6471891f0790582f8746168323688b7..05121fe5d9c77f3f4f7de0c916a8316fb022818a 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 51f5aed28e47b40beda2ec3e859d99994d690060..e13b87aff094c6257b35e0a14163c9fa6b129c73 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 9315621808f0bcdaa1c1341c0326dae7607138ef..fc909ae20acabd01a0326718dd3b62effa125653 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 8ac3c091c8b14356c167d5aa79f70a5f7c630690..375daf45fc5a2f7f890dacf2715a39241efa2cab 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 9312beeccba6ba4ee93306a9a4ca3273317ef3e4..cfc558710d0a39bdd9a62742b64112395ef846ab 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 828d199acd311abb396fe1b9df33e6c6386b43f4..e9a87b3db1709e7a4bea09fd4b8c71e4cb1513b1 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 97a81839a27af2451e5954566c5f16c46db4e588..7bacf918904283912ba111de497266bc170c9263 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 5be9b370047d57c4edcbcb0350ac7cdc9f4874db..94c0b28f87ab8d95aa29f5de755e402f74eb3ae8 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 44a30de12538ac8c19e4e1cd5377d0dd53811693..77c73a17bce6019bb3bc2334b3b5b61865086ca5 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 8ee42e7c967ec0e9fc2990441ed9575868d0e2e3..3aab45e7f42e06ec6a2d44eb4da5faaf29deba17 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 8ee42e7c967ec0e9fc2990441ed9575868d0e2e3..3aab45e7f42e06ec6a2d44eb4da5faaf29deba17 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 f55ee2c93f6d0261636ffee8ee6ae1ec21ab0f31..25490f18e46094630e655b150a4215cc2191fd0e 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 28b1b68d788b832f45b166c2b8d5cf2baa083880..f8eda9169ebc0f6b8a3733e5579f2c18fafc595b 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 28b1b68d788b832f45b166c2b8d5cf2baa083880..f8eda9169ebc0f6b8a3733e5579f2c18fafc595b 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 28b1b68d788b832f45b166c2b8d5cf2baa083880..f8eda9169ebc0f6b8a3733e5579f2c18fafc595b 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 7847a99dd5d3d3af5f0cf55305ccad4db8362623..89e1172ce8f8f33812c7a0120e9fb6d8c70f6dd2 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 85e6d91d51e8a4018c993c86ad25b7d7be82b5c9..eca1307e8827a4a314fec5b4fa3a20da9843162d 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 38f88aad7034d5e61de4dcb6640e47185c044a6a..ee7518dd1ef19ffac22a54c5ed035706184c1aba 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 69ba3c03f83c6d5dfad7800dde06088848a1d8fa..cbbc958e151605cf27cff924b161081340f70ed4 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 be074261a2ecd732ccc4b044bd3286c18969a254..d201252780d5935b2b2ceeb1b1ebc94167144d94 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 7b776c54fb7bf211634d89babb47559cea5b2cb1..7de7245c929383d58bc4bd51457bce5ecb2ff20b 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 6505b553d303be106505f56fca4fbb42daca9994..e4945e9a40157c0425a6c3a2cdf1e8e1adfc39e2 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 6505b553d303be106505f56fca4fbb42daca9994..e4945e9a40157c0425a6c3a2cdf1e8e1adfc39e2 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 73f2ce30f50715b4a034a2ccba57cd847ccada81..91a973a14bdd22769448ea5c478c20d52d86ca23 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 9b9403e9ba4b0b56bba92e568034798fa9e8327d..960442ae0a0d855bbc975af1b3374de8501ece3f 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 aa1b3c25fa79882c5feb67e09dd96bc3e5742772..613fd8c372b5520df4cfca43d45c8863125b7819 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 ff3612041d3ba1cea1381f8ee4605170fa9895f3..6aa18e1e6ff49af801ca806c445c3499b0d5747c 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 c0975ac811c0ce0f37d20d1f2078096288afc4c1..1a4e1215f11524fd87ccfef10377084df10191bd 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 510ccb1dcfc0cce5c7e8fa5c2581f976c7942b55..97c0aedb4505cc13d96c7744a9efef04d62d51ce 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 00532dcf96c9f35814ec425235cc49db67260962..d14034264e6430e870c651a53817e650b7a89a07 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 4f7dafbac97d4a7b3dbd9f587c8a8bfff3ebe113..a901b5449a721faa78a557b0d3ad26bda4761a4f 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 081cd8a7cbd08af1eb532a19b4977f3dbe6c0301..a4d314e70cfafbd8a665ab9dcde14c0322770a4b 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 84971b6bba22c6191ad2ea896e0c933ae7115228..626250c6a3ac63c737ff59ba2a6912d7d0d9a60b 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 ec733485046cd01e5a4af0e0f70a9c0b9f5398d4..0eb026ebbdd25c1c34d78f2e701d09e01799add2 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 b5fd49c5f7a7ff2e7909626396cbb0cd41167c65..2804b60004c691a0524e562f19462476059af0e4 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 11de634f3d5592d2bb5fe50ab4dcddbaf6690d79..2649c0da04a95ba7c275e5be80d17b8ab50f3c7c 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 831291aa906b23487c83e3d356a9be6117211e99..130713efbcd5e6bbbddedc9aabfefb2349601ec4 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 7bd28a87d3c5f235a628465fd612076224ca9173..e93f52e18b367d79abf4da73a05704cb6e3069c2 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 50f582b33d206797d7ea9def3325fe9161e26aec..9ae9d65089b0f7447154a5f6af168ee4e2a8b19c 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 afb16f95bd2007e2945369fee21771f6bd4ff771..e9ac0bcd2b7bfb7d113374a7907904db61dc837b 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 c2ded11357d94556a1fd781a7d6cf87c39dd1fda..695fa1100c655bc4344e60e7b8f92b0969857e98 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 96b046cc78b8de286318f04346d6a18870cddbdb..63484472f6a4bc6a5fd96554258ee289478939ba 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 2d7502574c5a7c0c4dd58fe5f1f3f1f043eda9da..827509404adbb07ff212e350bb809f7b8cb7418d 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 63a6163926750c547f6cd049daa1e16796406719..498a6ecab6e87fe5bf93ef30895c4d7ce1fa2e8b 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 1a2bef6dc6908e67e373600557f59df690ee1efb..6e030af247ed41f03b80f79aa3d27ef472d52723 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 795bacabe5447d5702dceeb3e0d8b9434b7412e2..b8d1bf9be4cb4c509c82318a46a6c57e963b104c 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 7f1f09a900d90ccb01c84a60b58a6ea15a86aeca..517fafaa87d2b1aa310a3cacdb9f3f6ce2e398cf 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 9fcdda82ab9450e8177be49397fffb1a698d26f9..997ef7d6743fbaf6f691f9b9a075b263870a8946 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 9fcdda82ab9450e8177be49397fffb1a698d26f9..997ef7d6743fbaf6f691f9b9a075b263870a8946 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 a7123ce77d3f5e38c32e0d15f64dd9154c103c74..1e82b4be7b45ff589437ae9704928ab9c390dd70 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 3dee11f4949ebba8993197c788a83535d3df15fa..3c0bf22bf45051ce4974fa0ca341ec0d2cf7556c 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 6b37207d90a10773e023886b303bdb51a65d4363..275e51e0021c6acbeaa023cedf981bb3fc41666f 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 9f09e8172981a00e422813ac9eae92dd8ca49885..992a7ad1368ce7d056f3e5b24ea6519b270921b8 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 6b37207d90a10773e023886b303bdb51a65d4363..275e51e0021c6acbeaa023cedf981bb3fc41666f 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 b3192c7b3f2c0d05a7d32b0bf58e47622fe15c54..6f70571d56151698176923e468f4d69b528218aa 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 f1c9a42991bef591e3dd65271b98252ac61c43ad..e29b75e65788bbaccdc2ac0cbf245a62717111d6 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 8fdcb1dbfc09a66c6f8c11440357a8d1c470b7aa..88f650f448a5776827b38c0608839aaa0e09ccfe 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 ab09ed60bc4ad20099c797d4739876485f1d197b..6bdd46bee6d6ce3f94044ae4d28d8a469224eb62 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 fb0bf2bf72eb2f7f02809f5d859230c78384de34..48c742b2ac74a7fdfe1af83cb5ddd1edcd8c5c6f 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 dda54f8b1aadd50afd81863f416b19f05b1b22b3..d137231af5c0d925840ba6444af996d6dd7fc3ac 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 cff1a4228de61745d1745f5d9e9093cb7c8b6391..5e638cd087918e927594ab72a281992c7401a070 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 d32d5695978f1fbfea1bf521a1b625ab01933544..2abae66e8c3e99b1ce738c00e7389ccbb68c21e2 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 f2362afc48f387ae17a3bdab6902b19e4eac8950..e4d29c73d5f50af4330f5b5104f895496fb5606e 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 078e2e74c4c4408bb56ad3fd970d1cf0b0b42c22..f3deecc1b0f256ea7b67b4aee0b43c571be1b584 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 1e575ed3cd6d6d3c3c531eb3654d545788037e62..dc0d595f35535e2ca9966e70c3311b7227daa7ae 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 ffa8aba2fc7ac597098bd2b282cebc62af306408..af39de07c90200f5cbd5990e9c5b60830c8fd28a 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 4c33b5a722b47383485f0a8c2a42541437a17921..63e82f056b41d596de54cc9553b3681a886d85ab 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 cad82575319adea0aa4b879649fd83c2c371c8ee..14f9a28ea06fe6ac778ce03a58552e41f6284d77 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 1af9a9fd232731d2bcf6d504d6c208ce1717e643..5da9d2ca4f9809d960bb3a6adfd318c2008a56a3 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 e0182d6a39ce2c3dccf8f7c1a9b3d704b726ddec..d3b446b619ead2b14abda29b214b6fc396cf2dc2 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 a1d55f96f08b549c122b0f581ad925ebcd0577ca..721a5f6e997b57070e01161cd8e9aee6f985acd1 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 b52d3972dd0aaf6772cf7bacee1003d81e2d481a..07a4cf7b84c9774513926804d15c27b89e074f2f 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 2345bae121d9f70d291188b144572224f14e6a75..163fc1d552304adfad7eb66d3213c4cf9031181e 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 599993c40463cffac98a27b52a051f4042485d39..0fa5897516f5b08617796c9769e29beda07d843f 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 a761f6a55550d75b9c7cb648db3046fcc31738a5..11371a21e2bfedf8b0a13b6d8a9d05ea98833e53 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 ac6c69852fbbd44d678eb029d54ee45a1917ee62..10cef28d8ade4086c0040bbdf603543c7df227c2 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 8d02517f96da3aa53340b7230fc5b116cd1100d6..5d4fc9fc52c4e34aacc2213a1d1aa0fd7cfc93db 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 8d02517f96da3aa53340b7230fc5b116cd1100d6..5d4fc9fc52c4e34aacc2213a1d1aa0fd7cfc93db 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 30e2a75c06e98c1593f14457346928a403a08ae4..04cfd3c11544d453b2ce63a2344869d1b837b457 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 2ce27a563b5db9391d5526dd3c60f76a2922e42c..5750ab287508e80908528d0e94b50f818538f864 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 a3ecd9c248bdb765f7951a4e6c5b2a6afce1d4ab..ab7506725be5d80f496774e6a0ee075c39fefc17 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 a3ecd9c248bdb765f7951a4e6c5b2a6afce1d4ab..ab7506725be5d80f496774e6a0ee075c39fefc17 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 674bbede35edab0b41a0c2942177b8b2931d8386..0760afa79a53a3e2a5079687882b2388a56c3218 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 68e4f06b33c3bfbc20ba9ab2bb7f6429c99f7f5a..b9240cf9135e92be0a44be7380a8d703411cc0f7 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 00edadaf71fbacbe7a435eed1ea1e20f22273a42..82a69990386c25374882b7778a85f0c0371392e1 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 055883a5d5daab39d305fce9bd93a4001f711e98..1b00818571da5964e71320fa0dfcedc276602232 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 d89e57bde0e7bb4a35016c8dae8bd4c211a13203..10cdee7c106b5895ec9952ce9d1f08afae003205 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 3d7fa545e4452e4f5f813016d1d39df1381d67a4..add074c3114c8ce8ef9cc7e5c3697c92185f20aa 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 fbbf6ed84f10a4be0a6ed19061f4d867c549f51e..3db59e6916fd6d63d118de0d12d7062cf7fb2d0b 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 8613b5dc056c76c9ab9d704cdfafbaae0d469c42..7599346c528d11f0240b83b762edcab544988420 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 8b353071edac9e9bec00fbe5a3ab22d83b42b9bc..287e0ee928c1b444a6744edfbdd1255dc1eda724 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 c12688620a0cc37e75be1f5d253e6de02f40bd15..cd30b3cc34163f219ebc90fecc16129d773f78f5 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 0544c056a1485c9dff00f159999bde900bfd09c7..019603d1aa9beebda2a99b04ccd87809add3b413 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 aac1b57930071d1138a90142ba3c6a0bd61cb17a..7e4d6ac4b8ba68406f26195f39ba80ec0731616f 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 7ad35e3d5f78d951136016270cc951c4001c6d19..4c7b9da9ac4bea1aa67b9b02bb895a5dc2c640bb 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 da238fa9157cd9de91648e731df18eafd9933866..d61fd15d66a0106eac359b35a33cb777674ffe4e 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 02d1fd3ee6eeddfbdefca6f6d370e8b03c3d75c6..00111bef588226cdc6cca9eb92632dfaa508f09f 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 9606a52acf8788a11e5b16581ca94d5ffc3e14fc..2fa1e388658b488522d345de40cf0abb8cc49875 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 636f7e42ada69e4f52096e65c27e2ef55979cdff..0a3af7fc85febc2a71f3d3b168acc94ee64e1a05 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 a8131b99c875fa13905659b9435e2dc0fa6d7f5c..5c4664c2cf89fb0579539e3dc1890b2a0f16a9b8 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 48bcdb76f9d5980317972322b4bd7cb4337c121a..c31bb2996a59b1854c6635ae430f7eb3728cbe74 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 2e484cb699a36b5cbbbf025f83892bd889c091f5..026b384926526da5ed729bfc5f2655d4d5d78ada 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 36f0e30ff411c42bdc8b7de67bb328aa53c97f1d..0c5188fc41cff7a31fa625ec5d9e5b3ddaf34c80 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 3915b829425fa700836d153200e81652b7ee3828..e990aa8d8f61d7bd2efb0ffac8c68611d40ebbf7 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 13f7a1f187a4a70ebef18a49da7fe9a0218c7206..6eeb21d4494ab6bb60373d3be98f7072c2fe6409 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 64cadd8ad70dafc6ef9c12c294be6f3eb9fd136b..400cc5884ce1392d6e229131e51a9b2004ac894b 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 ca3226744f19baea1f829327883db0fd02031d39..5504b2a58b3901a7aed58cafc6024e4d8669d7e3 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 8d7eb5c89894754ed9a75c94858111ef17cba21a..df8753662a2890c56a27b4cabcd091f9f5c0cda5 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 17fb06cfd37d3450408304abba09a2386748e289..8f751fff1d96defd45dbc1d9755eb779aaef0cfd 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 35cf26dc958cff1813cf2c44f72c10c3380d6f73..8930b6088153aa0fc58a99b843d2cd135619f920 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 cd244682318dbd82b3d9a8960b61604d1a3b4888..f0cdc66642edeb11262ee3955aabaf71b3e2f1e4 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 88b67105cfa9bee42efb1026ea88c67b2d38df8e..952843f6e057223e99073da487f10ddb0d8d2000 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 cd244682318dbd82b3d9a8960b61604d1a3b4888..f0cdc66642edeb11262ee3955aabaf71b3e2f1e4 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 49ad691f56d18fa15b93e80b4f1b31bbd329ff75..4fbe7a67ba18cf66c40b59522cf2a1f74ded36f0 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 4ef8af45631df5fb44ae5f43f022aaa8561fd41b..64b94e0c53cf9bef335654099f1a3f3044c4b3b4 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 2de4c6de029d0ac3ad6e7837d97a00b64b6bee30..aeee13f72b187f8e37bc91681d4afe400de40b46 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 04dc7da34545fa23b82f2b8f7904b8fcb795118a..18d5e9b5b0022fabdbe5d67da79e17b7ba14c5c6 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 f6e17ee185de27bcb5a47e5922a6f2f550c6554d..6ee20f2b8a8d0471d47f20b726c2731a6450d672 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 79fe83d95816575b484fbab991eeacd0b1854b4e..68bdf9e719300b22908f47b096f29f09894d35a2 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 bdf81b2225f68a140482e6cf86a8c04b2f764d83..d2e94dcc32e7de3ae3cbb8fbc0d4b96d6de7355b 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 968cc44f53eb7c3469057fded8b57736c40fd328..5467001c3695a5cdb5d58fe4d71cee1716e77b2a 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 d62e7fd08d49b1e0d976e72d4aae497aa58a5175..5ea46a78cedbb1d122c0f4defbc0d0b68c8b65eb 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 4dc18c5c861953f0c349a29404fae5c7f8f4bdb8..2d73ed3f0233a13863694a501f5c00cf39d16e08 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 fbd31ec94ecae4a9f84fd9c57ca69f1f3c5bd9ee..88fc2b81655c990164109e1674f916d02deaf286 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 d42239c22dba4e3b9baf02ebf7dc0600eb28498e..c915cd7f270f994cbdb876dc7c70029482bfed2e 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 1b5661fa5d6d177a71fb191a4e39d5dca0247f90..b4bc101cc13d9bdb0d5a8686e60c43cbc3cf2d41 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 c077458f333830e8499139c63794c68cf8f949ed..93e32db0fd6525890bc8d5a0cc941164a66506aa 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 1c318040c1ffaa8cb4f1c8b848c339e5c27bb864..b6c8c95ba8b2ebb58d5e1cf1cbb1dfe6dacd5046 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 1e0b63e0a4b8fa5d34b7c6760b15a924ccb2952d..e3c2b1078b6af4342c7c5f6655d0f69c2a3d4231 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 7470c8d50ad7a93fec4891fcd912952ac4e4225d..0ff3ca5e337b88bed4fb386a8a7a12678a6684a9 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 d48d755df390023b22db1111f9b24426fcf9f144..26790b1dfcecceb4f82f0a9d393b7d8b0435b152 100644
--- a/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml
+++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml
@@ -6,8 +6,8 @@
       A test of qemu&apos;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 d43251f4c91d6dadc2e6e1a0c94e756b3ab0e17e..f64ad6b2be64c5a8748bd85433a75ac9367a1843 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 8c6b861ba35a9b719dd8a7b647b70297ac946a76..b81acbe4e4469113ae4414b21dc1d1486e08069a 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 d43251f4c91d6dadc2e6e1a0c94e756b3ab0e17e..f64ad6b2be64c5a8748bd85433a75ac9367a1843 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 676030406ab845612da8a06a002c4d06a6a9d39e..ad87294a802f16e740190236f7d3fa4b306ac403 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 6568bacd3694925dd749b235618a62aaa64bae1c..c755bcef8f521acb61d55d678976f0ba6a99dc66 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 4b2e70c4c963ef877f7b4475223186890d757d67..e1cfdc69c27ec3c0c90cd8e0b481d77565be3c58 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 f63d1769fa0ced2e173f4020b1464d37be1b9ae9..2c2b21a11365e089653f40fa03e93b1177654f8e 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 aff3f0fb0604c199604c50f42c4d333ca023d6f5..0a8f5502789b3699311a7a427def041a4314fa41 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 b39f0a23d23bb6232b9b3f2fb21013a3c491ec2b..26a8cc4cb323745abdb7fbc9acb721f770195b97 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 28758a32553c538c5f561be3133ce1268c11884e..bbcb20445ae6bed89578231f5d9da104c29482a2 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 65cd55df60fdd4943ed434205d59a34e044800f2..b6bf1d4b8bfeee61a93c4138dccb8f0d225b6228 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 51bc247de1022edd14319b988f2cef83e3c07161..62c838a5904ddf15fa595c239d3849d57755b655 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 a53d594c70ef5c9e5352749fa09c87168beedfd7..4c20d3fd8c1a2395fed337fef7b25d2acf3a8c44 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 32693c59a0a182358abb2d8d32fa86bb588e48d7..5d4a3e98a160150e71ec9af4b905315b7a8530f3 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 149e56c5d23453613815e692cca6b9f513eb14d6..5be315525e57481954f9d85195e96f84666df860 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 2e46562c66fc8a30d81a14cb1458f5a402db53e1..5d045df008628e1ed69cd9258bd4986dcbd82fae 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 1f2af9794bb12e4c8b2b02820e8ccd4f9169ff2a..862b1dfacc7d399474b487a25843351bfdb509aa 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 bcd54b37a03fbe7b36dc7ab6c8b2931c4a540ef5..bd066f655d31414fb652acd111ad63880ba66d7d 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 1901715de7e47e380a8fdb1cfc3f2fa0d169314a..09896e7c403aeabd3cc579baa147bf5012e31fd2 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 7470c8d50ad7a93fec4891fcd912952ac4e4225d..0ff3ca5e337b88bed4fb386a8a7a12678a6684a9 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 97ff16d8bd99a103ab111ca51657d13c7b6fe2e8..118c86ff6d88a4b0ff902a4a1e36c81817bcd6c6 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 a717f5c153745334b53584a7feae53239df5f4d6..e91307c3c3892091129ffb7f8f181266ebb014fc 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 e36f98ca3dd14939b476222a739671b96017d283..b82f627126f3f4cbc81b186010553a1f8ed0f875 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 33132ae59330916800bf78ac7117377856a688f9..8c7484ee21e707aa49dbee6ee6211b18e01acd4d 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 327131f386ef6cf4225c0c215d82229a626e7324..6352e1f3e56c1bddd58f9a0f8adad087336e67b9 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 1b164f9e7aeabb48c0926a04ee96c75a9c6caaab..b64ccf06ec4649366c84ab2f7bbfffa07df1d1d7 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 4504f060dc2a095f7f33c1c0178f06fee128ae45..68d3e893d2df013167e7d550c78df5e813a3bbc9 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 cf6547879c53da951faadcbe187bfa6e5a59139b..b9e50003ceb2dd465535739f2bad1240f17cfdcc 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 68f42164d3d202005a8e29a3364030d06c5b0f5b..1f4d14bd8929b2df8644aa5da9da1b30c69d54ff 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 dd128ca2447b9be12a369181120cec8be2134cbb..06e63ed5ed0342b952eef3b977198d2852c5b30d 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 19bcd2f45d1fc0a3ce2a0780cc515c6d9885a676..81b96d68b548537b6d66f5998bb2521b82fb0352 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 c0975ac811c0ce0f37d20d1f2078096288afc4c1..1a4e1215f11524fd87ccfef10377084df10191bd 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 7470c8d50ad7a93fec4891fcd912952ac4e4225d..0ff3ca5e337b88bed4fb386a8a7a12678a6684a9 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 7470c8d50ad7a93fec4891fcd912952ac4e4225d..0ff3ca5e337b88bed4fb386a8a7a12678a6684a9 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 31c3190e049a45ce87e7c2e5c19fc12a8278a1e9..f27dc2eca16e8cc197fc4172247a875e413437d3 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 be805fe6e6a80e8374c0875d4ca1f8d95f6eb23c..233501f5ac8bc1fb5cc40f072c47c1d4f5b69b5c 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 e0463673aaa91983787a4bb0d9eb2f4e8d70ba95..d9fa37c1e3015d8b2f86abb53868cc19484b16b1 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 6afc3c146e361a72b575f5edfe754ee7ccd6edac..ec8e8c77da4ebdd69f48b454aefe120f3d1c196d 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 969fdbd79f6bc04d09e18d571a2803a4e3e0ea2d..d1ea84184ee543c6e1bf5a0005e14c40b9af11e6 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 9e33a061c8a6570fa4ae482dc25ea150f342f09d..a792d9b149e5646c12a33a85a007fb4cf9f6153e 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 878a0aa4531dd5457f76d89d171db0a5608ccc64..105b71693d7858c3e0e16952ca5ef5913d773fb4 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 ac944f34749359dfcc6c3b50a8a9e74db7112b3b..5c7b0b2bf5f05d927b1c5464bbd756aaec264167 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 afbcd3428930bb65788e568a1637dc25f7baf511..659635868c7788546e9c902a29a37f29e2d9e2a0 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 b4d7c52037a5dfcbd8301b3f418560139fa72b78..581d3d396a275e270d8410301e955360c264088f 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 eaa80b1d9733915877a00b3da705a1b3ebe205c9..c41e513042c4b4640ba5365cab0693043d6cbfa5 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 c3160e6852a3247809761e27c34e9f003c5fee03..ea33b34b521d0223bb351fb2736236b578a09e7d 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 6da038dbdcab88963e77bb7f39f7e7d0c24a56e6..4b2089f1ba74513e838713870636baebef199134 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 af765ef610ebfcb2332829c45befae06710d5b51..90d21c383978354f53ea8ec5ff4d82fda31d1d4c 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 2e0b2ee1ea83986c694d9a023f8132492e97c3ca..af8841e07e8b110fa14eed1b580205418e5be344 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 76af25565f6ac7e2f0c49eeadf224b9b941bfe53..256fdee0580801d53e468c7d9ff3077f3a4eb14e 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 d86934892f2ada5773116073cf5e07f46a2317d6..33585bd9a8e07d66875073a46124969f1e736158 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 15014559be41da1d33470ccff0058e8578f3e920..2227a7068c939c250f60c4d7ca08c2e87777b2e2 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 19496d7ec685fb6e1f304527872dfa4abe1be57f..ee0096aa75a28f9cb7553e29126e7f26e9198232 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 1ac39ff461bcfa7c0e4ea78d96eb556186b3ddc3..992cda1a7c8749bdc032b958e9409a635e077f2e 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 e30d1dcf61bed977afbc74d1049abd72233e92de..67a6aecacf1573b790d31958dc0dc936d4f00df3 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 46b0d61ca1c0e04c52593a496d09b539826ad7bd..bab78e4541a8fb4c4cf15f8875e9234efacae3bf 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 c928048742b189d4161c4d6d99eeb6ff4c83b4d1..0490735f8da5ec083d20ddd6a63bfc4b65fc43a0 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 f6a943ca682b59fb1607885ebf5b75c49c7fa8e1..c19ef68cc56db5cb139ca8f89e5000c3e0a4ca1d 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 9dfc7c32726ea60980fa17d23f8869ed6151d1b5..2668d2decce124309e0459ed90cc8b6e857e1cdc 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 2a53dbb6289395166c0d55d97b26295006ec4eff..1914c6bcc538b0a693206cb8cbd78c2e4bf08e16 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 5a9844b487b29806746b5235af613da6572c69de..2f5806808ec2acfcf3662f5b9c2dcaedd09a0d48 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 95790f205005e6c867d1dcaa8ebcc9e7b81dc70f..b0415b341437c699c1765b7e4b3dedf7e738e6a0 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 19512eb29b5e76b7db0a0519d8d29eecb6a98ed7..33e2ee4067284efbe33fc06d695509d2bbaf304a 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 f133391dbbd80eaddcd25315236ccd05b4b9c311..92fb31d1024e0106b99ccc2ce20b97cb7de2653f 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 fbffb290763c15c3bcfb0160bed2fab31c57f456..c9bc6d50339f761c668e2922db20e3d28032ca61 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 b79ff28a44087448b941ff321723e2a133c651fc..e3dca51e0a2bcd6c2f47c49b9933b5cd88d4b3ac 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 0f5df4d6dc8cdeef6472c378ebcae5280fe65157..bd43eef52bbfcdd048f4c89e4331aa5aa9081271 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 921d8eeafd3b328fef764fe28d28593dfca52d3c..a7e73a164f084bb1ed9a51c731574000688ba329 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 eb8f5ba166bad8804e5b2d01011629df72279d7a..45d81b6957fa18ac53755f0055cfa2f2221ffbe8 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 5e0b256c89e63f173a7890165a14341f149cc4e9..14490e5058367089f66fafa801d18f4cfdaee57c 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 5a43638be7daca4b21195f5e40ac7202753f03c1..b7b47cdac6d0e87af17db367a1ab80b919acf7b5 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 49a57e229117ae3c3c37b950b50915343a286349..3237ef9e2f73b2c64c536264eab4460ad4cb331a 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 1996d209211046d7d612a8b8c8d11ac617d7ba63..d233544d96c8498f57e2565f12971fc36d9699a4 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 e31e5bc85ca20d6ac9072ced76a5293981da732a..0cedf8714b10b59f713e90c5dfa82290f3ac90e1 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 a359a3d4132e3bcf0772dbb84c033c976118fb58..b0e8b4545c53afe106c7784d5f601b708bcd3ad1 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 b12b841b21082d6ad8d3b4ac158e13a9a16c57a5..572cb2b516afdc15d618f9dc947a0d63f6c51935 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 1b183aa9612fff9b976d7be59850572889dcf919..f6548a6d21d21fe4324039f4faa47421f1a6f486 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 48e969f14af54e0783cfd1fa45ddc78cfb7395aa..9cc7b77232ac833826cca3133caa58937a5c615f 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 d7c1f848c6e0fc944f47b9ef4c70e700d5dae19f..44ece06d2b644e26d9972306f877d96356ce464c 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 cf427f27f5cbc0a1137aba692ad9936f6078dd3c..db4f1ea5e788b54dbce8e448110ec5840fd577ce 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 c0975ac811c0ce0f37d20d1f2078096288afc4c1..1a4e1215f11524fd87ccfef10377084df10191bd 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 c42d60ebedf7ed7231923331aa03d45457bfd2c8..cb345aa18a64b638ff23f9475148e7815b4ad97a 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 081cd8a7cbd08af1eb532a19b4977f3dbe6c0301..a4d314e70cfafbd8a665ab9dcde14c0322770a4b 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 a7cb73dfce093ab63eadcf783568e9e4d89a8b50..93255a9ea1fd3e9a9221a1b56a8e34de67d817a8 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 b394edf7f9fe41b98bbf1be3f5f389305bdf89e9..89c31ad38b042e02b85b308b208b44ee7f37b14b 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 c6811bb9bb6e4a978e47fcb2a71a6a086a4dd96d..7066ecc3cd16f12ba059d66923dba28c9599290b 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 76731e06962266706c739599a7800c77d1fa89e6..f036997013f02837a0ff46f1b9123c236e2b5a8a 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 16efb69b74d868a374f63847032ea289e4f09a5f..14df58a0d7537f7a1656865b7bcfe506cc6b9c24 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 026bcf84e643aa84507a77906fa340860338aeae..772ad173d801c3a2c77f0b60c9460574c31ee9d1 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 42a8557cdad41912bbc0f50ebe7fcc6ffe095713..52297b8fbd0dab7a5919e41fda2fafc6616e78e3 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 efa2c25bf817f9cd487d6db2c75045d3263161f7..559b1a8445fc549c68107671d71c43c8d242145d 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 0217d1caf046d70986fe7d27f846883e9ba291e9..56afe6f708570b0c09700e5c29fe78bd56047d89 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 626c07d7a0f3e3906fb3f31f289d49718dd01615..05d1a0695cbbc2ba4aa3f71de763df517665523b 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 93989b191713dcf3f9aa67158f7df332e467c644..e0eb0495f24cda2a8717ef3fc34696bd3468955c 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 987bd8d1376266f286e989f375aa797265e8c0fb..873a048ca32b5f0c55a74a358bc45a0d727f5b49 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 d9413cd0d479f46305f06fd99fa3488a61471df5..02acd80dd9ed96051f09af4d58cd603e6dd424d0 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 3afa5b75f1be9cce65efe218ab8595bcc891e9f8..5d697fc860fbeac9e63b9711e1a2301c1d0fa5b6 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 9221bdd7ff664bd6e1f5eeda37152fb6c4f00847..7033088e5aecb5e03ac89631d7c089f94cdaf408 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 bfac0f416039c3bf76891af6aeec1154c09308d3..6bd0a2feec19d1e594b61509a876d818383f832a 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 6be4d5d97eefb019413cb4807c0e2458d8492388..8c11c16b92b1f77ed924631508f8f4523c111bda 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 d7e305401330d41350f26b1c02d2b232be573782..9764fbc681bf3fbeee52c7bf28571cf893416033 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 d9d7552b3bc5f6573bef80b503b02a9db45eda27..2ab4950e0cd2bb0db9e359751c9ddce80545b538 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 04824ba685477c19dabe71f07b9f23e273561ee5..206542e73cc9db01e5dbe7c068fa329c391a14e4 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 3e935dbffd08f0e02fea31da5f53a8b781060c38..d8449d37d483f85f4efbaa98514215b011344900 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 c6951de9f87beb7ef5b01474578295d77791cbf4..f8f907df0e8ad3237e0c71d0d534d8882513b59e 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 8aa321492e19c94c249a0f45bd5e7048347cad31..fd7ad4a985e465e77a2c9da28710f2660249c10f 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 3f501e7acc30082d1e2feddddffe63f036c6763b..79972c4382f813cc3322842db1ba0351229170c2 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 2c1c75683d70e9b9d1777621efad5da54c6a7929..b336128d0de01f034f3217a4f9566691b73d95dd 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 d0ead27cc2a440d65cf87e6fe3db0bc080bf84a9..6ec16ae636e5edf723627bef273375e16dce34e1 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 9e6deae97dd710e56b98e0d0e36aaea1a0a4c885..4dffdd3dac63965ad548f6182f784a3be53497a8 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 bd38a2541cbdad9673352d5274f7aaed76e3c2fb..9ca9ce0c6844a064a884a125cbd851b70f06651b 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 f4836fb93e60a1404cf9ea3d0f42e20539538cda..6bf48f76d3c17728940dd31ac5b8ac5040ebbdf5 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 da3b3aef71cefc9c97f25c7413f42a5a2072bb34..06e97018bf63e8ecf5566f57fddd500214ff6d44 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 4dc218f7fff4d11a434a88625aacdb5892ae3b07..a1fb4a96c720083e5d35e3453722236eff67d295 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 57b8d27ba038379c4a3a4897063eeac12333f2bd..ede22bc4b444133b8d95bf53c535fe74e968340b 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 e39b638b11bedd8e26fc0a3cda256bef7376fd2a..0aaeeef4bc5d60f65420b97b3600bf0f94f4283d 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 5e085f96c982bfe1aaf41adb9d76e3a46338fa9e..0617439c613781d9b7e612d9f8a53a6bb7a2c6e1 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 5619376944712fe4d4140e19bd916505b4df6339..f5c8070fc9f88475b5c196bf5126704e36e1215d 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 db010ad26d23c041a3655fd80c17655705b6fb2d..69030199a254c8170af41b9b2fa95515caa1f48b 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 faeed773642981ba12241b5d77075c860003dcf4..48b1b14140f3986250f092cc36010d41008d2e2a 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 0967ac7a624002351474e4770412744010cd53e8..ceaddd27f287de0d2230b61d0031d80e1edcd953 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 3773d3b26d723904025236da159b08d040d99466..69eae958a06f4a08f94e4fe0af6ef4c551611eb0 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 d46df09440ba3d90af7dcf9f88517bc8da7ce2f2..164ebd4a4c9f2aacaf48ae13d735fa9443829d6a 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 34f25ac0c2fce900be91e02f492b70e6c70ef5e5..c1c849ae8488aa2b08d1b763c6f68b273d640828 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 6c692145ddfdfc1c3d854cc3db1f9974fa6e17fb..5f5fbb469a118fa8908ceb94f6f9d0a54b547e9d 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 bcc20ddcce09b1100d4feec9b3c4393c4b26371e..0edc79a3564d27ab5e5544526ba2f6e409cc7d47 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 93f20fa26fc0c3063fe469f1ea466af87fdaeec6..7a9ef896314d423c14014d9faf7a09a75dbd16af 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 16355842d135c9034ff6ede0f6b9c2689f213851..b6fa1059425803f7cfe8514297f3539fa8824f15 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 16355842d135c9034ff6ede0f6b9c2689f213851..b6fa1059425803f7cfe8514297f3539fa8824f15 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 48708634c4b822e12d74ab5cc6b07ecec376bd00..974d78483f333b7ff1d6728468a8852e1eac79e3 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 74f4bdf08a4a66b0ac896f6e731105e23ebb8e8e..75c16daac26a0c39cbac8f100e6d3c2c5147c30a 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 5dbc64dbe10bb2a8bdcf351d814790edb8bc1b04..d80b9a7d363441d588881009a670247d47ece1e6 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 e3c4e20c623b18f26642571d04505d28cac7ad1f..89c956987f1836dd6ea9be1ad889b6cc89419cb3 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 5dbc64dbe10bb2a8bdcf351d814790edb8bc1b04..d80b9a7d363441d588881009a670247d47ece1e6 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 a1249baa4d2b46154365b33d0543ba1fdd30e22f..6c5e0472065dc55911cfa5424acc5d8d6e1a939d 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 91fd6560682b06f69757d0265575f7eac7588814..482e6a958bdb16a5d6d7a38a8655f8e4370db0ce 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 a51955111a7e9ebe2ba1bfa568b20875ee426953..d79f313829ab31f0847e41ba77edce5b944930eb 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 5a8277551e2fa0991f2f3c78299d627940da916e..873aedfa2b50a5d4dd529bc7f0a6d095e24320f5 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 fe0ecb6baa7d87c5b6d9a3a1fea2d895c1c7e4a0..63dfb5b8672d61c6dfdaafadafcbd293edf349d9 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 b336d77e400a138ca071c64c389e8d80744d8945..f1ebfeb50f9190a84b7551a95efb04df59541b98 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 920c058275cab9c40e4f5edd28289b533f359f65..e3e6d7f0428a275268a85ac276b9fb519af6864c 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 6466192569d0f22864185084aae407a5da8b87f4..460f0d64536bf77786c8d38a03bd8947588a7d19 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 0d6bf11bcac8614de1a06e3eb7673150e11cce4c..cf85ea535c514a55ef61b26a562568e80015504c 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 f5e7843120ed2c3330dc1bba6835ba597ab10402..806d0c5c46a3812906974332ab5df894da558e63 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 70f44fccf3e3ebdf6c9791d0afddbb3bccb904d1..be6d789d1dcf697cabe1d61f4fd076435fb8a21a 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 70f44fccf3e3ebdf6c9791d0afddbb3bccb904d1..be6d789d1dcf697cabe1d61f4fd076435fb8a21a 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 766c78d71a2d56b5a977d49ac74cf6701f0fdcdb..06e5729f1fb1018600f5f6a7858b72e4cbbcfb5b 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 8aa321492e19c94c249a0f45bd5e7048347cad31..fd7ad4a985e465e77a2c9da28710f2660249c10f 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 361e3831038188bf03a727d64928369deac390f6..85b9d8d52d7913b01fad32db2bbd9b185baad689 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 d6c595ff200060ebd6c278f5ac0dd661a81a697b..e60cf3d83989bc7d38f2b0058b0180d9ed1240b9 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 ee2bb552f681f3272ccbfb01b2367771eca69ec8..5e9875e6c108b21a33e1ff50dab5ead8a61575db 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 557295d7f6d22475fd7dddfca79577bb548615b3..4fa8f6493a4cdc0d9d1114cb013ea1e94f567277 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 4c77086396d6b96b76cf4b20d9def49ec2b2ffcd..5724fdeeca6edca558f483d8a867e50e77dbb841 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 baab6c0232971f8ea671feb6dc613f873c819fe7..6ae1c393d64ba3f56a5704d648b92ad748d95a48 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 774bdd3c59f0a92cb002240bdbc56bfce2c0d865..31c05ac060ecb51402be6ca74748bdf878c54963 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 c30359b0e238643cf6074c656aa8fc6297ec9c1d..7413f1cfe46198d6073dd36536af94bfce963cb8 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 6ce41e171f688b30a83c0cbcccf36dc00586869e..07860ef966e8eaf2b5458a4fe0067eb61b045674 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 8f5d2c70fcea818714dfc0ce3e9b06c9fb2f6d63..6883e19990a51835e9a66aadcbf16303520a79ed 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 4bd18c5852191a5a69c0cbcc7a311e0d82f664e2..8a5f2721376565c601a29164ee6e2d5a08e64896 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 b24a9f27e36c72ee85b0e04570203ee40b7bb76d..321dc2bde8b6e1951c5f9755821b9ef1aebc6807 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 2d7b9d03e37f0344bae6b3fbac77476144a939ad..c0f152e84f19d744d2559b29b03497d73b8e2af8 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 c4cc91e36bf2c653b8a606757b86a9c49f04c351..a3d64738672e56be5a722620653e364bd962b9a2 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 45b8f3a9f4d126144cc1e0cc3fa0213711b77181..6b010e33bb7915ccccc759e53fd59d7293d12bf1 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 570956e1a0daa86168f4c2cfeacdba17c8e100da..7bf309eddd284261dced658b0b56aa4dfaffa4c2 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 c3d861e7f1afbba337844136cf3a077506097e30..271964f5bf2f642916fafe269a4b29188d3235d1 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 30fea1ecb45f96c9689cccab942dafeb06112465..4490931f18125acb86b55e814c5d27579cb737c2 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 f42f77b5c70560418c25ab4df1e9aef914b13cc9..07187e0762b8304fbf226c313b89576bc1e252c7 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 &quot;escaping&quot;: ||&quot;&quot;||&quot;| 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 d07d6081924efde78b9f70a44eb2e94a70c53e8e..a3397f6e1479b69508b5a551491aad952430f92b 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 87dd3b87063b6f352d1152d6275bfcc9c07d70c6..272f85a4b512ca048022c1ae78710a140d8a1282 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 6cbdfe9d967fb9af9cee4b93c6b552b821023e67..726e4cf8f81203959b63ea096019f198948115e1 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 3bdb70b99368586c67c712f9af798dee4226eeba..7fc6b3b2b66307c24fe733d56c7029688c2f28a4 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 00fbf4e416a269961e5483b214663f7a65e046ab..7e823e8c478063bd44121fa988df39c8d9f38604 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 e8f2e9fae3978309804781e9c4ad04fc649fcf33..d4179af7440449eb128a5269a13bcf7505598090 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 74f49a515455ca61df17d6f65a686e96552f5446..d54788f993e52dc23e1edfad24874fb59d97d300 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 2e079632d8383c00b67b7620845837e53478099a..de678c122335762f716b3907eb5bfb312e98e612 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 0bc8eed64b07e29668b83a7109f1ef54074361e6..41016343b7132814749305f4dc26589c39e40b2b 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 0844cb25c929fed9ab9bb4338a571ef21095c2f3..ab3467402b92ea6672720b35f38d50264f7eca3a 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 ee231208db7de31aa09b2d7860efdff6acc3b3ed..e1b7040a0ad8fd574f21d0fa62ac41bc29b060ae 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 227308b815e19eac5b4aa28982ebf2354388006c..5583cffef8eed2b04ecb066ec01c476a9b1d041c 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 cec329d1f1b69243b73f766339312631c8c34f90..0e94f25c22f12e305d81627dcc1b3f32ad69c6d8 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 8c7b83352f3dcce46c7c610d93d08b08a33e09c0..e36f3ded5c8f7304ad0a53d0fac58a2a09928435 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 9b356ea797569b042427682b206e364ad7fda5d4..7818c0ab3d785a7f3c9fe930ff50b4a02d9b9656 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 aead831afbc4df3143b1703c504e422737c42c2d..c0c825d6bf060293362e7f99f4a4004f6ead6f0e 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 8631049e8a2fb81bd53826fab44c8810eccd90c1..068f03846f54c6dbebfd616df2ac3860fa61ba82 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 a74611565e37a6fde069ed6ad1b7de3d2a32fc3b..e60f7153ed95ee0af6e1c5e4a4ff5c4957f566ec 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 cec329d1f1b69243b73f766339312631c8c34f90..0e94f25c22f12e305d81627dcc1b3f32ad69c6d8 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 b7773ad2a7d8208085870b2a290fb3e3166d54c1..013ca33a8f59542e121783b4da175ba659ccffe6 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 bdc8d8c128c168e8eea505aed3bb86a6e7f041f9..f19e3f761ff8ee1e8603a019184d1c09e9679c4d 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 8aef9c079b0d398866c62eaa347df68d39e38dc6..41cda933be1c9049c6b170c936a3b15746bf891f 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 c36e3f0dd2ac1c1abba589a27fc532e449a1dd05..f436a3b56f585f629078bd897c93d592094c9675 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 047e0349d45b3654fe3a830ba9391298bc40a119..ca1a9e2f61082020d545288f4dffa5edf9c0ae23 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 7bc07c5ccf7ab46aebde81c80b8795013437bba0..7a0c681a5d4818d379bee3d6dc5195c024c1596d 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 3297761a0e49707a3531caf367af63be21c45e3d..abd69bd47e70bc531c5bbb71c2d4634634b7fa10 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 78fa951fa206a7d43122c2e5ce60ae33b8dee0e9..8c57e3254ed4b4bdc7ad074e55983e685fa3643d 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 c25e6e677282b3ee20969a096a72286305172c54..a3d02fc30625b8ae392b7c30790a1327bfd3f058 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 e2e9bdc3f22c7b130d73f339e41f58a9feb7e4bf..3fe6ba0b27a9b1a5b08c9719a68fa9b1ed4b5acf 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 4e9038838f768e19e028baa1bc6f98f76b286cfe..ae82d7d126ca73a480da5729f91da19ceca7f957 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 188d31a5b946081977749b717e16ea5860722497..ef33bc663b1d3bb1ecdf0f3fd4b77ae9461dc701 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 ce2cfd6583771691c2b60e7aacc32540bcf104ac..f165ebcaf80999cb94e6cab482bdc83a742b7a33 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 bc288a684c10e61183965f2ad8a4f03b815a6c02..7808275fe07110e0ba1ad1c7bf6786d0a1bde450 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 ad7a65fc25264ab747726b1efaaba4baea12e5db..1a78ee968f9f270c680f458595de30c8ea62cf35 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 03a60d0de310b769ab2228ec76b278a5f5b39f55..3463e41c138e13eff20258d0642971fd5968a011 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 d2b1cb7eba73e353a8a7f94e4f2eecacc381a1ad..0edf35d3977d4ef457587302667861eda1663b6f 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 51fd06f21bc06341ada82dbf9e5eca97c23f511c..b7e12d0ded8a68312d567b80c73e6964c9f1db84 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 25ade07264db327cffb567374797c999af6a07ab..a5dc91cc4310ef133ac17932ad075a3f87f0c811 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 7573a11dc7fa710f8169f651168ad25d6b35f338..df0df7994b9b441618e3bb065bf41f9d677c1d5b 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 ed3849598ee43cdd7e810133eb0130e4e9dbcf87..b5b7665ed8d631da234b661c40e9e4649cbcb749 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 ca5196c9a1a5e106d27366d8084a9a89d3b033e7..c6ace03bfe3dc96327750774f4696a664bb71114 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 d78ac6cc0aa6676adaa903a08a2cd297ce9d3d40..a64fb5d38e393d7e3a8fbe8588f81c715c93d382 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 664eba4fa0748c0a304226c1520e21bc5b786550..07c504fd7309c520463fa2b259e38653ec907552 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 4c958aee1d79f249b3af373d7f0c3f64bf9ee4ac..2cca409dcf92237c0395aeef3b924184d686a746 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 0501a453f2817b167979c1fb466b4ad5db0d6b5e..391e45cb04cc9bde9e5a130eb7eba08f75c52ffc 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 920c058275cab9c40e4f5edd28289b533f359f65..e3e6d7f0428a275268a85ac276b9fb519af6864c 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 05a48603e7277ae3b2ec992f124e1e4fc571dcf6..854c2505b3a3f993bc940c828ac9e59cb08aa973 100644
--- a/tests/xmconfigdata/test-escape-paths.xml
+++ b/tests/xmconfigdata/test-escape-paths.xml
@@ -1,8 +1,8 @@
 <domain type='xen'>
   <name>XenGuest2&amp;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 20c6d94372af0e831a66c16c2da15a42db29afab..e9bd07fefb376bfe0025de8069d917e5abf7060c 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 4afe38a39554680406ef40666a6ee5fe78659646..41fe32d20af707d79a2abe9f03916cc2faf519e3 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 6826cdee4e3cadd2595396cb32f0a1d3b099ce45..810fd5322719b65c77f0fdc6ef8a4f09008d16f4 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 a8dfaf50a6508febe34567cfe7440d1ad3ee8f04..449329623f73766daa718234664ab5c6e1c5ca8e 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 2b920334fc42ee61b8557d574db88944a8a4e3e1..3eeb302ec470c8e60ba881bced3e34804be592b2 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 a8dfaf50a6508febe34567cfe7440d1ad3ee8f04..449329623f73766daa718234664ab5c6e1c5ca8e 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 5a7ebde8a2f1e5dbf1ab89529a11302623438600..8b479acf23a7adcee32a6b164b9f589077ffd0c1 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 2c36bd58a1076a1358f6dbb104a578065965b598..7b93607cc5f8ffdf2ed62ef00291413007b0a00b 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 5dcb3ce0695f5bd1b1305bb5d3e277a9772e5f84..3506f85303c175de9e2b2829b0ed5cbc7d5e7cd2 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 539aeae61aa8683642bd77f791b597e894cd959a..b4f93eac8b5eac5079721ec557fa77171a17797c 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 d9dfc7401e0bf14da70587f309195c7ef704942d..4b267b1e78aec0bcf4a146bdfd001fccea99236a 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 d7fd23d598852b835e52522ca1c2200226baaaa8..7ff0b3ce9755215d5ae85eabe4e9c87f778a008d 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 fdfb3446d6a33b4608a24b007bfef3900e21127d..e1a3be3b0f178816a5082814f690ba7261acb440 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 0afe4e92052b0ca60019eacfda4fba9a869b22d1..64355ec82a85dd031e70d965c17919416c4615e1 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 91f4c1eccb20bae25d5bdf179f04eee918a77a05..8fdb814f5ce44aadf7945e77b53baf85117bbdc3 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 64d8183102d0623f8a4799f555b2a301402874c2..eb2ab0c628d11324f73bdff19f23efa79178b075 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 9307710e5e25ea816fe59ccec6f8baf45d82a176..3d0168bfcc55229ac471b21cb22a8fa7c2e496ed 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 16abde38092074fed647c0ce7ded9f70c30beb21..26228446ebfdc524abe9dfdff3765c1e84476ae8 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 3ba9fc48cca8f983526326299f5ef7a05f4b3cdd..b4fb13cd0b47a7c9bce5c5d6f367022892fe9d57 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 6d82e38078c5305dde729ff992a3532a8938360d..35789189630c0b1946037eb76d227af07d6ac09b 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 709f084c7fc60ac6dc226da5fafec9061619ebc8..7a2d3a7f9d1e1af827e57e8104eb5ce379689d95 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 5eeb9c032675204231b1850452b1669d3478c524..475cce3cd76be1f6012d3017d9273bbfef0c344a 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 b4f309e94b0186c0f5fde87d22af84f503db95a3..c7ca0a37b6debe91a5c90a7b4986772f244d0a6b 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 a8dfaf50a6508febe34567cfe7440d1ad3ee8f04..449329623f73766daa718234664ab5c6e1c5ca8e 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 a7a27d35de48f4c5f91235fa17038684a867850f..baceee0cc99cc2b194988505f17428aa8118f9ff 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 9e6505e23ae7a6dbd9be03b14e55aac5fb93215d..8f6bef90f772fc4e1365d1eed7bbdb0be0f68cd6 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 22c908f25b97998f0d03b721c6dc9b05c7551960..631dc923731b26195eae16d678b7b04c62bc2645 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 2c1d50e97fcaa8c6a1a28180ca43eac1faca2294..04bb94ccf157ee5b294e5f5b885375cd2c0ec501 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 9cbaec04bbd2248727a3788767d656667aaff2d6..f9624ba449e335599148ec68109f10bb31ebc248 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 2c1d50e97fcaa8c6a1a28180ca43eac1faca2294..04bb94ccf157ee5b294e5f5b885375cd2c0ec501 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 9cbaec04bbd2248727a3788767d656667aaff2d6..f9624ba449e335599148ec68109f10bb31ebc248 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 5817f80396af125b8f21b9c855be530e4a3f714b..85e8891eed3af92985646c2a9f2ce82ceed6425f 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 31df1c79b8e10946e9ba5392c1150fa08c17efa1..0cb3ad49d593b6d19cd8c387af0235ef92c20d5c 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 b9b1c9f784447e970bd6c06f888ec3c5537627d8..c4b92dcd0031d62e7b59e7a5a3ce0971c2ade5b9 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 83daf82d33c0d6933d8b053b58b45f1cba39900d..d72f98691578a6977cd1b2c5669107debdffc400 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 0d5f5612eb6e1e15252ad0b2b0c07947f011b407..826effb2a0cd5d935bfd1f1b9c79f0b50a39aef6 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 1b513891781e00a3477712f9771b659374181719..b7bb21438f51f4951ca3ba6b16b313921c42a0db 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 285b38218342a4885b164aa0991b0fa42fcaee33..c38717614aee969b78f10750901bde39433975a1 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 97d88e0e2adea8c9f5bfba9e9f72ea00f578972b..a1c528f507932b4607552a05c50b0643bc98f791 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 008658cbf4c1176da7fd73a932dd51978edcae90..e6ad42b099c22cfd9a39e4c833c0aba308c70fcc 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 630b3f9ae52929f0669f82e9a192e77a5bbb8499..f5670d2d20cee9e2dba981da1cc905fee0d75887 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 324b6d0050196bc443cd636315728f11cf8009d5..a32cd278d36a31fb30070db59cca04f50accefcf 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 0cc37cc632dd9ba6b1245877724a74cd9d1150b4..f531250c9fb2d32a986a60b7e06dd1c968614289 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 67cce17c1dfd028b2bc00c75350508e6252f3766..e0384b2669d2940560c5c42674c6dd4dfdf3ac11 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 978ca7cc434b2e777fdd0c128aa181e7714cad2a..a7e662c8b1c22250c37115aba17c5ad0fce69eca 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 5274afef9d40d2cc122b1ccd44370e2c86dc93f6..828d450d249341ec820fb5d0fd8fbcbd14841a12 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 6eed578c0f82ff84f3eb527538bccb37e790f0d4..7cc847721186fbb35d405e23193ae54ba657fdb2 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&amp;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 1065f0eb635f969155f69dee41a340b8365a2d02..fbf360573e5927001f7c5eff5d10cd4d2fd0bf49 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 decfd67db2620e998a600e943ba9a9a30caf64f4..e7144cf9bc0bd578062fcbd30b2f80ec4799a03b 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 b0ced3cf64678a7115d0c35976f2f15ef52c468e..144e09f3358ad8b508af91cea1397546b044c028 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 b5d0020d719b81e1b26e77b09b98f8cab46afecc..2360ec77643339a36ae94ba770d7a42621346f10 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 4cdd1e620a74ea5b71acf0fa6bdc73e21079177c..42185d567c27542aafa55ff9dafc2d401e731f3b 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 f278f1fb69874d57d24e9fc64b560ff7e9a5e986..efabc363399f21780e60f782432051418ce79fc0 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 2a7988113dd16c56a5c3534b838c9346b65c0859..667ecbd4c2200c762a942c5389869fef35010e54 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 e5d181791a5240af041dbb0df917d9a7aa29d9be..643db65e373833d9979de68f8f070300dbcaae4e 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 a310e5da8bd1ac2e7abf617ebf95121fa6ab2657..3afaa4c29d9a620c6de2a39c73caeebca3659288 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 697762c1f4b2c3faaf7fdf37bc6c6ed0fef2c41b..411530d824cad999870a15c07fda6285a079b7f1 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 be7ef1dd3efc0aa2f8aaaad60052cddaac7f188c..b8285bcf4f28fb2bc88d0556cd8872fb1b633844 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 1e40189da300176cf67ee6ab9509c1d00298bd5c..4316cdef314c2c6c676534e3c842263149a50e61 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 8c6b0c98ec9d1eff7d7337c2d8f6f57ba8e374a9..9e162499d3f69533b959a67cb53db26aaf2fbd2a 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 faafd99337b97b682eeec8e30590516399fce990..068b188ce77c5317d203ddce5c0a070d9c644dfe 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 8b048cd505f83d02839421875698ec606a1848ad..f510e40e74284439d76785f6bb85823cee7a52db 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 1f34f1fae9fecef8556fd1eb4f706ef19742ee0e..72915b0a39988a351dfa21cbdb96cd9e264144ee 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 4b640e868e033e5a10c6ee8bd0c0053f8308b7d2..ec94ebf1855f5e3dbaf373491454403fd0b735b7 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 d86dca1b6551c98ae8806896905256479bb3e14b..6d87bea57cadbfd617e72b465bca89e7cc491a6f 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 b649e17d84daabbc96d3841a0866df311b3302aa..ec55ef330d9a80141fb365de756b1209949ff178 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 98a34fe661b49b0d876e6f8884833b1d9d7a1d1e..9af0df4f4ea819b2024e1ba08fece91d9bc9bc11 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 45a9b85550071eb7b87c98a913184dd0864714be..d619e8f9fbe80159d2709d11a6e24ba9695acc3d 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 11ad760d5457b969b14ecc7efaa4255e892e8568..a916e4147ad00455936f41a273e8af2fe8ba6c7a 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 f8dde852f563a1d4ff1b6f310172c4e13378317e..92e7cf1be02beb53277049282b15aed69f7ccc4c 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 690fd63dcdc833bde3e6027783fa022b86380e5f..4e77f5d80204549bb3977b0c9d5d2218142d0062 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 5f68a6d57b8c0d57aca8cd4945bbeff05f7233fb..d995d19c8d7db18f6a40de0ad1b7550a20457768 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 6e9ce94f96d9d43e1ccfce6c801f959b8b32e2e4..e49518d875103be40f27d05afa9391cd45d4515f 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 778c9112beb20b11298d8932f864e3a7a757888c..f34dbaa5a2f2e1187de636348b2c7bd1779951f5 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 d2b6d5e0c8cb94cb20c5bae0592bc2d2ab2da51f..65a6c019b4c8a79bc64a3d73b7035329e72d2e0b 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 2646002341bc67d168fcac311ded994aae50e21c..a2d9d7e8e810939956e739e6944d90cfed954a06 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 40bff6bae5d0ab6977a4ac63a1d595600ab57005..e4f468504bdf600309ad5ae0360cbb6bd3b6bde6 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 3cf4ca3325ecb27cda3bf83c6e900095b4c387ae..98bd8ecf549b3bbde3cd2dd8cdfdfef9711a805d 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 2ce1e44acf475ee5b86056f152d638a911df1ee8..d4ea7ee2c5334d0e02b9c0681ea4a99bba32606c 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 d061e11394f5f0c612165d83e4deab55e0ee1475..c416c5202c35ac1f244efd40510d4edceb376051 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 c17d9d5ff50411a74219264feda66406f5c7728b..0fb6ba067e0ad3f48df96e7e61840f75ef1f46ba 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 a8430eb1ef84536dcce3e3c83ab05187e5bcf4f3..f5f15a8b0794de1690f14c70f4a672545b398736 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 a8430eb1ef84536dcce3e3c83ab05187e5bcf4f3..f5f15a8b0794de1690f14c70f4a672545b398736 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 5274afef9d40d2cc122b1ccd44370e2c86dc93f6..828d450d249341ec820fb5d0fd8fbcbd14841a12 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 402537e739c1e07fefc1a8b4d2253e2b42143ca8..0caa0048b3b2ab70da811586f6d346407759a772 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 &quot;escaping&quot;: ||&quot;&quot;||&quot;| 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 17199a945c359b15be27500d453d3a769566747f..a4ca28f4ca0aa61e6caa0d98f06a452410922158 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 a2404da1b22151a3cb4e0727bd36f0ad45d12110..0ea16501ae6be3aa59c1c4338a2ff7425f06b544 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 931e99d275d33146e4422f33822e943085eeda8a..324253d9deb0006e2c9ebe4ec13e1493e1e4a379 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 2f2850920001f1099310749a2ffed6f44c0bd09a..82d2d7ae926b0f212a78ebbb7254cd2697dde6a4 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 ea597785c3c76f7c2eb4a92139b8f7b51373f11f..0c7dfccb0de53ee1039533de3274481bee62b9f9 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 774b4414419dae970fe2f4cec4b1ddc28970e498..affb5cf04622a12f1e0d6be954ff97a770530e72 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 c8719817ea726f71c3ed2a722f23c5c46b23bb28..4d24e0da92f3a7baaa66069312f550f3df636a17 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 443aacd4ab021a43d6bcfcd76a00a6ef18552845..277bac479c5181ebbb60246a67c292f04801bb55 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 f28c15e97976ebad8040f16a20a92b01f5ea043b..4d1e5b8e548c33e0e4f1def910502792f494842b 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 0c4e4d56cb7f5b34a3a95f8fa8d4692e9464135e..fa416a9dea5e1d439ccae30f0010540834970725 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 12a87885b63119fe0798480dc2e08de4636b538c..f34c4f1f0c9d7cd71c226e117152d2afc7541945 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 cd1d88f41b743a74fc9a394f20f32ffe022d8044..1aefedc26035f159b4cb2cb383715deb8639f174 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 7e9536393b90fb3acaf6c8aef49fb5570dd607e5..0ed3d79ce1449f1a78bc2b3ec7ba297db1bb1bf2 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 aac8a74fb07825fda1c5da3c1e677152612a58eb..bf17bb5feef3f455f7d87c67faaba0421d8686a3 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 cf1ce7c9c8b28f0edc9c5af7dfd2b9d8492ae5bd..34ad2740577450cb944a8286cc3d9679bac9e1d5 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 b803de4228be0a50484172b42f1ad8f92026a532..c19742aaa4e41540e160e2cfc0edc4317871eab5 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 7d6d0e581284ca14ecdaae3c1a1032735621a130..b531364844dc024b8ce3076263040ba83986c300 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 1490238ec2ca530bd8c24ec470912a09cef76dff..1b4fd646cdde3ef44075e927a6f3384611772361 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 91bac264548adebfb2f67ee83f848c36a71ff45a..4a30a6d2055f4ed69e843c8675366d3c5d2f5284 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 deff02e0682cc0e96c661b78d6b878c51862d898..83598b3fd20bd041467345db19605b6ec98d56f5 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 400dcdd8c5b28bb746841b0c0119ca4598d6aea9..70e55d51e35851efc5f2c000c05edf1e9021ead2 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 44e1c13d51e4b088dde063a1db4aef1a4ea6977c..56b98f7cb9a087d5e4994a3244c0c40da34675b6 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 7c2a57d1501a6b185c0f22ac45b335b5642f3dd4..a7732b74dba72a5715863fe4d37cf406791d517a 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 49f023868172dd18c4458e493a7484d62c51c504..e4fc5b61a6b922fea706e70e072de97e96d060ba 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 059c5241d6c6a2c7799c036eeaa0668ae86d923b..7442025b61362ab17a0e836e41d0c22279f3c710 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 f83ad0183f881e32d1272cde4a877d0ddd0717cf..e57e249dc17b37c922b13baf12728dcbf44901dd 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 63eeff7866ee669fd51930063feb7b538eb5f04a..70a9b574951ad00bf155638b2e85d59ab2c6ba29 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 42ef4ca5a8406b07606a0ad6e9622bf5f9d8beb4..fdd248ebcb24ba068792c54f3988d0ed11431d3b 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 8e4e988a3584a65c16b9caa4b1585729f566a78e..499de84f5c01ed7788c315e6857e6abe285e4bea 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 2ddfb35dfa3584ca46eb69a8f1d84bc4996b8bc8..cb40e3a9ffd2b3195d35aa336c1543b86c64b76c 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 69f5effa6cc0682a49b145dddacc5d68220296bb..8f686ddde52e8260724a2c5de1c0af0a3e052f10 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 ac630ee5ba7c7f0f716c627261ddce1925db4b7c..360d7d23cc40a319c01c8e28412d9be2c1cd109c 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 cbf5924fe6690d97eee13fd9b01e538a8da31bc5..d0b17029faa16e4764d3fbadef32b377b20aad25 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 050eff7f4c059b6f15f0971ceae3b0735c30098a..f3b3c78fd2a5520c1a24d88bdc5f5bae31d1951f 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 58a5a5ec08c6b4dc95b5ee61d12a1acb2f32c625..647a3ca550a4cbdd03c83c3d6ff0a9d3253d97eb 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 e2a5afe45e3b22ca7f2e2c4efdb582fbdefa4694..2775da4a0de3344036f32cba83d9bf1c85e53e7e 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 a17e2fef243e1e673842a1cec5fb9f96bfcea095..49a3211532fb2d990f50ba1a643528325806273b 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 9a6db530fcfe75621556d0263e22b21112f2bcf9..df4d1283cacb396c78783c1979a8a0433fb44f99 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 b19e9c749f1312267b3a8801f5d23892ebbfd374..153ca62d74dc91ff795a388b737d20c7040b7819 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 b7db4c88707c6eab7e057ba6e71bbeb319d9e8f5..11488487f200070d18f6acb095b43547cc6caa25 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>