Add VIR_DIV_UP to divide memory or storage request sizes with round up

Use it in all places where a memory or storage request size is converted
to a larger granularity. This avoids requesting too small memory or storage
sizes that could result from the truncation done by a simple division.

This extends the round up fix in 6002e0406c338668ea0ecbfeb6c1ef20a8b67efe
to the whole codebase.

Instead of reporting errors for odd values in the VMX code round them up.

Update the QEMU Argv tests accordingly as the original memory size 219200
isn't a even multiple of 1024 and is rounded up to 215 megabyte now. Change
it to 219100 and 219136. Use two different values intentionally to make
sure that rounding up works.

Update virsh.pod accordingly, as rounding down and rejecting are replaced
by rounding up.

src/esx/esx_driver.c

@@ -2060,7 +2060,7 @@ esxDomainSetMaxMemory(virDomainPtr domain, unsigned long memory)
     }
 
     spec->memoryMB->value =
-      memory / 1024; /* Scale from kilobytes to megabytes */
+      VIR_DIV_UP(memory, 1024); /* Scale from kilobytes to megabytes */
 
     if (esxVI_ReconfigVM_Task(priv->primary, virtualMachine->obj, spec,
                               &task) < 0 ||
@@ -2117,7 +2117,7 @@ esxDomainSetMemory(virDomainPtr domain, unsigned long memory)
     }
 
     spec->memoryAllocation->limit->value =
-      memory / 1024; /* Scale from kilobytes to megabytes */
+      VIR_DIV_UP(memory, 1024); /* Scale from kilobytes to megabytes */
 
     if (esxVI_ReconfigVM_Task(priv->primary, virtualMachine->obj, spec,
                               &task) < 0 ||
@@ -4448,7 +4448,7 @@ esxDomainSetMemoryParameters(virDomainPtr domain, virMemoryParameterPtr params,
             }
 
             spec->memoryAllocation->reservation->value =
-              params[i].value.ul / 1024; /* Scale from kilobytes to megabytes */
+              VIR_DIV_UP(params[i].value.ul, 1024); /* Scale from kilobytes to megabytes */
         } else {
             ESX_ERROR(VIR_ERR_INVALID_ARG, _("Unknown field '%s'"),
                       params[i].field);

src/esx/esx_storage_driver.c

@@ -1106,7 +1106,8 @@ esxStorageVolumeCreateXML(virStoragePoolPtr pool, const char *xmldesc,
          */
         virtualDiskSpec->adapterType = (char *)"busLogic";
 
-        virtualDiskSpec->capacityKb->value = def->capacity / 1024; /* Scale from byte to kilobyte */
+        virtualDiskSpec->capacityKb->value =
+          VIR_DIV_UP(def->capacity, 1024); /* Scale from byte to kilobyte */
 
         if (esxVI_CreateVirtualDisk_Task
               (priv->primary, datastorePath, priv->primary->datacenter->_reference,

src/internal.h

@@ -231,4 +231,7 @@
         }                                                               \
     } while (0)
 
+/* divide value by size, rounding up */
+# define VIR_DIV_UP(value, size) (((value) + (size) - 1) / (size))
+
 #endif                          /* __VIR_INTERNAL_H__ */

src/opennebula/one_conf.c

@@ -175,7 +175,7 @@ char* xmlOneTemplate(virDomainDefPtr def)
                       "by libvirt\nNAME = %s\nCPU = %d\nMEMORY = %ld\n",
                       def->name,
                       def->maxvcpus,
-                      (def->mem.max_balloon)/1024);
+                      VIR_DIV_UP(def->mem.max_balloon, 1024));
 
     /*Optional Booting OpenNebula Information:*/
     if (def->os.kernel) {

src/qemu/qemu_command.c

@@ -2667,7 +2667,7 @@ qemuBuildCommandLine(virConnectPtr conn,
      * is not supported, then they're out of luck anyway
      */
     virCommandAddArg(cmd, "-m");
-    virCommandAddArgFormat(cmd, "%lu", def->mem.max_balloon / 1024);
+    virCommandAddArgFormat(cmd, "%lu", VIR_DIV_UP(def->mem.max_balloon, 1024));
     if (def->mem.hugepage_backed) {
         if (!driver->hugetlbfs_mount) {
             qemuReportError(VIR_ERR_INTERNAL_ERROR,

src/qemu/qemu_monitor_text.c

@@ -852,7 +852,7 @@ int qemuMonitorTextSetBalloon(qemuMonitorPtr mon,
      * 'newmem' is in KB, QEMU monitor works in MB, and we all wish
      * we just worked in bytes with unsigned long long everywhere.
      */
-    if (virAsprintf(&cmd, "balloon %lu", (newmem / 1024)) < 0) {
+    if (virAsprintf(&cmd, "balloon %lu", VIR_DIV_UP(newmem, 1024)) < 0) {
         virReportOOMError();
         return -1;
     }

src/storage/storage_backend.c

@@ -725,7 +725,7 @@ virStorageBackendCreateQemuImg(virConnectPtr conn,
     }
 
     /* Size in KB */
-    if (virAsprintf(&size, "%lluK", vol->capacity / 1024) < 0) {
+    if (virAsprintf(&size, "%lluK", VIR_DIV_UP(vol->capacity, 1024)) < 0) {
         virReportOOMError();
         goto cleanup;
     }
@@ -870,7 +870,8 @@ virStorageBackendCreateQcowCreate(virConnectPtr conn ATTRIBUTE_UNUSED,
     }
 
     /* Size in MB - yes different units to qemu-img :-( */
-    if (virAsprintf(&size, "%llu", vol->capacity / 1024 / 1024) < 0) {
+    if (virAsprintf(&size, "%llu",
+                    VIR_DIV_UP(vol->capacity, (1024 * 1024))) < 0) {
         virReportOOMError();
         return -1;
     }

src/storage/storage_backend_logical.c

@@ -604,10 +604,7 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn,
         cmdargv = cmdargvsnap;
     }
 
-    unsigned long long int capacity;
+    snprintf(size, sizeof(size)-1, "%lluK", VIR_DIV_UP(vol->capacity, 1024));
-    capacity = (vol->capacity + 1023) /1024;
-
-    snprintf(size, sizeof(size)-1, "%lluK", capacity);
     size[sizeof(size)-1] = '\0';
 
     vol->type = VIR_STORAGE_VOL_BLOCK;

src/vbox/vbox_tmpl.c

@@ -1784,7 +1784,8 @@ static int vboxDomainSetMemory(virDomainPtr dom, unsigned long memory) {
             rc = data->vboxSession->vtbl->GetMachine(data->vboxSession, &machine);
             if (NS_SUCCEEDED(rc) && machine) {
 
-                rc = machine->vtbl->SetMemorySize(machine, memory / 1024);
+                rc = machine->vtbl->SetMemorySize(machine,
+                                                  VIR_DIV_UP(memory, 1024));
                 if (NS_SUCCEEDED(rc)) {
                     machine->vtbl->SaveSettings(machine);
                     ret = 0;
@@ -4398,7 +4399,8 @@ vboxAttachVideo(virDomainDefPtr def, IMachine *machine)
 {
     if ((def->nvideos == 1) &&
         (def->videos[0]->type == VIR_DOMAIN_VIDEO_TYPE_VBOX)) {
-        machine->vtbl->SetVRAMSize(machine, def->videos[0]->vram / 1024);
+        machine->vtbl->SetVRAMSize(machine,
+                                   VIR_DIV_UP(def->videos[0]->vram, 1024));
         machine->vtbl->SetMonitorCount(machine, def->videos[0]->heads);
         if (def->videos[0]->accel) {
             machine->vtbl->SetAccelerate3DEnabled(machine,
@@ -4771,7 +4773,8 @@ static virDomainPtr vboxDomainDefineXML(virConnectPtr conn, const char *xml) {
         goto cleanup;
     }
 
-    rc = machine->vtbl->SetMemorySize(machine, def->mem.cur_balloon / 1024);
+    rc = machine->vtbl->SetMemorySize(machine,
+                                      VIR_DIV_UP(def->mem.cur_balloon, 1024));
     if (NS_FAILED(rc)) {
         vboxError(VIR_ERR_INTERNAL_ERROR,
                   _("could not set the memory size of the domain to: %lu Kb, "
@@ -8072,7 +8075,7 @@ static virStorageVolPtr vboxStorageVolCreateXML(virStoragePoolPtr pool,
         rc = data->vboxObj->vtbl->CreateHardDisk(data->vboxObj, hddFormatUtf16, hddNameUtf16, &hardDisk);
         if (NS_SUCCEEDED(rc)) {
             IProgress *progress    = NULL;
-            PRUint64   logicalSize = def->capacity / 1024 / 1024;
+            PRUint64   logicalSize = VIR_DIV_UP(def->capacity, 1024 * 1024);
             PRUint32   variant     = HardDiskVariant_Standard;
 
             if (def->capacity == def->allocation)

src/vmx/vmx.c

@@ -2818,7 +2818,7 @@ virVMXParseSVGA(virConfPtr conf, virDomainVideoDefPtr *def)
         goto cleanup;
     }
 
-    (*def)->vram = svga_vramSize / 1024; /* Scale from bytes to kilobytes */
+    (*def)->vram = VIR_DIV_UP(svga_vramSize, 1024); /* Scale from bytes to kilobytes */
 
     result = 0;
 
@@ -2849,6 +2849,7 @@ virVMXFormatConfig(virVMXContext *ctx, virCapsPtr caps, virDomainDefPtr def,
     char *preliminaryDisplayName = NULL;
     char *displayName = NULL;
     char *annotation = NULL;
+    unsigned long max_balloon;
     bool scsi_present[4] = { false, false, false, false };
     int scsi_virtualDev[4] = { -1, -1, -1, -1 };
     bool floppy_present[2] = { false, false };
@@ -2940,46 +2941,24 @@ virVMXFormatConfig(virVMXContext *ctx, virCapsPtr caps, virDomainDefPtr def,
     }
 
     /* def:mem.max_balloon -> vmx:memsize */
-    if (def->mem.max_balloon <= 0 || def->mem.max_balloon % 4096 != 0) {
+    /* max-memory must be a multiple of 4096 kilobyte */
-        VMX_ERROR(VIR_ERR_INTERNAL_ERROR,
+    max_balloon = VIR_DIV_UP(def->mem.max_balloon, 4096) * 4096;
-                  _("Expecting domain XML entry 'memory' to be an unsigned "
-                    "integer (multiple of 4096) but found %lld"),
-                  (unsigned long long)def->mem.max_balloon);
-        goto cleanup;
-    }
 
-    /* Scale from kilobytes to megabytes */
+    virBufferVSprintf(&buffer, "memsize = \"%lu\"\n",
-    virBufferVSprintf(&buffer, "memsize = \"%d\"\n",
+                      max_balloon / 1024); /* Scale from kilobytes to megabytes */
-                      (int)(def->mem.max_balloon / 1024));
 
     /* def:mem.cur_balloon -> vmx:sched.mem.max */
-    if (def->mem.cur_balloon < def->mem.max_balloon) {
+    if (def->mem.cur_balloon < max_balloon) {
-        if (def->mem.cur_balloon <= 0 || def->mem.cur_balloon % 1024 != 0) {
+        virBufferVSprintf(&buffer, "sched.mem.max = \"%lu\"\n",
-            VMX_ERROR(VIR_ERR_INTERNAL_ERROR,
+                          VIR_DIV_UP(def->mem.cur_balloon,
-                      _("Expecting domain XML entry 'currentMemory' to be an "
+                                     1024)); /* Scale from kilobytes to megabytes */
-                        "unsigned integer (multiple of 1024) but found %llu"),
-                      (unsigned long long)def->mem.cur_balloon);
-            goto cleanup;
-        }
-
-        /* Scale from kilobytes to megabytes */
-        virBufferVSprintf(&buffer, "sched.mem.max = \"%d\"\n",
-                          (int)(def->mem.cur_balloon / 1024));
     }
 
     /* def:mem.min_guarantee -> vmx:sched.mem.minsize */
     if (def->mem.min_guarantee > 0) {
-        if (def->mem.min_guarantee % 1024 != 0) {
+        virBufferVSprintf(&buffer, "sched.mem.minsize = \"%lu\"\n",
-            VMX_ERROR(VIR_ERR_INTERNAL_ERROR,
+                          VIR_DIV_UP(def->mem.min_guarantee,
-                      _("Expecting domain XML entry 'memtune/min_guarantee' to "
+                                     1024)); /* Scale from kilobytes to megabytes */
-                        "be an unsigned integer (multiple of 1024) but found %llu"),
-                      (unsigned long long)def->mem.min_guarantee);
-            goto cleanup;
-        }
-
-        /* Scale from kilobytes to megabytes */
-        virBufferVSprintf(&buffer, "sched.mem.minsize = \"%d\"\n",
-                          (int)(def->mem.min_guarantee / 1024));
     }
 
     /* def:maxvcpus -> vmx:numvcpus */
@@ -3733,6 +3712,8 @@ virVMXFormatParallel(virVMXContext *ctx, virDomainChrDefPtr def,
 int
 virVMXFormatSVGA(virDomainVideoDefPtr def, virBufferPtr buffer)
 {
+    unsigned long long vram;
+
     if (def->type != VIR_DOMAIN_VIDEO_TYPE_VMVGA) {
         VMX_ERROR(VIR_ERR_CONFIG_UNSUPPORTED,
                   _("Unsupported video device type '%s'"),
@@ -3744,11 +3725,7 @@ virVMXFormatSVGA(virDomainVideoDefPtr def, virBufferPtr buffer)
      * For Windows guests the VRAM size should be a multiple of 64 kilobyte.
      * See http://kb.vmware.com/kb/1003 and http://kb.vmware.com/kb/1001558
      */
-    if (def->vram % 64 != 0) {
+    vram = VIR_DIV_UP(def->vram, 64) * 64;
-        VMX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s",
-                  _("Video device VRAM size must be a multiple of 64 kilobyte"));
-        return -1;
-    }
 
     if (def->heads > 1) {
         VMX_ERROR(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
@@ -3757,7 +3734,7 @@ virVMXFormatSVGA(virDomainVideoDefPtr def, virBufferPtr buffer)
     }
 
     virBufferVSprintf(buffer, "svga.vramSize = \"%lld\"\n",
-                      def->vram * 1024LL); /* Scale from kilobytes to bytes */
+                      vram * 1024); /* kilobyte to byte */
 
     return 0;
 }

src/xen/xend_internal.c

@@ -3111,7 +3111,7 @@ xenDaemonDomainSetMaxMemory(virDomainPtr domain, unsigned long memory)
     if (domain->id < 0 && priv->xendConfigVersion < 3)
         return(-1);
 
-    snprintf(buf, sizeof(buf), "%lu", memory >> 10);
+    snprintf(buf, sizeof(buf), "%lu", VIR_DIV_UP(memory, 1024));
     return xend_op(domain->conn, domain->name, "op", "maxmem_set", "memory",
                    buf, NULL);
 }
@@ -3148,7 +3148,7 @@ xenDaemonDomainSetMemory(virDomainPtr domain, unsigned long memory)
     if (domain->id < 0 && priv->xendConfigVersion < 3)
         return(-1);
 
-    snprintf(buf, sizeof(buf), "%lu", memory >> 10);
+    snprintf(buf, sizeof(buf), "%lu", VIR_DIV_UP(memory, 1024));
     return xend_op(domain->conn, domain->name, "op", "mem_target_set",
                    "target", buf, NULL);
 }
@@ -5778,7 +5778,8 @@ xenDaemonFormatSxpr(virConnectPtr conn,
     virBufferAddLit(&buf, "(vm ");
     virBufferEscapeSexpr(&buf, "(name '%s')", def->name);
     virBufferVSprintf(&buf, "(memory %lu)(maxmem %lu)",
-                      def->mem.cur_balloon/1024, def->mem.max_balloon/1024);
+                      VIR_DIV_UP(def->mem.cur_balloon, 1024),
+                      VIR_DIV_UP(def->mem.max_balloon, 1024));
     virBufferVSprintf(&buf, "(vcpus %u)", def->maxvcpus);
     /* Computing the vcpu_avail bitmask works because MAX_VIRT_CPUS is
        either 32, or 64 on a platform where long is big enough.  */

src/xen/xm_internal.c

@@ -2336,10 +2336,10 @@ virConfPtr xenXMDomainConfigFormat(virConnectPtr conn,
     if (xenXMConfigSetString(conf, "uuid", uuid) < 0)
         goto no_memory;
 
-    if (xenXMConfigSetInt(conf, "maxmem", def->mem.max_balloon / 1024) < 0)
+    if (xenXMConfigSetInt(conf, "maxmem", VIR_DIV_UP(def->mem.max_balloon, 1024)) < 0)
         goto no_memory;
 
-    if (xenXMConfigSetInt(conf, "memory", def->mem.cur_balloon / 1024) < 0)
+    if (xenXMConfigSetInt(conf, "memory", VIR_DIV_UP(def->mem.cur_balloon, 1024)) < 0)
         goto no_memory;
 
     if (xenXMConfigSetInt(conf, "vcpus", def->maxvcpus) < 0)

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

tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml

@@ -1,8 +1,8 @@
 <domain type='qemu'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>219100</currentMemory>
   <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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>219100</currentMemory>
   <vcpu>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' 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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>219100</currentMemory>
   <vcpu>6</vcpu>
   <os>
     <type arch='x86_64' machine='pc'>hvm</type>

tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml

@@ -1,8 +1,8 @@
 <domain type='qemu'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>219100</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>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>219136</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>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>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>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>219136</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='i686' machine='pc'>hvm</type>

tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml

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

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

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

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

tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml

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

tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml

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

tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml

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

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

tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml

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

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

tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml

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

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml

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

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

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

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

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml

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

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

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

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

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

tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml

@@ -1,8 +1,8 @@
 <domain type='qemu'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>219136</currentMemory>
   <memoryBacking>
     <hugepages/>
   </memoryBacking>

tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml

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

tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml

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

tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml

@@ -1,8 +1,8 @@
 <domain type='kvm'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>219136</currentMemory>
   <vcpu>1</vcpu>
   <bootloader>/foo</bootloader>
   <os>

tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.xml

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

tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml

@@ -1,8 +1,8 @@
 <domain type='kvm'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory>219200</memory>
+  <memory>219100</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>219100</currentMemory>
   <vcpu>1</vcpu>
   <os>
     <type arch='x86_64'>hvm</type>

tests/qemuxml2argvdata/qemuxml2argv-memtune.xml

@@ -1,8 +1,8 @@
 <domain type='qemu'>
   <name>QEMUGuest1</name>
   <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory>219200</memory>
+  <memory>219136</memory>
-  <currentMemory>219200</currentMemory>
+  <currentMemory>219136</currentMemory>
   <memtune>
     <hard_limit>512000</hard_limit>
     <soft_limit>128000</soft_limit>

tests/qemuxml2argvdata/qemuxml2argv-migrate.xml

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

tests/qemuxml2argvdata/qemuxml2argv-minimal.xml

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

tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml

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

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

tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml

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

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

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

tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml

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

tests/qemuxml2argvdata/qemuxml2argv-net-user.xml

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

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

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