From d9ad8ac392635afc4ff9aaa5a15ebf48e96ac34e Mon Sep 17 00:00:00 2001 From: Matthias Bolte Date: Fri, 28 Jan 2011 22:03:24 +0100 Subject: [PATCH] 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 | 6 +- src/esx/esx_storage_driver.c | 3 +- src/internal.h | 3 + src/opennebula/one_conf.c | 2 +- src/qemu/qemu_command.c | 2 +- src/qemu/qemu_monitor_text.c | 2 +- src/storage/storage_backend.c | 5 +- src/storage/storage_backend_logical.c | 5 +- src/vbox/vbox_tmpl.c | 11 ++-- src/vmx/vmx.c | 57 ++++++------------- src/xen/xend_internal.c | 7 ++- src/xen/xm_internal.c | 4 +- .../qemuxml2argv-balloon-device-auto.xml | 4 +- .../qemuxml2argv-balloon-device.xml | 4 +- .../qemuxml2argv-boot-cdrom.xml | 4 +- .../qemuxml2argv-boot-floppy.xml | 4 +- .../qemuxml2argv-boot-menu-disable.xml | 4 +- .../qemuxml2argv-boot-multi.xml | 4 +- .../qemuxml2argv-boot-network.xml | 4 +- .../qemuxml2argv-boot-order.xml | 4 +- .../qemuxml2argv-bootloader.xml | 4 +- .../qemuxml2argv-channel-guestfwd.xml | 4 +- .../qemuxml2argv-channel-virtio-auto.xml | 4 +- .../qemuxml2argv-channel-virtio.xml | 4 +- .../qemuxml2argv-clock-france.xml | 4 +- .../qemuxml2argv-clock-localtime.xml | 4 +- .../qemuxml2argv-clock-utc.xml | 4 +- .../qemuxml2argv-clock-variable.xml | 4 +- .../qemuxml2argv-console-compat-auto.xml | 4 +- .../qemuxml2argv-console-compat-chardev.xml | 4 +- .../qemuxml2argv-console-compat.xml | 4 +- .../qemuxml2argv-console-virtio.xml | 4 +- .../qemuxml2argv-cpu-exact1.xml | 4 +- .../qemuxml2argv-cpu-exact2.xml | 4 +- .../qemuxml2argv-cpu-minimum1.xml | 4 +- .../qemuxml2argv-cpu-minimum2.xml | 4 +- .../qemuxml2argv-cpu-strict1.xml | 4 +- .../qemuxml2argv-cpu-topology1.xml | 4 +- .../qemuxml2argv-cpu-topology2.xml | 4 +- .../qemuxml2argv-cpu-topology3.xml | 4 +- .../qemuxml2argv-disk-aio.xml | 4 +- .../qemuxml2argv-disk-cdrom-empty.xml | 4 +- .../qemuxml2argv-disk-cdrom.xml | 4 +- .../qemuxml2argv-disk-drive-boot-cdrom.xml | 4 +- .../qemuxml2argv-disk-drive-boot-disk.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v1-none.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v1-wb.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v1-wt.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v2-none.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v2-wb.xml | 4 +- .../qemuxml2argv-disk-drive-cache-v2-wt.xml | 4 +- ...2argv-disk-drive-error-policy-enospace.xml | 4 +- ...uxml2argv-disk-drive-error-policy-stop.xml | 4 +- .../qemuxml2argv-disk-drive-fat.xml | 4 +- .../qemuxml2argv-disk-drive-fmt-qcow.xml | 4 +- .../qemuxml2argv-disk-drive-network-nbd.xml | 4 +- .../qemuxml2argv-disk-drive-network-rbd.xml | 4 +- ...muxml2argv-disk-drive-network-sheepdog.xml | 4 +- .../qemuxml2argv-disk-drive-readonly-disk.xml | 4 +- ...xml2argv-disk-drive-readonly-no-device.xml | 4 +- .../qemuxml2argv-disk-drive-shared.xml | 4 +- .../qemuxml2argv-disk-floppy.xml | 4 +- .../qemuxml2argv-disk-many.xml | 4 +- .../qemuxml2argv-disk-scsi-device-auto.xml | 4 +- .../qemuxml2argv-disk-scsi-device.xml | 4 +- .../qemuxml2argv-disk-usb-device.xml | 4 +- .../qemuxml2argv-disk-usb.xml | 4 +- .../qemuxml2argv-disk-virtio.xml | 4 +- .../qemuxml2argv-disk-xenvbd.xml | 4 +- .../qemuxml2argv-floppy-drive-fat.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml | 4 +- .../qemuxml2argv-graphics-sdl-fullscreen.xml | 4 +- .../qemuxml2argv-graphics-sdl.xml | 4 +- .../qemuxml2argv-graphics-spice.xml | 4 +- .../qemuxml2argv-graphics-vnc-sasl.xml | 4 +- .../qemuxml2argv-graphics-vnc-socket.xml | 4 +- .../qemuxml2argv-graphics-vnc-tls.xml | 4 +- .../qemuxml2argv-graphics-vnc.xml | 4 +- ...emuxml2argv-hostdev-pci-address-device.xml | 4 +- .../qemuxml2argv-hostdev-pci-address.xml | 4 +- ...emuxml2argv-hostdev-usb-address-device.xml | 4 +- .../qemuxml2argv-hostdev-usb-address.xml | 4 +- .../qemuxml2argv-hugepages.xml | 4 +- .../qemuxml2argv-input-usbmouse.xml | 4 +- .../qemuxml2argv-input-usbtablet.xml | 4 +- .../qemuxml2argv-input-xen.xml | 4 +- .../qemuxml2argv-machine-aliases1.xml | 4 +- .../qemuxml2argv-machine-aliases2.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-memtune.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-migrate.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-minimal.xml | 4 +- .../qemuxml2argv-misc-acpi.xml | 4 +- .../qemuxml2argv-misc-no-reboot.xml | 4 +- .../qemuxml2argv-misc-uuid.xml | 4 +- .../qemuxml2argv-net-eth-ifname.xml | 4 +- .../qemuxml2argv-net-eth-names.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-net-eth.xml | 4 +- .../qemuxml2argv-net-user.xml | 4 +- .../qemuxml2argv-net-virtio-device.xml | 4 +- .../qemuxml2argv-net-virtio-netdev.xml | 4 +- .../qemuxml2argv-net-virtio.xml | 4 +- .../qemuxml2argv-nographics-vga.xml | 4 +- .../qemuxml2argv-nographics.xml | 4 +- .../qemuxml2argv-parallel-tcp-chardev.xml | 4 +- .../qemuxml2argv-parallel-tcp.xml | 4 +- .../qemuxml2argv-qemu-ns-no-env.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-qemu-ns.xml | 4 +- .../qemuxml2argv-restore-v1.xml | 4 +- .../qemuxml2argv-restore-v2-fd.xml | 4 +- .../qemuxml2argv-restore-v2.xml | 4 +- .../qemuxml2argv-serial-dev-chardev.xml | 4 +- .../qemuxml2argv-serial-dev.xml | 4 +- .../qemuxml2argv-serial-file-chardev.xml | 4 +- .../qemuxml2argv-serial-file.xml | 4 +- .../qemuxml2argv-serial-many-chardev.xml | 4 +- .../qemuxml2argv-serial-many.xml | 4 +- .../qemuxml2argv-serial-pty-chardev.xml | 4 +- .../qemuxml2argv-serial-pty.xml | 4 +- .../qemuxml2argv-serial-tcp-chardev.xml | 4 +- ...qemuxml2argv-serial-tcp-telnet-chardev.xml | 4 +- .../qemuxml2argv-serial-tcp-telnet.xml | 4 +- .../qemuxml2argv-serial-tcp.xml | 4 +- .../qemuxml2argv-serial-udp-chardev.xml | 4 +- .../qemuxml2argv-serial-udp.xml | 4 +- .../qemuxml2argv-serial-unix-chardev.xml | 4 +- .../qemuxml2argv-serial-unix.xml | 4 +- .../qemuxml2argv-serial-vc-chardev.xml | 4 +- .../qemuxml2argv-serial-vc.xml | 4 +- .../qemuxml2argvdata/qemuxml2argv-smbios.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-smp.xml | 4 +- .../qemuxml2argv-sound-device.xml | 4 +- tests/qemuxml2argvdata/qemuxml2argv-sound.xml | 4 +- .../qemuxml2argv-watchdog-device.xml | 4 +- .../qemuxml2argv-watchdog-dump.xml | 4 +- .../qemuxml2argv-watchdog.xml | 4 +- .../qemuxml2xmlout-balloon-device-auto.xml | 4 +- .../qemuxml2xmlout-channel-virtio-auto.xml | 4 +- .../qemuxml2xmlout-console-compat-auto.xml | 4 +- .../qemuxml2xmlout-console-virtio.xml | 4 +- .../qemuxml2xmlout-disk-scsi-device-auto.xml | 4 +- tools/virsh.pod | 16 +++--- 141 files changed, 309 insertions(+), 326 deletions(-) diff --git a/src/esx/esx_driver.c b/src/esx/esx_driver.c index 27994873fd..61c23719d3 100644 --- a/src/esx/esx_driver.c +++ b/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); diff --git a/src/esx/esx_storage_driver.c b/src/esx/esx_storage_driver.c index 12c8f5eab9..136a90b2e4 100644 --- a/src/esx/esx_storage_driver.c +++ b/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, diff --git a/src/internal.h b/src/internal.h index 038b862cc1..11ba45f899 100644 --- a/src/internal.h +++ b/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__ */ diff --git a/src/opennebula/one_conf.c b/src/opennebula/one_conf.c index 0b0a08af11..60afca529c 100644 --- a/src/opennebula/one_conf.c +++ b/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) { diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index c0ec00b782..a0f86a3c9a 100644 --- a/src/qemu/qemu_command.c +++ b/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, diff --git a/src/qemu/qemu_monitor_text.c b/src/qemu/qemu_monitor_text.c index 4cf87fefa9..6d0ba4c2fd 100644 --- a/src/qemu/qemu_monitor_text.c +++ b/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; } diff --git a/src/storage/storage_backend.c b/src/storage/storage_backend.c index bfe1172c00..2eede74d19 100644 --- a/src/storage/storage_backend.c +++ b/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; } diff --git a/src/storage/storage_backend_logical.c b/src/storage/storage_backend_logical.c index 389ecd7e5d..ead35cb1c8 100644 --- a/src/storage/storage_backend_logical.c +++ b/src/storage/storage_backend_logical.c @@ -604,10 +604,7 @@ virStorageBackendLogicalCreateVol(virConnectPtr conn, cmdargv = cmdargvsnap; } - unsigned long long int capacity; - capacity = (vol->capacity + 1023) /1024; - - snprintf(size, sizeof(size)-1, "%lluK", capacity); + snprintf(size, sizeof(size)-1, "%lluK", VIR_DIV_UP(vol->capacity, 1024)); size[sizeof(size)-1] = '\0'; vol->type = VIR_STORAGE_VOL_BLOCK; diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c index 77b43f863c..b5cde1f863 100644 --- a/src/vbox/vbox_tmpl.c +++ b/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) diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c index 44c014f705..2f574fc4d4 100644 --- a/src/vmx/vmx.c +++ b/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) { - VMX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("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; - } + /* max-memory must be a multiple of 4096 kilobyte */ + max_balloon = VIR_DIV_UP(def->mem.max_balloon, 4096) * 4096; - /* Scale from kilobytes to megabytes */ - virBufferVSprintf(&buffer, "memsize = \"%d\"\n", - (int)(def->mem.max_balloon / 1024)); + virBufferVSprintf(&buffer, "memsize = \"%lu\"\n", + max_balloon / 1024); /* Scale from kilobytes to megabytes */ /* def:mem.cur_balloon -> vmx:sched.mem.max */ - if (def->mem.cur_balloon < def->mem.max_balloon) { - if (def->mem.cur_balloon <= 0 || def->mem.cur_balloon % 1024 != 0) { - VMX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting domain XML entry 'currentMemory' to be an " - "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)); + if (def->mem.cur_balloon < max_balloon) { + virBufferVSprintf(&buffer, "sched.mem.max = \"%lu\"\n", + VIR_DIV_UP(def->mem.cur_balloon, + 1024)); /* Scale from kilobytes to megabytes */ } /* def:mem.min_guarantee -> vmx:sched.mem.minsize */ if (def->mem.min_guarantee > 0) { - if (def->mem.min_guarantee % 1024 != 0) { - VMX_ERROR(VIR_ERR_INTERNAL_ERROR, - _("Expecting domain XML entry 'memtune/min_guarantee' to " - "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)); + virBufferVSprintf(&buffer, "sched.mem.minsize = \"%lu\"\n", + VIR_DIV_UP(def->mem.min_guarantee, + 1024)); /* Scale from kilobytes to megabytes */ } /* 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) { - VMX_ERROR(VIR_ERR_INTERNAL_ERROR, "%s", - _("Video device VRAM size must be a multiple of 64 kilobyte")); - return -1; - } + vram = VIR_DIV_UP(def->vram, 64) * 64; 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; } diff --git a/src/xen/xend_internal.c b/src/xen/xend_internal.c index 44d5a22863..00fcbf2b26 100644 --- a/src/xen/xend_internal.c +++ b/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. */ diff --git a/src/xen/xm_internal.c b/src/xen/xm_internal.c index bfb6698010..865805c059 100644 --- a/src/xen/xm_internal.c +++ b/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) diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.xml b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.xml index 26c9b25943..9315621808 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.xml index 274eb8b008..8ac3c091c8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-balloon-device.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml index 410e6f9551..14ccd2342c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml index ad8bae226d..db3a94f651 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml index ceb109cfbd..bc1da8a24e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml index 48f27aa481..44ca0fadfc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-multi.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml index b1b77218d1..d3f3369a78 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-network.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml index eabbe877fe..ba8a9b2513 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-boot-order.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml index af19b3b7a0..6ce846d5d4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-bootloader.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 /usr/bin/pygrub diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml index b3c56b1dcd..b1d528143f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml index afd73f42e7..c127d84295 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml index 2dbb59697f..f612c0262f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml index 8794492300..017ef39e34 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-france.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml index 786d0c70e8..ed746c1f81 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml index ed91e37a12..479a1d92e6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-utc.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml index 41818d25eb..9f52ccaf25 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-clock-variable.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml index f0e875e3a7..bd199887dd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml index 611ddb8d7b..0bf52f47a8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml index 9591c8722b..901152259a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-compat.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml index fd72421460..259af4a631 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-console-virtio.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml index 53d3a8deec..d6db442ad9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 6 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml index cd2a506304..831291aa90 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 6 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml index 2a163d673c..1a2bef6dc6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 6 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml index b3baed7bef..795bacabe5 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 6 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml index 55f6b3c57a..3dee11f494 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 6 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml index ca336b8c7e..6b37207d90 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology1.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 6 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml index 33089657da..9f09e81729 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology2.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 6 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml index ca336b8c7e..6b37207d90 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 6 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml index d8937360ca..f6d7633ef7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-aio.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml index 1b18d613d1..bc40d16ac3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml index 061b196ba9..2fd2e6abaf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml index 0994a4986e..434cd7e60d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml index 9762f5aef4..452cb822a7 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml index 0b2f512ecd..3f60871192 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-none.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml index a43808618d..6a4e8e397b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wb.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml index 29012a854d..5f351f5a14 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v1-wt.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml index 0b2f512ecd..da07d5ea2d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml index a43808618d..8c30aecfd3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml index 29012a854d..a9e0c337c4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml index b3e6de9947..f9a56ab4ad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml index a4865026eb..6d99607a0a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml index a3491e770b..d473711b48 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fat.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml index f2643bb09e..cc88ef5ff9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml index 863165d8bb..c0255a8e36 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml index 118d890936..e920db1bc6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml index 5313d75a5b..83d6c4eb90 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml index 1f193c93cb..c0cf6a44ac 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml index 1f193c93cb..c0cf6a44ac 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml index 27e741ae84..8dcf4b7258 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml index c0a4a08384..6c2a18ddc8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml index 14f85cc72d..3b28a34645 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-many.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.xml index df50a27d7d..a7e55b0644 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml index a250940fa5..530c0a624d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.xml index 6d35eea5fc..7ad35e3d5f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml index 79ab65422b..0a9adef6f9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-usb.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml index a8aae71b39..eef9a1bbc1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml index a3dd4c637b..c940847684 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-disk-xenvbd.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml index ec74bdddd6..ceee0b8aad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml index 9072ead424..62b12bc03e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-fs9p.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml index 06b0539894..4e11a28ce3 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml index 16fd3badd4..cf5aaa9f72 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml index 15a22f3069..fc9f3fe140 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml index a07f87b139..eb6be7d925 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml index d6ad72b8a4..19c9213736 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml index a07f87b139..eb6be7d925 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml index a07f87b139..eb6be7d925 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.xml index 711e3f8ca9..4ef8af4563 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.xml @@ -1,8 +1,8 @@ QEMUGuest2 c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml index 0347eeea19..a88ada4ff8 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.xml @@ -1,8 +1,8 @@ QEMUGuest2 c7a5fdbd-edaf-9466-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.xml index da2562e825..04dc7da345 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml index 4391bf108e..c224291a1f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml index 8ed7490eca..78bf4e1e05 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-hugepages.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml index b76a895ee4..b9aff61de9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml index a878f8c9a6..18d5cb5031 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml b/tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml index 0ea00c1bef..8a5fcd742c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-input-xen.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 /foo diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.xml index 9f3fc85ea8..a969f8c2e4 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml index c57e64ce02..424179ee6a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-memtune.xml b/tests/qemuxml2argvdata/qemuxml2argv-memtune.xml index 9f713f0a07..37b5c88ee9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-memtune.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-memtune.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 512000 128000 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml b/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml index ed91e37a12..99e81ae000 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-migrate.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml b/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml index 8a13e47428..2f13d46a00 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-minimal.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml index c8e87b058d..d5f8d2ff48 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml index bb4f5f05a3..b06493fa1e 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml index c8e87b058d..d5f8d2ff48 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml index 516957fc02..a638e06faf 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.xml index 7875d0ccf8..74db024576 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml index 5d410b3753..d5c4b366e6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-eth.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml index ffc4a2ceb9..540808d05b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-user.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.xml index e521796f9d..572f3cc757 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.xml index e521796f9d..5f2b12c101 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml index 9b9c059ad0..ec930b3660 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-net-virtio.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml index ed91e37a12..99e81ae000 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-nographics.xml b/tests/qemuxml2argvdata/qemuxml2argv-nographics.xml index ed91e37a12..479a1d92e6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-nographics.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-nographics.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml index 1093901da1..328f81ec68 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml index 1093901da1..5c50eccd88 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml index 60087f1eb3..0d9dd98b14 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.xml b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.xml index c48c2488ce..c5020a0335 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml index ed91e37a12..479a1d92e6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v1.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.xml index ed91e37a12..99e81ae000 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml index ed91e37a12..99e81ae000 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-restore-v2.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml index 5d24986341..ea5a3f8cd1 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml index cc0ab433c9..41f473a13c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-dev.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml index 98bc4ef70f..9a3e19759b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml index 3e60e9846d..975d81eee0 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-file.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml index b121c5c72f..d6116e85ad 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml index 1d042f123a..e68ad79643 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-many.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml index 611ddb8d7b..57d1b7477c 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml index 9591c8722b..19dd13171f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-pty.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml index 286417e181..cd43384456 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml index 5aeceb0e8c..14bead469f 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml index 5bf6a08aac..ad5a0384de 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml index 304792e7ae..45ad585497 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml index 2c447389d5..12622d4f75 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml index e4fe4fd529..8697f5a075 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-udp.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml index 2c07e94a0a..4ed72aa0cd 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml index 61dff3f819..4685ad4b9d 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-unix.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml index 5b39736d5b..fe1fdad031 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml index 36bd622861..610033217b 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-serial-vc.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml b/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml index 23ec1a774a..9f0ea7b038 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-smbios.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 diff --git a/tests/qemuxml2argvdata/qemuxml2argv-smp.xml b/tests/qemuxml2argvdata/qemuxml2argv-smp.xml index 975f873921..cba15dc3c9 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-smp.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-smp.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 2 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml index fbca4fe890..0f5df4d6dc 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound-device.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml index d34e0b3411..57cabb4235 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-sound.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-sound.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.xml b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.xml index 2dfc37e22e..48e969f14a 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.xml b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.xml index 4314ec4429..d7c1f848c6 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml index 804dfd8935..06da70bb09 100644 --- a/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml +++ b/tests/qemuxml2argvdata/qemuxml2argv-watchdog.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml index ed91e37a12..479a1d92e6 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-balloon-device-auto.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml index ea79fbacc1..a52ea8e8ad 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-channel-virtio-auto.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml index 9591c8722b..901152259a 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-compat-auto.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml index 431dd34b6b..b64c7e5016 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-console-virtio.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219100 + 219100 1 hvm diff --git a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml index a250940fa5..530c0a624d 100644 --- a/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml +++ b/tests/qemuxml2xmloutdata/qemuxml2xmlout-disk-scsi-device-auto.xml @@ -1,8 +1,8 @@ QEMUGuest1 c7a5fdbd-edaf-9455-926a-d65c16db1809 - 219200 - 219200 + 219136 + 219136 1 hvm diff --git a/tools/virsh.pod b/tools/virsh.pod index c00cc8aba2..441ca8a4ac 100644 --- a/tools/virsh.pod +++ b/tools/virsh.pod @@ -576,9 +576,9 @@ XEN_CREDIT scheduler and are now I. Immediately change the current memory allocation for an active guest domain. Some hypervisors require a larger granularity than kilobytes, and requests -that are not an even multiple will either be rounded down or rejected. For -example, vSphere/ESX rejects the parameter unless the kB argument is evenly -divisible by 1024 (that is, the kB argument happens to represent megabytes). +that are not an even multiple will be rounded up. For example, vSphere/ESX +rounds the parameter up unless the kB argument is evenly divisible by 1024 +(that is, the kB argument happens to represent megabytes). For Xen, you can only adjust the memory of a running domain if the domain is paravirtualized or running the PV balloon driver. @@ -594,11 +594,11 @@ Change the maximum memory allocation limit for an inactive guest domain. This command works for at least the Xen and vSphere/ESX hypervisors, but not for QEMU/KVM. -Some hypervisors require a larger granularity than kilobytes, rounding down -or rejecting requests that are not an even multiple of the desired amount. -vSphere/ESX is one of these, requiring the parameter to be evenly divisible -by 4MB. For vSphere/ESX, 263168 (257MB) would be rejected because it's not -a multiple of 4MB, while 266240 (260MB) is valid. +Some hypervisors require a larger granularity than kilobytes, rounding up +requests that are not an even multiple of the desired amount. vSphere/ESX +is one of these, requiring the parameter to be evenly divisible by 4MB. For +vSphere/ESX, 263168 (257MB) would be rounded up because it's not a multiple +of 4MB, while 266240 (260MB) is valid without rounding. Note, to change the maximum memory allocation for a QEMU/KVM guest domain, use the virsh B command instead to update its XML element.