xml: output memory unit for clarity

Make it obvious to 'dumpxml' readers what unit we are using,
since our default of KiB for memory (1024) differs from qemu's
default of MiB; and differs from our use of bytes for storage.

Tests were updated via:

$ find tests/*data tests/*out -name '*.xml' | \
  xargs sed -i 's/<\(memory\|currentMemory\|hard_limit\|soft_limit\|min_guarantee\|swap_hard_limit\)>/<\1 unit='"'KiB'>/"
$ find tests/*data tests/*out -name '*.xml' | \
  xargs sed -i 's/<\(capacity\|allocation\|available\)>/<\1 unit='"'bytes'>/"

followed by a few fixes for the stragglers.

Note that with this patch, the RNG for <memory> still forbids
validation of anything except unit='KiB', since the code silently
ignores the attribute; a later patch will expand <memory> to allow
scaled input in the code and update the RNG to match.

* docs/schemas/basictypes.rng (unit): Add 'bytes'.
(scaledInteger): New define.
* docs/schemas/storagevol.rng (sizing): Use it.
* docs/schemas/storagepool.rng (sizing): Likewise.
* docs/schemas/domaincommon.rng (memoryKBElement): New define; use
for memory elements.
* src/conf/storage_conf.c (virStoragePoolDefFormat)
(virStorageVolDefFormat): Likewise.
* src/conf/domain_conf.h (_virDomainDef): Document unit used
internally.
* src/conf/storage_conf.h (_virStoragePoolDef, _virStorageVolDef):
Likewise.
* tests/*data/*.xml: Update all tests.
* tests/*out/*.xml: Likewise.
* tests/define-dev-segfault: Likewise.
* tests/openvzutilstest.c (testReadNetworkConf): Likewise.
* tests/qemuargv2xmltest.c (blankProblemElements): Likewise.

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>

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 -->

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>

docs/schemas/storagevol.rng

@@ -32,22 +32,12 @@
   <define name='sizing'>
     <optional>
       <element name='capacity'>
-        <optional>
+        <ref name='scaledInteger'/>
-          <attribute name='unit'>
-            <ref name='unit'/>
-          </attribute>
-        </optional>
-        <ref name='unsignedLong'/>
       </element>
     </optional>
     <optional>
       <element name='allocation'>
-        <optional>
+        <ref name='scaledInteger'/>
-          <attribute name='unit'>
-            <ref name='unit'/>
-          </attribute>
-        </optional>
-        <ref name='unsignedLong'/>
       </element>
     </optional>
   </define>

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, "  <memory unit='KiB'>%lu</memory>\n",
-    virBufferAsprintf(buf, "  <currentMemory>%lu</currentMemory>\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",
+        virBufferAsprintf(buf, "    <hard_limit unit='KiB'>"
-                          def->mem.hard_limit);
+                          "%lu</hard_limit>\n", def->mem.hard_limit);
     }
     if (def->mem.soft_limit) {
-        virBufferAsprintf(buf, "    <soft_limit>%lu</soft_limit>\n",
+        virBufferAsprintf(buf, "    <soft_limit unit='KiB'>"
-                          def->mem.soft_limit);
+                          "%lu</soft_limit>\n", def->mem.soft_limit);
     }
     if (def->mem.min_guarantee) {
-        virBufferAsprintf(buf, "    <min_guarantee>%lu</min_guarantee>\n",
+        virBufferAsprintf(buf, "    <min_guarantee unit='KiB'>"
-                          def->mem.min_guarantee);
+                          "%lu</min_guarantee>\n", def->mem.min_guarantee);
     }
     if (def->mem.swap_hard_limit) {
-        virBufferAsprintf(buf, "    <swap_hard_limit>%lu</swap_hard_limit>\n",
+        virBufferAsprintf(buf, "    <swap_hard_limit unit='KiB'>"
-                          def->mem.swap_hard_limit);
+                          "%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)

src/conf/domain_conf.h

@@ -1496,13 +1496,13 @@ struct _virDomainDef {
     } blkio;
 
     struct {
-        unsigned long max_balloon;
+        unsigned long max_balloon; /* in kibibytes */
-        unsigned long cur_balloon;
+        unsigned long cur_balloon; /* in kibibytes */
         unsigned long hugepage_backed;
-        unsigned long hard_limit;
+        unsigned long hard_limit; /* in kibibytes */
-        unsigned long soft_limit;
+        unsigned long soft_limit; /* in kibibytes */
-        unsigned long min_guarantee;
+        unsigned long min_guarantee; /* in kibibytes */
-        unsigned long swap_hard_limit;
+        unsigned long swap_hard_limit; /* in kibibytes */
     } mem;
     unsigned short vcpus;
     unsigned short maxvcpus;

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,

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 allocation; /* bytes */
-    unsigned long long capacity;
+    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 allocation; /* bytes */
-    unsigned long long capacity;
+    unsigned long long capacity; /* bytes */
-    unsigned long long available;
+    unsigned long long available; /* bytes */
 
     virStoragePoolSource source;
     virStoragePoolTarget target;

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>
+  <memory unit='KiB'>262144</memory>
-  <currentMemory>262144</currentMemory>
+  <currentMemory unit='KiB'>262144</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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'/>

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>

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>
+  <memory unit='KiB'>65536</memory>
-  <currentMemory>65536</currentMemory>
+  <currentMemory unit='KiB'>65536</currentMemory>
   <title>A short description of this domain</title>
   <description>
       A longer explanation that this domain is a test domain

tests/domainschemadata/timers.xml

@@ -1,8 +1,8 @@
 <domain type='qemu'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory>219200</memory>
+  <memory unit='KiB'>219200</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory unit='KiB'>219200</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+    <memory unit='KiB'>219100</memory>
-    <currentMemory>219100</currentMemory>
+    <currentMemory unit='KiB'>219100</currentMemory>
     <vcpu cpuset='1-4,8-20,525'>1</vcpu>
     <os>
       <type arch='i686' machine='pc'>hvm</type>

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>
+    <memory unit='KiB'>219100</memory>
-    <currentMemory>219100</currentMemory>
+    <currentMemory unit='KiB'>219100</currentMemory>
     <vcpu cpuset='1-4,8-20,525'>1</vcpu>
     <os>
       <type arch='i686' machine='pc'>hvm</type>

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>
+    <memory unit='KiB'>219100</memory>
-    <currentMemory>219100</currentMemory>
+    <currentMemory unit='KiB'>219100</currentMemory>
     <vcpu cpuset='1-4,8-20,525'>1</vcpu>
     <os>
       <type arch='i686' machine='pc'>hvm</type>

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"
+        "  <memory unit='KiB'>0</memory>\n"
-        "  <currentMemory>0</currentMemory>\n"
+        "  <currentMemory unit='KiB'>0</currentMemory>\n"
         "  <vcpu>0</vcpu>\n"
         "  <os>\n"
         "    <type>exe</type>\n"

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("<memory.*>[[:digit:]]+</memory>", data) < 0 ||
-        virtTestClearLineRegex("<currentMemory>[[:digit:]]+</currentMemory>", data) < 0 ||
+        virtTestClearLineRegex("<currentMemory.*>[[:digit:]]+</currentMemory>",
+                               data) < 0 ||
         virtTestClearLineRegex("<readonly/>", data) < 0 ||
         virtTestClearLineRegex("<sharable/>", data) < 0)
         return -1;

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>1048576</memory>
-  <currentMemory>1048576</currentMemory>
+  <currentMemory unit='KiB'>1048576</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <blkiotune>
     <weight>800</weight>
     <device>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <blkiotune>
     <weight>800</weight>
   </blkiotune>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <bootloader>/usr/bin/pygrub</bootloader>
   <os>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu cpuset='1-4,8-20,525'>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>

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>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu cpuset='1-4,8-20,525'>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu cpuset='1-4,8-20,525'>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu cpuset='1-4,8-20,525'>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu cpuset='1-4,8-20,525'>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>16</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>16</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>2</vcpu>
   <cputune>
     <shares>2048</shares>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219100</memory>
-  <currentMemory>219100</currentMemory>
+  <currentMemory unit='KiB'>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

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>
+  <memory unit='KiB'>219136</memory>
-  <currentMemory>219136</currentMemory>
+  <currentMemory unit='KiB'>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>