3:35 a.m.
Starting with qemu-3.1 we always have the '-overcommit' argument and use
it instead of '-realtime'. Remove the capability check and fix all
fake-caps tests.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 10 ++--------
tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args | 2 +-
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 2 +-
tests/qemuxml2argvdata/aarch64-cpu-passthrough.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-host.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-none-tcg.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-v2.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-v3.args | 2 +-
tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args | 2 +-
tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args | 2 +-
tests/qemuxml2argvdata/aarch64-noacpi-uefi.args | 2 +-
tests/qemuxml2argvdata/aarch64-pci-serial.args | 2 +-
tests/qemuxml2argvdata/aarch64-traditional-pci.args | 2 +-
.../aarch64-usb-controller-nec-xhci.args | 2 +-
.../aarch64-usb-controller-qemu-xhci.args | 2 +-
tests/qemuxml2argvdata/aarch64-video-default.args | 2 +-
.../qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args | 2 +-
.../aarch64-virt-2.6-virtio-pci-default.args | 2 +-
tests/qemuxml2argvdata/aarch64-virt-default-nic.args | 2 +-
tests/qemuxml2argvdata/aarch64-virt-virtio.args | 2 +-
tests/qemuxml2argvdata/aarch64-virtio-pci-default.args | 2 +-
.../aarch64-virtio-pci-manual-addresses.args | 2 +-
tests/qemuxml2argvdata/acpi-table.args | 2 +-
tests/qemuxml2argvdata/arm-vexpressa9-basic.args | 2 +-
tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args | 2 +-
tests/qemuxml2argvdata/arm-vexpressa9-virtio.args | 2 +-
tests/qemuxml2argvdata/arm-virt-virtio.args | 2 +-
tests/qemuxml2argvdata/audio-default-sdl.args | 2 +-
tests/qemuxml2argvdata/audio-default-spice.args | 2 +-
tests/qemuxml2argvdata/audio-default-vnc.args | 2 +-
tests/qemuxml2argvdata/autoindex.args | 2 +-
tests/qemuxml2argvdata/balloon-ccw-deflate.args | 2 +-
tests/qemuxml2argvdata/balloon-device-auto.args | 2 +-
tests/qemuxml2argvdata/balloon-device-deflate-off.args | 2 +-
tests/qemuxml2argvdata/balloon-device-deflate.args | 2 +-
tests/qemuxml2argvdata/balloon-device-period.args | 2 +-
tests/qemuxml2argvdata/balloon-device.args | 2 +-
tests/qemuxml2argvdata/balloon-mmio-deflate.args | 2 +-
tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +-
tests/qemuxml2argvdata/bios-nvram.args | 2 +-
tests/qemuxml2argvdata/bios.args | 2 +-
tests/qemuxml2argvdata/blkiotune-device.args | 2 +-
tests/qemuxml2argvdata/blkiotune.args | 2 +-
tests/qemuxml2argvdata/boot-cdrom.args | 2 +-
tests/qemuxml2argvdata/boot-complex.args | 2 +-
tests/qemuxml2argvdata/boot-floppy-q35.args | 2 +-
tests/qemuxml2argvdata/boot-floppy.args | 2 +-
tests/qemuxml2argvdata/boot-menu-disable-drive.args | 2 +-
tests/qemuxml2argvdata/boot-menu-disable.args | 2 +-
.../boot-menu-enable-with-timeout.args | 2 +-
tests/qemuxml2argvdata/boot-menu-enable.args | 2 +-
tests/qemuxml2argvdata/boot-multi.args | 2 +-
tests/qemuxml2argvdata/boot-network.args | 2 +-
tests/qemuxml2argvdata/boot-order.args | 2 +-
tests/qemuxml2argvdata/channel-guestfwd.args | 2 +-
tests/qemuxml2argvdata/channel-spicevmc.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-auto.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-autoadd.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-autoassign.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-default.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-state.args | 2 +-
tests/qemuxml2argvdata/channel-virtio-unix.args | 2 +-
tests/qemuxml2argvdata/channel-virtio.args | 2 +-
tests/qemuxml2argvdata/chardev-reconnect.args | 2 +-
tests/qemuxml2argvdata/clock-catchup.args | 2 +-
tests/qemuxml2argvdata/clock-france.args | 2 +-
tests/qemuxml2argvdata/clock-hpet-off.args | 2 +-
.../clock-localtime-basis-localtime.args | 2 +-
tests/qemuxml2argvdata/clock-localtime.args | 2 +-
tests/qemuxml2argvdata/clock-realtime.args | 2 +-
tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 2 +-
tests/qemuxml2argvdata/clock-utc.args | 2 +-
tests/qemuxml2argvdata/clock-variable.args | 2 +-
tests/qemuxml2argvdata/console-compat-auto.args | 2 +-
tests/qemuxml2argvdata/console-compat-chardev.args | 2 +-
tests/qemuxml2argvdata/console-compat.args | 2 +-
tests/qemuxml2argvdata/console-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/console-virtio-many.args | 2 +-
tests/qemuxml2argvdata/console-virtio.args | 2 +-
tests/qemuxml2argvdata/controller-order.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-disable.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-disable2.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-disable3.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-passthrough.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-passthrough2.args | 2 +-
tests/qemuxml2argvdata/cpu-check-default-none.args | 2 +-
tests/qemuxml2argvdata/cpu-check-default-none2.args | 2 +-
tests/qemuxml2argvdata/cpu-check-default-partial.args | 2 +-
tests/qemuxml2argvdata/cpu-check-default-partial2.args | 2 +-
tests/qemuxml2argvdata/cpu-check-none.args | 2 +-
tests/qemuxml2argvdata/cpu-eoi-disabled.args | 2 +-
tests/qemuxml2argvdata/cpu-eoi-enabled.args | 2 +-
tests/qemuxml2argvdata/cpu-exact1.args | 2 +-
tests/qemuxml2argvdata/cpu-exact2-nofallback.args | 2 +-
tests/qemuxml2argvdata/cpu-exact2.args | 2 +-
tests/qemuxml2argvdata/cpu-fallback.args | 2 +-
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model-cmt.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model-fallback.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model-vendor.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.args | 2 +-
.../cpu-host-passthrough-features.args | 2 +-
tests/qemuxml2argvdata/cpu-host-passthrough.args | 2 +-
tests/qemuxml2argvdata/cpu-hotplug-startup.args | 2 +-
tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum1.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum2.args | 2 +-
tests/qemuxml2argvdata/cpu-no-removed-features.args | 2 +-
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +-
tests/qemuxml2argvdata/cpu-numa-memshared.args | 2 +-
tests/qemuxml2argvdata/cpu-numa-no-memory-element.args | 2 +-
tests/qemuxml2argvdata/cpu-numa1.args | 2 +-
tests/qemuxml2argvdata/cpu-numa2.args | 2 +-
tests/qemuxml2argvdata/cpu-s390-features.args | 2 +-
tests/qemuxml2argvdata/cpu-s390-zEC12.args | 2 +-
tests/qemuxml2argvdata/cpu-strict1.args | 2 +-
tests/qemuxml2argvdata/cpu-topology1.args | 2 +-
tests/qemuxml2argvdata/cpu-topology2.args | 2 +-
tests/qemuxml2argvdata/cpu-topology3.args | 2 +-
tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +-
tests/qemuxml2argvdata/cputune-numatune.args | 2 +-
tests/qemuxml2argvdata/cputune-zero-shares.args | 2 +-
tests/qemuxml2argvdata/cputune.args | 2 +-
tests/qemuxml2argvdata/default-kvm-host-arch.args | 2 +-
tests/qemuxml2argvdata/default-qemu-host-arch.args | 2 +-
tests/qemuxml2argvdata/fd-memory-no-numa-topology.args | 2 +-
tests/qemuxml2argvdata/fd-memory-numa-topology.args | 2 +-
tests/qemuxml2argvdata/fd-memory-numa-topology2.args | 2 +-
tests/qemuxml2argvdata/fd-memory-numa-topology3.args | 2 +-
tests/qemuxml2argvdata/graphics-egl-headless.args | 2 +-
tests/qemuxml2argvdata/graphics-sdl-fullscreen.args | 2 +-
tests/qemuxml2argvdata/graphics-sdl.args | 2 +-
tests/qemuxml2argvdata/hostdev-mdev-precreated.args | 2 +-
tests/qemuxml2argvdata/hostdev-pci-address-device.args | 2 +-
.../hostdev-pci-address-unassigned.args | 2 +-
tests/qemuxml2argvdata/hostdev-pci-address.args | 2 +-
tests/qemuxml2argvdata/hostdev-pci-multifunction.args | 2 +-
.../qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args | 2 +-
.../qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args | 2 +-
.../qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args | 2 +-
.../qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args | 2 +-
.../hostdev-usb-address-device-boot.args | 2 +-
tests/qemuxml2argvdata/hostdev-usb-address-device.args | 2 +-
tests/qemuxml2argvdata/hostdev-usb-address.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio-multidomain.args | 2 +-
.../hostdev-vfio-zpci-autogenerate-fids.args | 2 +-
.../hostdev-vfio-zpci-autogenerate-uids.args | 2 +-
.../hostdev-vfio-zpci-autogenerate.args | 2 +-
.../qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args | 2 +-
.../hostdev-vfio-zpci-ccw-memballoon.args | 2 +-
.../hostdev-vfio-zpci-multidomain-many.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio.args | 2 +-
tests/qemuxml2argvdata/hotplug-base.args | 2 +-
tests/qemuxml2argvdata/hugepages-default-2M.args | 2 +-
.../hugepages-default-system-size.args | 2 +-
tests/qemuxml2argvdata/hugepages-default.args | 2 +-
tests/qemuxml2argvdata/hugepages-memaccess.args | 2 +-
tests/qemuxml2argvdata/hugepages-memaccess2.args | 2 +-
tests/qemuxml2argvdata/hugepages-nodeset.args | 2 +-
tests/qemuxml2argvdata/hugepages-numa-default-2M.args | 2 +-
.../qemuxml2argvdata/hugepages-numa-default-dimm.args | 2 +-
tests/qemuxml2argvdata/hugepages-numa-default.args | 2 +-
.../qemuxml2argvdata/hugepages-numa-nodeset-part.args | 2 +-
tests/qemuxml2argvdata/hugepages-numa-nodeset.args | 2 +-
tests/qemuxml2argvdata/hugepages-shared.args | 2 +-
tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args | 2 +-
tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args | 2 +-
tests/qemuxml2argvdata/input-usbmouse-addr.args | 2 +-
tests/qemuxml2argvdata/input-usbmouse.args | 2 +-
tests/qemuxml2argvdata/input-usbtablet.args | 2 +-
tests/qemuxml2argvdata/input-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/iothreads-disk.args | 2 +-
tests/qemuxml2argvdata/iothreads-ids-partial.args | 2 +-
tests/qemuxml2argvdata/iothreads-ids.args | 2 +-
tests/qemuxml2argvdata/iothreads.args | 2 +-
tests/qemuxml2argvdata/kvm-features-off.args | 2 +-
tests/qemuxml2argvdata/kvm-features.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +-
tests/qemuxml2argvdata/kvmclock.args | 2 +-
tests/qemuxml2argvdata/mach-virt-console-virtio.args | 2 +-
tests/qemuxml2argvdata/mach-virt-serial-native.args | 2 +-
tests/qemuxml2argvdata/mach-virt-serial-pci.args | 2 +-
tests/qemuxml2argvdata/mach-virt-serial-usb.args | 2 +-
tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args | 2 +-
.../qemuxml2argvdata/machine-aeskeywrap-off-caps.args | 2 +-
tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args | 2 +-
tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args | 2 +-
tests/qemuxml2argvdata/machine-aliases1.args | 2 +-
tests/qemuxml2argvdata/machine-aliases2.args | 2 +-
tests/qemuxml2argvdata/machine-core-off.args | 2 +-
tests/qemuxml2argvdata/machine-core-on.args | 2 +-
tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args | 2 +-
.../qemuxml2argvdata/machine-deakeywrap-off-caps.args | 2 +-
tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args | 2 +-
tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args | 2 +-
tests/qemuxml2argvdata/machine-keywrap-none-caps.args | 2 +-
tests/qemuxml2argvdata/machine-keywrap-none.args | 2 +-
.../machine-loadparm-multiple-disks-nets-s390.args | 2 +-
tests/qemuxml2argvdata/machine-loadparm-net-s390.args | 2 +-
tests/qemuxml2argvdata/machine-loadparm-s390.args | 2 +-
tests/qemuxml2argvdata/machine-smm-opt.args | 2 +-
tests/qemuxml2argvdata/machine-vmport-opt.args | 2 +-
tests/qemuxml2argvdata/master-key.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug-dimm.args | 2 +-
.../memory-hotplug-nvdimm-ppc64-abi-update.args | 2 +-
.../qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args | 2 +-
.../memory-hotplug-ppc64-nonuma-abi-update.args | 2 +-
.../qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug.args | 2 +-
tests/qemuxml2argvdata/memtune-unlimited.args | 2 +-
tests/qemuxml2argvdata/memtune.args | 2 +-
tests/qemuxml2argvdata/migrate-numa-unaligned.args | 2 +-
tests/qemuxml2argvdata/migrate.args | 2 +-
tests/qemuxml2argvdata/minimal.args | 2 +-
tests/qemuxml2argvdata/misc-acpi.args | 2 +-
tests/qemuxml2argvdata/misc-disable-s3.args | 2 +-
tests/qemuxml2argvdata/misc-disable-suspends.args | 2 +-
tests/qemuxml2argvdata/misc-enable-s4.args | 2 +-
tests/qemuxml2argvdata/misc-uuid.args | 2 +-
tests/qemuxml2argvdata/monitor-json.args | 2 +-
tests/qemuxml2argvdata/multifunction-pci-device.args | 2 +-
tests/qemuxml2argvdata/net-client.args | 2 +-
tests/qemuxml2argvdata/net-eth-hostip.args | 2 +-
tests/qemuxml2argvdata/net-eth-ifname.args | 2 +-
tests/qemuxml2argvdata/net-eth-names.args | 2 +-
tests/qemuxml2argvdata/net-eth-unmanaged-tap.args | 2 +-
tests/qemuxml2argvdata/net-eth.args | 2 +-
tests/qemuxml2argvdata/net-hostdev-bootorder.args | 2 +-
tests/qemuxml2argvdata/net-hostdev-multidomain.args | 2 +-
.../qemuxml2argvdata/net-hostdev-vfio-multidomain.args | 2 +-
tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +-
tests/qemuxml2argvdata/net-hostdev.args | 2 +-
tests/qemuxml2argvdata/net-many-models.args | 2 +-
tests/qemuxml2argvdata/net-mcast.args | 2 +-
tests/qemuxml2argvdata/net-server.args | 2 +-
tests/qemuxml2argvdata/net-udp.args | 2 +-
tests/qemuxml2argvdata/net-user-addr.args | 2 +-
tests/qemuxml2argvdata/net-user.args | 2 +-
tests/qemuxml2argvdata/net-vhostuser-multiq.args | 2 +-
tests/qemuxml2argvdata/net-vhostuser.args | 2 +-
tests/qemuxml2argvdata/net-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/net-virtio-device.args | 2 +-
.../qemuxml2argvdata/net-virtio-disable-offloads.args | 2 +-
tests/qemuxml2argvdata/net-virtio-netdev.args | 2 +-
tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args | 2 +-
tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args | 2 +-
tests/qemuxml2argvdata/net-virtio-teaming.args | 2 +-
tests/qemuxml2argvdata/net-virtio.args | 2 +-
tests/qemuxml2argvdata/nosharepages.args | 2 +-
.../numad-auto-memory-vcpu-cpuset.args | 2 +-
...numad-auto-memory-vcpu-no-cpuset-and-placement.args | 2 +-
.../numad-auto-vcpu-static-numatune.args | 2 +-
.../numad-static-memory-auto-vcpu.args | 2 +-
tests/qemuxml2argvdata/numad.args | 2 +-
.../numatune-auto-nodeset-invalid.args | 2 +-
tests/qemuxml2argvdata/numatune-auto-prefer.args | 2 +-
tests/qemuxml2argvdata/numatune-distances.args | 2 +-
tests/qemuxml2argvdata/numatune-memnode-no-memory.args | 2 +-
tests/qemuxml2argvdata/numatune-memnode.args | 2 +-
tests/qemuxml2argvdata/numatune-memory.args | 2 +-
tests/qemuxml2argvdata/numatune-no-vcpu.args | 2 +-
tests/qemuxml2argvdata/pages-dimm-discard.args | 2 +-
tests/qemuxml2argvdata/pages-discard-hugepages.args | 2 +-
tests/qemuxml2argvdata/pages-discard.args | 2 +-
tests/qemuxml2argvdata/parallel-parport-chardev.args | 2 +-
tests/qemuxml2argvdata/parallel-tcp-chardev.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +-
tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +-
tests/qemuxml2argvdata/pci-bridge-many-disks.args | 2 +-
tests/qemuxml2argvdata/pci-bridge.args | 2 +-
tests/qemuxml2argvdata/pci-expander-bus.args | 2 +-
tests/qemuxml2argvdata/pci-many.args | 2 +-
tests/qemuxml2argvdata/pci-rom-disabled.args | 2 +-
tests/qemuxml2argvdata/pci-rom.args | 2 +-
tests/qemuxml2argvdata/pci-serial-dev-chardev.args | 2 +-
tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +-
.../qemuxml2argvdata/pcie-root-port-model-generic.args | 2 +-
.../qemuxml2argvdata/pcie-root-port-model-ioh3420.args | 2 +-
tests/qemuxml2argvdata/pcie-root-port.args | 2 +-
tests/qemuxml2argvdata/pcie-root.args | 2 +-
.../qemuxml2argvdata/pcie-switch-downstream-port.args | 2 +-
tests/qemuxml2argvdata/pcie-switch-upstream-port.args | 2 +-
tests/qemuxml2argvdata/pcihole64-q35.args | 2 +-
tests/qemuxml2argvdata/pcihole64.args | 2 +-
tests/qemuxml2argvdata/pmu-feature-off.args | 2 +-
tests/qemuxml2argvdata/pmu-feature.args | 2 +-
tests/qemuxml2argvdata/ppc-dtb.args | 2 +-
.../qemuxml2argvdata/ppc64-usb-controller-legacy.args | 2 +-
.../ppc64-usb-controller-qemu-xhci.args | 2 +-
tests/qemuxml2argvdata/ppc64-usb-controller.args | 2 +-
tests/qemuxml2argvdata/ppce500-serial.args | 2 +-
tests/qemuxml2argvdata/pseries-basic.args | 2 +-
tests/qemuxml2argvdata/pseries-console-virtio.args | 2 +-
tests/qemuxml2argvdata/pseries-cpu-compat-power9.args | 2 +-
tests/qemuxml2argvdata/pseries-cpu-compat.args | 2 +-
tests/qemuxml2argvdata/pseries-cpu-exact.args | 2 +-
tests/qemuxml2argvdata/pseries-cpu-le.args | 2 +-
tests/qemuxml2argvdata/pseries-features.args | 2 +-
tests/qemuxml2argvdata/pseries-hostdevs-1.args | 2 +-
tests/qemuxml2argvdata/pseries-hostdevs-2.args | 2 +-
tests/qemuxml2argvdata/pseries-hostdevs-3.args | 2 +-
.../pseries-machine-max-cpu-compat.args | 2 +-
tests/qemuxml2argvdata/pseries-many-buses-1.args | 2 +-
tests/qemuxml2argvdata/pseries-many-buses-2.args | 2 +-
tests/qemuxml2argvdata/pseries-many-devices.args | 2 +-
tests/qemuxml2argvdata/pseries-nvram.args | 2 +-
tests/qemuxml2argvdata/pseries-panic-missing.args | 2 +-
tests/qemuxml2argvdata/pseries-panic-no-address.args | 2 +-
.../qemuxml2argvdata/pseries-phb-default-missing.args | 2 +-
tests/qemuxml2argvdata/pseries-phb-numa-node.args | 2 +-
tests/qemuxml2argvdata/pseries-phb-simple.args | 2 +-
tests/qemuxml2argvdata/pseries-serial-native.args | 2 +-
tests/qemuxml2argvdata/pseries-serial-pci.args | 2 +-
tests/qemuxml2argvdata/pseries-serial-usb.args | 2 +-
tests/qemuxml2argvdata/pseries-usb-default.args | 2 +-
tests/qemuxml2argvdata/pseries-usb-kbd.args | 2 +-
tests/qemuxml2argvdata/pseries-usb-multi.args | 2 +-
tests/qemuxml2argvdata/pseries-vio-user-assigned.args | 2 +-
tests/qemuxml2argvdata/pseries-vio.args | 2 +-
tests/qemuxml2argvdata/q35-acpi-nouefi.args | 2 +-
tests/qemuxml2argvdata/q35-acpi-uefi.args | 2 +-
tests/qemuxml2argvdata/q35-default-devices-only.args | 2 +-
tests/qemuxml2argvdata/q35-multifunction.args | 2 +-
tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 2 +-
tests/qemuxml2argvdata/q35-pci-force-address.args | 2 +-
tests/qemuxml2argvdata/q35-pcie-autoadd.args | 2 +-
tests/qemuxml2argvdata/q35-pcie.args | 2 +-
tests/qemuxml2argvdata/q35-pm-disable-fallback.args | 2 +-
tests/qemuxml2argvdata/q35-pm-disable.args | 2 +-
tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +-
tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +-
tests/qemuxml2argvdata/q35-usb2.args | 2 +-
tests/qemuxml2argvdata/q35-virt-manager-basic.args | 2 +-
tests/qemuxml2argvdata/q35-virtio-pci.args | 2 +-
tests/qemuxml2argvdata/q35.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-commandline.args | 2 +-
.../qemu-ns-domain-commandline-ns0.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-domain-commandline.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-no-env.args | 2 +-
tests/qemuxml2argvdata/reboot-timeout-disabled.args | 2 +-
tests/qemuxml2argvdata/reboot-timeout-enabled.args | 2 +-
tests/qemuxml2argvdata/restore-v2-fd.args | 2 +-
tests/qemuxml2argvdata/restore-v2.args | 2 +-
tests/qemuxml2argvdata/riscv64-virt-pci.args | 2 +-
tests/qemuxml2argvdata/riscv64-virt.args | 2 +-
tests/qemuxml2argvdata/s390-panic-missing.args | 2 +-
tests/qemuxml2argvdata/s390-panic-no-address.args | 2 +-
tests/qemuxml2argvdata/s390-serial-2.args | 2 +-
tests/qemuxml2argvdata/s390-serial-console.args | 2 +-
tests/qemuxml2argvdata/s390-serial.args | 2 +-
tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic-override.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +-
tests/qemuxml2argvdata/seclabel-none.args | 2 +-
tests/qemuxml2argvdata/seclabel-static-labelskip.args | 2 +-
tests/qemuxml2argvdata/seclabel-static-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-static.args | 2 +-
tests/qemuxml2argvdata/serial-dev-chardev-iobase.args | 2 +-
tests/qemuxml2argvdata/serial-dev-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-file-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-file-log.args | 2 +-
tests/qemuxml2argvdata/serial-many-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-pty-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-spiceport-nospice.args | 2 +-
tests/qemuxml2argvdata/serial-spiceport.args | 2 +-
tests/qemuxml2argvdata/serial-tcp-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args | 2 +-
.../serial-tcp-tlsx509-chardev-notls.args | 2 +-
.../serial-tcp-tlsx509-chardev-verify.args | 2 +-
tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args | 2 +-
.../serial-tcp-tlsx509-secret-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-udp-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-unix-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +-
tests/qemuxml2argvdata/shmem-plain-doorbell.args | 2 +-
tests/qemuxml2argvdata/shmem.args | 2 +-
tests/qemuxml2argvdata/smartcard-controller.args | 2 +-
.../smartcard-host-certificates-database.args | 2 +-
.../qemuxml2argvdata/smartcard-host-certificates.args | 2 +-
tests/qemuxml2argvdata/smartcard-host.args | 2 +-
.../smartcard-passthrough-spicevmc.args | 2 +-
tests/qemuxml2argvdata/smartcard-passthrough-tcp.args | 2 +-
tests/qemuxml2argvdata/smbios-type-fwcfg.args | 2 +-
tests/qemuxml2argvdata/smbios.args | 2 +-
tests/qemuxml2argvdata/smp-dies.args | 2 +-
tests/qemuxml2argvdata/smp.args | 2 +-
tests/qemuxml2argvdata/sound-device.args | 2 +-
tests/qemuxml2argvdata/sound.args | 2 +-
tests/qemuxml2argvdata/sparc-minimal.args | 2 +-
tests/qemuxml2argvdata/usb-controller-default-q35.args | 2 +-
.../qemuxml2argvdata/usb-controller-explicit-q35.args | 2 +-
tests/qemuxml2argvdata/usb-controller-qemu-xhci.args | 2 +-
tests/qemuxml2argvdata/usb-controller-xhci.args | 2 +-
tests/qemuxml2argvdata/usb-controller.args | 2 +-
tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 2 +-
tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +-
tests/qemuxml2argvdata/usb-hub.args | 2 +-
tests/qemuxml2argvdata/usb-ich9-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb-ich9-companion.args | 2 +-
tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 2 +-
tests/qemuxml2argvdata/usb-long-port-path.args | 2 +-
tests/qemuxml2argvdata/usb-none.args | 2 +-
tests/qemuxml2argvdata/usb-piix3-controller.args | 2 +-
tests/qemuxml2argvdata/usb-port-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb-port-missing.args | 2 +-
tests/qemuxml2argvdata/usb-ports.args | 2 +-
tests/qemuxml2argvdata/usb-redir-boot.args | 2 +-
tests/qemuxml2argvdata/usb-redir-filter-version.args | 2 +-
tests/qemuxml2argvdata/usb-redir-filter.args | 2 +-
tests/qemuxml2argvdata/usb-redir.args | 2 +-
tests/qemuxml2argvdata/usb-xhci-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb1-usb2.args | 2 +-
tests/qemuxml2argvdata/user-aliases-usb.args | 2 +-
tests/qemuxml2argvdata/user-aliases.args | 2 +-
tests/qemuxml2argvdata/vcpu-placement-static.args | 2 +-
.../qemuxml2argvdata/video-device-pciaddr-default.args | 2 +-
tests/qemuxml2argvdata/video-none-device.args | 2 +-
tests/qemuxml2argvdata/video-qxl-device-vgamem.args | 2 +-
tests/qemuxml2argvdata/video-qxl-device.args | 2 +-
tests/qemuxml2argvdata/video-qxl-heads.args | 2 +-
tests/qemuxml2argvdata/video-qxl-noheads.args | 2 +-
tests/qemuxml2argvdata/video-qxl-resolution.args | 2 +-
.../qemuxml2argvdata/video-qxl-sec-device-vgamem.args | 2 +-
tests/qemuxml2argvdata/video-qxl-sec-device.args | 2 +-
tests/qemuxml2argvdata/video-vga-device-vgamem.args | 2 +-
tests/qemuxml2argvdata/video-vga-device.args | 2 +-
tests/qemuxml2argvdata/video-vga-qxl-heads.args | 2 +-
tests/qemuxml2argvdata/video-virtio-gpu-ccw.args | 2 +-
tests/qemuxml2argvdata/video-virtio-gpu-device.args | 2 +-
tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 2 +-
tests/qemuxml2argvdata/video-virtio-gpu-secondary.args | 2 +-
tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args | 2 +-
tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 2 +-
tests/qemuxml2argvdata/video-virtio-vga.args | 2 +-
tests/qemuxml2argvdata/virtio-input-passthrough.args | 2 +-
tests/qemuxml2argvdata/virtio-input.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-ccw.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-default.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-egd.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-multiple.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-random.args | 2 +-
tests/qemuxml2argvdata/vmcoreinfo.args | 2 +-
459 files changed, 460 insertions(+), 466 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index f7f55b20ef..5db9d6c041 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7425,14 +7425,8 @@ qemuBuildMemCommandLine(virCommand *cmd,
return -1;
}
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OVERCOMMIT)) {
- virCommandAddArg(cmd, "-overcommit");
- virCommandAddArgFormat(cmd, "mem-lock=%s", def->mem.locked ?
"on" : "off");
- } else {
- virCommandAddArg(cmd, "-realtime");
- virCommandAddArgFormat(cmd, "mlock=%s",
- def->mem.locked ? "on" : "off");
- }
+ virCommandAddArg(cmd, "-overcommit");
+ virCommandAddArgFormat(cmd, "mem-lock=%s", def->mem.locked ?
"on" : "off");
return 0;
}
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index b8af6b7f3b..f41907ce2b 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu cortex-a53 \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
index da06d20e59..88ea50027c 100644
--- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
-drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
index 225b6fc634..b22f8b1de4 100644
--- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
+++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args
b/tests/qemuxml2argvdata/aarch64-gic-host.args
index 8e881c1e84..a064d52b7d 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-host.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-host.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
index 1b87db7c5a..48c856f517 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu cortex-a57 \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args
b/tests/qemuxml2argvdata/aarch64-gic-v2.args
index e0f37c996a..43e142372d 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v2.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v2.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args
b/tests/qemuxml2argvdata/aarch64-gic-v3.args
index 7cc0afadd5..2cc39ab3b5 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v3.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v3.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
index 3021432981..000346d64b 100644
--- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host,aarch64=off \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
index 28995bb700..0aa75ca624 100644
--- a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
+++ b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu cortex-a57 \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
index 311be721e5..b8da2a53c7 100644
--- a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
-drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-pci-serial.args
b/tests/qemuxml2argvdata/aarch64-pci-serial.args
index 9254b80dfd..89dee4243e 100644
--- a/tests/qemuxml2argvdata/aarch64-pci-serial.args
+++ b/tests/qemuxml2argvdata/aarch64-pci-serial.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
index ce0d61316a..939e938231 100644
--- a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
index 8daf58bf78..fbb40f8529 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
index 5f24e8601f..f7deb39419 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-video-default.args
b/tests/qemuxml2argvdata/aarch64-video-default.args
index 9cfbce7f42..19050eb340 100644
--- a/tests/qemuxml2argvdata/aarch64-video-default.args
+++ b/tests/qemuxml2argvdata/aarch64-video-default.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu cortex-a57 \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid f3197c89-6457-44fe-b26d-897090ba6541 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
index 445ff4326e..ce9144c820 100644
--- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu cortex-a57 \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid f3197c89-6457-44fe-b26d-897090ba6541 \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
index d67f998de1..ac5cf85c85 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu cortex-a53 \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
index 8c38f7e315..229c2fca89 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu cortex-a53 \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
index 66ea240626..c20f80928c 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu cortex-a53 \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
index 41f82db880..4c63049723 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu cortex-a53 \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-display none \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
index 0edc7433a1..4951a60cd0 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu cortex-a53 \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-display none \
diff --git a/tests/qemuxml2argvdata/acpi-table.args
b/tests/qemuxml2argvdata/acpi-table.args
index 9bb7e16037..169fa61e1f 100644
--- a/tests/qemuxml2argvdata/acpi-table.args
+++ b/tests/qemuxml2argvdata/acpi-table.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
index 6dd122458f..19750162c2 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine vexpress-a9,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-display none \
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
index 0a43d24c8c..5ef4e45766 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine vexpress-a9,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-display none \
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
index 783ff46957..99580fa0d3 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine vexpress-a9,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-display none \
diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.args
b/tests/qemuxml2argvdata/arm-virt-virtio.args
index 44baf7b410..909d2caaf9 100644
--- a/tests/qemuxml2argvdata/arm-virt-virtio.args
+++ b/tests/qemuxml2argvdata/arm-virt-virtio.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine virt,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
-display none \
diff --git a/tests/qemuxml2argvdata/audio-default-sdl.args
b/tests/qemuxml2argvdata/audio-default-sdl.args
index 5f38d27ca5..16b9646654 100644
--- a/tests/qemuxml2argvdata/audio-default-sdl.args
+++ b/tests/qemuxml2argvdata/audio-default-sdl.args
@@ -15,7 +15,7 @@ SDL_AUDIODRIVER=esd \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/audio-default-spice.args
b/tests/qemuxml2argvdata/audio-default-spice.args
index d6de1a3477..a09070590a 100644
--- a/tests/qemuxml2argvdata/audio-default-spice.args
+++ b/tests/qemuxml2argvdata/audio-default-spice.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=spice \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/audio-default-vnc.args
b/tests/qemuxml2argvdata/audio-default-vnc.args
index 9abda85e76..68090930d8 100644
--- a/tests/qemuxml2argvdata/audio-default-vnc.args
+++ b/tests/qemuxml2argvdata/audio-default-vnc.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=alsa \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/autoindex.args
b/tests/qemuxml2argvdata/autoindex.args
index c189876580..85bb41e5b8 100644
--- a/tests/qemuxml2argvdata/autoindex.args
+++ b/tests/qemuxml2argvdata/autoindex.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
index 290cce9ad2..45fecc17b8 100644
--- a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args
b/tests/qemuxml2argvdata/balloon-device-auto.args
index 340f676399..e02e797142 100644
--- a/tests/qemuxml2argvdata/balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/balloon-device-auto.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
index 2adee78b63..c4deb228b3 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args
b/tests/qemuxml2argvdata/balloon-device-deflate.args
index 9231a2c763..6b4d8742ce 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/balloon-device-period.args
b/tests/qemuxml2argvdata/balloon-device-period.args
index d22dc93993..a56b89a980 100644
--- a/tests/qemuxml2argvdata/balloon-device-period.args
+++ b/tests/qemuxml2argvdata/balloon-device-period.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/balloon-device.args
b/tests/qemuxml2argvdata/balloon-device.args
index d22dc93993..a56b89a980 100644
--- a/tests/qemuxml2argvdata/balloon-device.args
+++ b/tests/qemuxml2argvdata/balloon-device.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
index fb59205f4b..6837a3e578 100644
--- a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu cortex-a53 \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-display none \
diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args
b/tests/qemuxml2argvdata/bios-nvram-secure.args
index 4cb79f26f5..741ed2c16c 100644
--- a/tests/qemuxml2argvdata/bios-nvram-secure.args
+++ b/tests/qemuxml2argvdata/bios-nvram-secure.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-drive file=/usr/share/OVMF/OVMF_CODE.secboot.fd,if=pflash,format=raw,unit=0,readonly=on
\
-drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
-display none \
diff --git a/tests/qemuxml2argvdata/bios-nvram.args
b/tests/qemuxml2argvdata/bios-nvram.args
index 93fd91766e..ed3c7c96e2 100644
--- a/tests/qemuxml2argvdata/bios-nvram.args
+++ b/tests/qemuxml2argvdata/bios-nvram.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
-drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
-display none \
diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/bios.args
index d3be995834..5767de0874 100644
--- a/tests/qemuxml2argvdata/bios.args
+++ b/tests/qemuxml2argvdata/bios.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-bios /usr/share/seabios/bios.bin \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
-display none \
diff --git a/tests/qemuxml2argvdata/blkiotune-device.args
b/tests/qemuxml2argvdata/blkiotune-device.args
index 340f676399..e02e797142 100644
--- a/tests/qemuxml2argvdata/blkiotune-device.args
+++ b/tests/qemuxml2argvdata/blkiotune-device.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/blkiotune.args
b/tests/qemuxml2argvdata/blkiotune.args
index 340f676399..e02e797142 100644
--- a/tests/qemuxml2argvdata/blkiotune.args
+++ b/tests/qemuxml2argvdata/blkiotune.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/boot-cdrom.args
b/tests/qemuxml2argvdata/boot-cdrom.args
index a4fdcaef68..57113954e0 100644
--- a/tests/qemuxml2argvdata/boot-cdrom.args
+++ b/tests/qemuxml2argvdata/boot-cdrom.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/boot-complex.args
b/tests/qemuxml2argvdata/boot-complex.args
index 43b89f2f2f..bee8a4cc74 100644
--- a/tests/qemuxml2argvdata/boot-complex.args
+++ b/tests/qemuxml2argvdata/boot-complex.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.args
b/tests/qemuxml2argvdata/boot-floppy-q35.args
index a2fb954001..079d660d92 100644
--- a/tests/qemuxml2argvdata/boot-floppy-q35.args
+++ b/tests/qemuxml2argvdata/boot-floppy-q35.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/boot-floppy.args
b/tests/qemuxml2argvdata/boot-floppy.args
index ca31c42642..132a8a1105 100644
--- a/tests/qemuxml2argvdata/boot-floppy.args
+++ b/tests/qemuxml2argvdata/boot-floppy.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
index ffe37c0341..43237975da 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args
b/tests/qemuxml2argvdata/boot-menu-disable.args
index ffe37c0341..43237975da 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
index 2b9ea7e764..c634edde42 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args
b/tests/qemuxml2argvdata/boot-menu-enable.args
index 56b152fed7..882046b3a0 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/boot-multi.args
b/tests/qemuxml2argvdata/boot-multi.args
index 56b152fed7..882046b3a0 100644
--- a/tests/qemuxml2argvdata/boot-multi.args
+++ b/tests/qemuxml2argvdata/boot-multi.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/boot-network.args
b/tests/qemuxml2argvdata/boot-network.args
index 9081c826ec..680b276300 100644
--- a/tests/qemuxml2argvdata/boot-network.args
+++ b/tests/qemuxml2argvdata/boot-network.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/boot-order.args
b/tests/qemuxml2argvdata/boot-order.args
index 9633919c92..613b322310 100644
--- a/tests/qemuxml2argvdata/boot-order.args
+++ b/tests/qemuxml2argvdata/boot-order.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args
b/tests/qemuxml2argvdata/channel-guestfwd.args
index 940907d34e..fcd063fc2c 100644
--- a/tests/qemuxml2argvdata/channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args
b/tests/qemuxml2argvdata/channel-spicevmc.args
index 5af914dc6b..45af2ac258 100644
--- a/tests/qemuxml2argvdata/channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=spice \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args
b/tests/qemuxml2argvdata/channel-virtio-auto.args
index c33bed9f94..72a1a38bd6 100644
--- a/tests/qemuxml2argvdata/channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
index 6a42895bc7..a1e7f70467 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
index f6fcebf337..528c8309bc 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args
b/tests/qemuxml2argvdata/channel-virtio-default.args
index d500e65b22..61640bd5e7 100644
--- a/tests/qemuxml2argvdata/channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/channel-virtio-default.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args
b/tests/qemuxml2argvdata/channel-virtio-state.args
index 3aaec4bc9b..bb3ee46aa5 100644
--- a/tests/qemuxml2argvdata/channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/channel-virtio-state.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args
b/tests/qemuxml2argvdata/channel-virtio-unix.args
index 093701d357..5b36bf921b 100644
--- a/tests/qemuxml2argvdata/channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/channel-virtio.args
b/tests/qemuxml2argvdata/channel-virtio.args
index bae2244802..34ea509d0a 100644
--- a/tests/qemuxml2argvdata/channel-virtio.args
+++ b/tests/qemuxml2argvdata/channel-virtio.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args
b/tests/qemuxml2argvdata/chardev-reconnect.args
index bf623d22bb..e184ee1879 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect.args
+++ b/tests/qemuxml2argvdata/chardev-reconnect.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/clock-catchup.args
b/tests/qemuxml2argvdata/clock-catchup.args
index e9e7bd5585..a342d82f66 100644
--- a/tests/qemuxml2argvdata/clock-catchup.args
+++ b/tests/qemuxml2argvdata/clock-catchup.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/clock-france.args
b/tests/qemuxml2argvdata/clock-france.args
index 6a8ede2404..0094082533 100644
--- a/tests/qemuxml2argvdata/clock-france.args
+++ b/tests/qemuxml2argvdata/clock-france.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args
b/tests/qemuxml2argvdata/clock-hpet-off.args
index 1072c3b63d..ec0a34fed8 100644
--- a/tests/qemuxml2argvdata/clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/clock-hpet-off.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
index 502b4c41b6..433037ae31 100644
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1c15a1f6-f4f0-4d3c-9002-667ddb458736 \
-display none \
diff --git a/tests/qemuxml2argvdata/clock-localtime.args
b/tests/qemuxml2argvdata/clock-localtime.args
index 576be6e187..4fba3aa9cd 100644
--- a/tests/qemuxml2argvdata/clock-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/clock-realtime.args
b/tests/qemuxml2argvdata/clock-realtime.args
index 2e8b0ae2b6..63c983f023 100644
--- a/tests/qemuxml2argvdata/clock-realtime.args
+++ b/tests/qemuxml2argvdata/clock-realtime.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
index fb05c36074..0505bfcaf3 100644
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu qemu32,hv-time=on \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/clock-utc.args
b/tests/qemuxml2argvdata/clock-utc.args
index c154f9de4e..b5f235f530 100644
--- a/tests/qemuxml2argvdata/clock-utc.args
+++ b/tests/qemuxml2argvdata/clock-utc.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/clock-variable.args
b/tests/qemuxml2argvdata/clock-variable.args
index 2a7ef38b1e..6dd7483a5a 100644
--- a/tests/qemuxml2argvdata/clock-variable.args
+++ b/tests/qemuxml2argvdata/clock-variable.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/console-compat-auto.args
b/tests/qemuxml2argvdata/console-compat-auto.args
index 43ae215f1b..30d6d5545c 100644
--- a/tests/qemuxml2argvdata/console-compat-auto.args
+++ b/tests/qemuxml2argvdata/console-compat-auto.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args
b/tests/qemuxml2argvdata/console-compat-chardev.args
index 43ae215f1b..30d6d5545c 100644
--- a/tests/qemuxml2argvdata/console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/console-compat-chardev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/console-compat.args
b/tests/qemuxml2argvdata/console-compat.args
index efed1df9dc..66c2224d6e 100644
--- a/tests/qemuxml2argvdata/console-compat.args
+++ b/tests/qemuxml2argvdata/console-compat.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args
b/tests/qemuxml2argvdata/console-virtio-ccw.args
index 8945e234a1..ba897d7ba5 100644
--- a/tests/qemuxml2argvdata/console-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/console-virtio-ccw.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/console-virtio-many.args
b/tests/qemuxml2argvdata/console-virtio-many.args
index 9d82c87d60..0fd92ac96a 100644
--- a/tests/qemuxml2argvdata/console-virtio-many.args
+++ b/tests/qemuxml2argvdata/console-virtio-many.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/console-virtio.args
b/tests/qemuxml2argvdata/console-virtio.args
index 555f81ae10..7498dac2f8 100644
--- a/tests/qemuxml2argvdata/console-virtio.args
+++ b/tests/qemuxml2argvdata/console-virtio.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/controller-order.args
b/tests/qemuxml2argvdata/controller-order.args
index 7c39bc985a..8cfe69206e 100644
--- a/tests/qemuxml2argvdata/controller-order.args
+++ b/tests/qemuxml2argvdata/controller-order.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=spice \
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m 4096 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
index af7d114188..da0493037a 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu Haswell-noTSX \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args
b/tests/qemuxml2argvdata/cpu-Haswell.args
index ca915e4c6e..f459b38629 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu Haswell \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args
b/tests/qemuxml2argvdata/cpu-Haswell2.args
index d9f4a069e9..1cf23a883f 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell2.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell2.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu Haswell,hle=off,rtm=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args
b/tests/qemuxml2argvdata/cpu-Haswell3.args
index 09d7469f61..401daa8ab2 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell3.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell3.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu Haswell,rtm=on,hle=on \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args
b/tests/qemuxml2argvdata/cpu-cache-disable.args
index f0e8136471..a8cc26577a 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host,host-cache-info=off,l3-cache=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.args
b/tests/qemuxml2argvdata/cpu-cache-disable2.args
index 492980493f..9df5eee09b 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable2.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args
b/tests/qemuxml2argvdata/cpu-cache-disable3.args
index 97c3edb967..d71cb3158f 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu
core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on,l3-cache=off
\
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
index 7983830c01..eca256ece7 100644
--- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host,l3-cache=on,host-cache-info=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
index 5b69ae93e3..dabf914768 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host,host-cache-info=on,l3-cache=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
index cdaa4e9d54..0aed025962 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host,host-cache-info=on \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args
b/tests/qemuxml2argvdata/cpu-check-default-none.args
index 0f996ebf9c..7e56f1d584 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args
b/tests/qemuxml2argvdata/cpu-check-default-none2.args
index 38dacacb12..7f11de3f59 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu core2duo \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args
b/tests/qemuxml2argvdata/cpu-check-default-partial.args
index e702b34164..f1cccef206 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu
core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on
\
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
index a1fce11025..838ddfca7e 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu core2duo \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-check-none.args
b/tests/qemuxml2argvdata/cpu-check-none.args
index a1fce11025..838ddfca7e 100644
--- a/tests/qemuxml2argvdata/cpu-check-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-none.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu core2duo \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
index 852bfb4b0f..b252446464 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu qemu32,kvm-pv-eoi=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
index bb9d673ff4..849593269d 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu qemu32,kvm-pv-eoi=on \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-exact1.args
b/tests/qemuxml2argvdata/cpu-exact1.args
index 117d6e5b4c..8bd42174f8 100644
--- a/tests/qemuxml2argvdata/cpu-exact1.args
+++ b/tests/qemuxml2argvdata/cpu-exact1.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu qemu64,mca=off,pse36=off,clflush=off,syscall=off,nx=off,lm=off,svm=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
index c985bbe682..343d98c194 100644
--- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
+++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu
core2duo,ds=on,ht=on,tm=on,ds-cpl=on,xtpr=on,3dnowext=on,lahf-lm=on,nx=off,cx16=off,tm2=off,pbe=off,ss=off,sse4a=off,wdt=off
\
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-exact2.args
b/tests/qemuxml2argvdata/cpu-exact2.args
index c985bbe682..343d98c194 100644
--- a/tests/qemuxml2argvdata/cpu-exact2.args
+++ b/tests/qemuxml2argvdata/cpu-exact2.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu
core2duo,ds=on,ht=on,tm=on,ds-cpl=on,xtpr=on,3dnowext=on,lahf-lm=on,nx=off,cx16=off,tm2=off,pbe=off,ss=off,sse4a=off,wdt=off
\
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-fallback.args
b/tests/qemuxml2argvdata/cpu-fallback.args
index 3188dff2bf..a8fad07e5f 100644
--- a/tests/qemuxml2argvdata/cpu-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-fallback.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu Penryn,sse4.1=off,sse4.2=off,popcnt=off,aes=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
index 342d8f85fb..679659a4a9 100644
--- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host,kvmclock=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
index 99649d333f..723315d636 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu
Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on
\
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
index aff2b0d11d..239f18b843 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu
Penryn,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,monitor=on,ds-cpl=on,vmx=on,est=on,tm2=on,xtpr=on,sse4.1=off,cx16=on,lahf-lm=on
\
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
index 8f2ecbd6ca..f091d6fe9d 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu 'core2duo,vendor=Libvirt
QEMU,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on'
\
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-host-model.args
b/tests/qemuxml2argvdata/cpu-host-model.args
index 4edd888fc8..c0603e1d5c 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu
core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on
\
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
index 22f79cf18e..8f1991eceb 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host,abm=on,ds=on,invtsc=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args
b/tests/qemuxml2argvdata/cpu-host-passthrough.args
index 0f996ebf9c..7e56f1d584 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.args
b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
index 1b12d36785..419e8df7c2 100644
--- a/tests/qemuxml2argvdata/cpu-hotplug-startup.args
+++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,maxcpus=6,sockets=3,cores=2,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args
b/tests/qemuxml2argvdata/cpu-kvmclock.args
index fe9303aba0..260481b4d2 100644
--- a/tests/qemuxml2argvdata/cpu-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu core2duo,kvmclock=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args
b/tests/qemuxml2argvdata/cpu-minimum1.args
index db34a56a9f..5ea11420a6 100644
--- a/tests/qemuxml2argvdata/cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/cpu-minimum1.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu
core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on
\
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args
b/tests/qemuxml2argvdata/cpu-minimum2.args
index 7e6d920c20..fe9aa6e9ef 100644
--- a/tests/qemuxml2argvdata/cpu-minimum2.args
+++ b/tests/qemuxml2argvdata/cpu-minimum2.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu
core2duo,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,ds-cpl=on,vmx=on,est=on,tm2=on,cx16=on,xtpr=on,lahf-lm=on,syscall=off,nx=off,lm=off,svm=off
\
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args
b/tests/qemuxml2argvdata/cpu-no-removed-features.args
index a1fce11025..838ddfca7e 100644
--- a/tests/qemuxml2argvdata/cpu-no-removed-features.args
+++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu core2duo \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
index a8948e822b..491aa46dc4 100644
--- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
+++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 16,sockets=2,cores=4,threads=2 \
-numa node,nodeid=0,cpus=0-3,cpus=8-11,mem=107 \
-numa node,nodeid=1,cpus=4-7,cpus=12-15,mem=107 \
diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args
b/tests/qemuxml2argvdata/cpu-numa-memshared.args
index 6b571c19ef..0a57a591f5 100644
--- a/tests/qemuxml2argvdata/cpu-numa-memshared.args
+++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 16,sockets=2,cores=4,threads=2 \
-object
memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=on,size=112197632
\
-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
index e80c0481f9..fef06295f3 100644
--- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
+++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 16,sockets=2,cores=4,threads=2 \
-numa node,nodeid=0,cpus=0-7,mem=107 \
-numa node,nodeid=1,cpus=8-15,mem=107 \
diff --git a/tests/qemuxml2argvdata/cpu-numa1.args
b/tests/qemuxml2argvdata/cpu-numa1.args
index e80c0481f9..fef06295f3 100644
--- a/tests/qemuxml2argvdata/cpu-numa1.args
+++ b/tests/qemuxml2argvdata/cpu-numa1.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 16,sockets=2,cores=4,threads=2 \
-numa node,nodeid=0,cpus=0-7,mem=107 \
-numa node,nodeid=1,cpus=8-15,mem=107 \
diff --git a/tests/qemuxml2argvdata/cpu-numa2.args
b/tests/qemuxml2argvdata/cpu-numa2.args
index e80c0481f9..fef06295f3 100644
--- a/tests/qemuxml2argvdata/cpu-numa2.args
+++ b/tests/qemuxml2argvdata/cpu-numa2.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 16,sockets=2,cores=4,threads=2 \
-numa node,nodeid=0,cpus=0-7,mem=107 \
-numa node,nodeid=1,cpus=8-15,mem=107 \
diff --git a/tests/qemuxml2argvdata/cpu-s390-features.args
b/tests/qemuxml2argvdata/cpu-s390-features.args
index e44fe483cd..65071a6dd7 100644
--- a/tests/qemuxml2argvdata/cpu-s390-features.args
+++ b/tests/qemuxml2argvdata/cpu-s390-features.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu zEC12,dfppc=on,stckf=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-s390-zEC12.args
b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
index c66008b055..a07864750c 100644
--- a/tests/qemuxml2argvdata/cpu-s390-zEC12.args
+++ b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu zEC12 \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-strict1.args
b/tests/qemuxml2argvdata/cpu-strict1.args
index e7a12afff4..693a97bf1f 100644
--- a/tests/qemuxml2argvdata/cpu-strict1.args
+++ b/tests/qemuxml2argvdata/cpu-strict1.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu
core2duo,ds=on,acpi=on,ht=on,tm=on,ds-cpl=on,vmx=on,est=on,xtpr=on,3dnowext=on,lahf-lm=on,nx=off,cx16=off,tm2=off,pbe=off,ss=off,sse4a=off,wdt=off
\
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-topology1.args
b/tests/qemuxml2argvdata/cpu-topology1.args
index 375ff06fab..762dba1fb1 100644
--- a/tests/qemuxml2argvdata/cpu-topology1.args
+++ b/tests/qemuxml2argvdata/cpu-topology1.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=3,cores=2,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-topology2.args
b/tests/qemuxml2argvdata/cpu-topology2.args
index fd199edd71..91a5e52240 100644
--- a/tests/qemuxml2argvdata/cpu-topology2.args
+++ b/tests/qemuxml2argvdata/cpu-topology2.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu core2duo \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=1,cores=2,threads=3 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-topology3.args
b/tests/qemuxml2argvdata/cpu-topology3.args
index 375ff06fab..762dba1fb1 100644
--- a/tests/qemuxml2argvdata/cpu-topology3.args
+++ b/tests/qemuxml2argvdata/cpu-topology3.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=3,cores=2,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
index 451fd29dfe..14a88139bf 100644
--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
+++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu
Haswell,vme=on,ds=on,acpi=on,ss=on,ht=on,tm=on,pbe=on,dtes64=on,monitor=on,ds-cpl=on,vmx=on,smx=on,est=on,tm2=on,xtpr=on,pdcm=on,f16c=on,rdrand=on,pdpe1gb=on,abm=on,lahf-lm=on,invtsc=on,tsc-frequency=4567890000
\
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cputune-numatune.args
b/tests/qemuxml2argvdata/cputune-numatune.args
index 5a9d00c69f..c61d93067f 100644
--- a/tests/qemuxml2argvdata/cputune-numatune.args
+++ b/tests/qemuxml2argvdata/cputune-numatune.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m 128 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,maxcpus=6,sockets=6,cores=1,threads=1 \
-object iothread,id=iothread1 \
-object iothread,id=iothread2 \
diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args
b/tests/qemuxml2argvdata/cputune-zero-shares.args
index 31af5ffbbb..3d49cd3bb0 100644
--- a/tests/qemuxml2argvdata/cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args
index 31af5ffbbb..3d49cd3bb0 100644
--- a/tests/qemuxml2argvdata/cputune.args
+++ b/tests/qemuxml2argvdata/cputune.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args
b/tests/qemuxml2argvdata/default-kvm-host-arch.args
index d968717443..31f9c7b6da 100644
--- a/tests/qemuxml2argvdata/default-kvm-host-arch.args
+++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m 4096 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
-display none \
diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args
b/tests/qemuxml2argvdata/default-qemu-host-arch.args
index 0165c88446..8fa501dd99 100644
--- a/tests/qemuxml2argvdata/default-qemu-host-arch.args
+++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 4096 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
-display none \
diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
index b724b6131d..7067024402 100644
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-m 14336 \
-mem-prealloc \
-mem-path /var/lib/libvirt/qemu/ram/-1-instance-00000092/ram \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 8,sockets=8,cores=1,threads=1 \
-uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
-display none \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
index e42c1da3ea..c857f96a0b 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m 14336 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 8,sockets=1,cores=8,threads=1 \
-object
memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=on,prealloc=on,size=15032385536
\
-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
index b170a15b78..506291be24 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m 28672 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 20,sockets=1,cores=8,threads=1 \
-object
memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=off,prealloc=on,size=15032385536
\
-numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
index 92f24d6aea..aacfa63e41 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m 43008 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 32,sockets=1,cores=24,threads=1 \
-object
memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0,share=on,prealloc=on,size=15032385536
\
-numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args
b/tests/qemuxml2argvdata/graphics-egl-headless.args
index 5033929f00..9b667f573c 100644
--- a/tests/qemuxml2argvdata/graphics-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
index e247e67632..f1592fc5b7 100644
--- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
+++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
@@ -15,7 +15,7 @@ DISPLAY=:0.1 \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/graphics-sdl.args
b/tests/qemuxml2argvdata/graphics-sdl.args
index fd542b31cf..ffa1114f0a 100644
--- a/tests/qemuxml2argvdata/graphics-sdl.args
+++ b/tests/qemuxml2argvdata/graphics-sdl.args
@@ -15,7 +15,7 @@ DISPLAY=:0.1 \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
index 56c946e7fe..2ee9d246bb 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
index 55e69d7657..4c39457ae5 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
index cd7a976d51..b60c0a8930 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m 256 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-uuid 583a8e8e-f0ce-4f53-89ab-092862148b25 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.args
b/tests/qemuxml2argvdata/hostdev-pci-address.args
index 726294e33a..a985ff9dc1 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
index f8d3dd7860..5cb7d5e722 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m 256 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-uuid 583a8e8e-f0ce-4f53-89ab-092862148b25 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
index 96f50a4550..56e4238d1c 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
index d7780e7d4c..10828ecb49 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
index a2cdee941e..a296367a11 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel kvm \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
index 7866fa3ac2..20ed633390 100644
--- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
index 83c45f2969..7e72951fd1 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
index a682e12061..c4003864c4 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.args
b/tests/qemuxml2argvdata/hostdev-usb-address.args
index 5ab6ef0313..a5bf6263d4 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
index 0996c0eae4..141c960785 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
index bda671111a..0e99410315 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
index 009291fc69..b8d17fd765 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
index e339d26c9a..2fd50e6275 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
index 26b2bea66e..4011f99bbb 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
index 570a349c69..fbf2cf4c9c 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel kvm \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
index ef4a3f9446..499b55a2b5 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
index 5740293434..c4ee9e211f 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args
b/tests/qemuxml2argvdata/hostdev-vfio.args
index dfbf20c96c..0928d2c05b 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hotplug-base.args
b/tests/qemuxml2argvdata/hotplug-base.args
index ae6a212ac9..34e4fbc11a 100644
--- a/tests/qemuxml2argvdata/hotplug-base.args
+++ b/tests/qemuxml2argvdata/hotplug-base.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m 4096 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
-display none \
diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.args
b/tests/qemuxml2argvdata/hugepages-default-2M.args
index ef38c5bac6..c31dca0eab 100644
--- a/tests/qemuxml2argvdata/hugepages-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-m 1024 \
-mem-prealloc \
-mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
-display none \
diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.args
b/tests/qemuxml2argvdata/hugepages-default-system-size.args
index 7e0da35ad1..1e15f36c3b 100644
--- a/tests/qemuxml2argvdata/hugepages-default-system-size.args
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
-display none \
diff --git a/tests/qemuxml2argvdata/hugepages-default.args
b/tests/qemuxml2argvdata/hugepages-default.args
index ed2a606690..1a9dacc7fd 100644
--- a/tests/qemuxml2argvdata/hugepages-default.args
+++ b/tests/qemuxml2argvdata/hugepages-default.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-m 214 \
-mem-prealloc \
-mem-path /dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args
b/tests/qemuxml2argvdata/hugepages-memaccess.args
index b4fc2bdddf..58ca7a73a0 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=4194304k,slots=16,maxmem=8388608k \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-object
memory-backend-file,id=ram-node0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,share=off,prealloc=on,size=1073741824,host-nodes=0-3,policy=bind
\
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args
b/tests/qemuxml2argvdata/hugepages-memaccess2.args
index c888b64b56..675f7af92c 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=4194304k,slots=16,maxmem=8388608k \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-object
memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0,share=off,size=1073741824,host-nodes=0-3,policy=bind
\
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.args
b/tests/qemuxml2argvdata/hugepages-nodeset.args
index ef38c5bac6..c31dca0eab 100644
--- a/tests/qemuxml2argvdata/hugepages-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-nodeset.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-m 1024 \
-mem-prealloc \
-mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
-display none \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
index 3164db6381..6cce82feaf 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-mem-prealloc \
-mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
index 579e9cb825..1c2fb4d1af 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=1048576k,slots=16,maxmem=1099511627776k \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-mem-prealloc \
-mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.args
b/tests/qemuxml2argvdata/hugepages-numa-default.args
index f0a890c095..e13c3f54c9 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-mem-prealloc \
-mem-path /dev/hugepages2M/libvirt/qemu/-1-fedora \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
index 4f8566fdd0..13143db59b 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=268435456 \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
index ac3ee741f5..ca59b1bbd8 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 4096 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-object
memory-backend-file,id=ram-node0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=1073741824
\
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
diff --git a/tests/qemuxml2argvdata/hugepages-shared.args
b/tests/qemuxml2argvdata/hugepages-shared.args
index f733518401..0462327cf1 100644
--- a/tests/qemuxml2argvdata/hugepages-shared.args
+++ b/tests/qemuxml2argvdata/hugepages-shared.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 4096 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-object
memory-backend-file,id=ram-node0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-QEMUGuest1,prealloc=on,size=1073741824,host-nodes=0-3,policy=bind
\
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
index afeae7d1ee..3c7747ee51 100644
--- a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
+++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-drive
file=/usr/share/edk2/aarch64/QEMU_EFI-silent-pflash.raw,if=pflash,format=raw,unit=0,readonly=on
\
-drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
-m 4096 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 1b826c23-8767-47ad-a6b5-c83a88277f71 \
-display none \
diff --git a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
index ccd855d820..859d3a923d 100644
--- a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
+++ b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel hvf \
-m 4096 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 1b826c23-8767-47ad-a6b5-c83a88277f71 \
-display none \
diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args
b/tests/qemuxml2argvdata/input-usbmouse-addr.args
index e5a7d729e0..bcd048d917 100644
--- a/tests/qemuxml2argvdata/input-usbmouse-addr.args
+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/input-usbmouse.args
b/tests/qemuxml2argvdata/input-usbmouse.args
index 54c620b08a..4f7a844a74 100644
--- a/tests/qemuxml2argvdata/input-usbmouse.args
+++ b/tests/qemuxml2argvdata/input-usbmouse.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/input-usbtablet.args
b/tests/qemuxml2argvdata/input-usbtablet.args
index 77feb86a4f..8b72174cee 100644
--- a/tests/qemuxml2argvdata/input-usbtablet.args
+++ b/tests/qemuxml2argvdata/input-usbtablet.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.args
b/tests/qemuxml2argvdata/input-virtio-ccw.args
index 79e858a841..0d980cbfba 100644
--- a/tests/qemuxml2argvdata/input-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/input-virtio-ccw.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1803 \
-display none \
diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
index b9ec7c2e8e..32ae662b14 100644
--- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-object iothread,id=iothread1 \
-object iothread,id=iothread2 \
diff --git a/tests/qemuxml2argvdata/iothreads-disk.args
b/tests/qemuxml2argvdata/iothreads-disk.args
index 9d5f31325a..a8d27bf01e 100644
--- a/tests/qemuxml2argvdata/iothreads-disk.args
+++ b/tests/qemuxml2argvdata/iothreads-disk.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-object iothread,id=iothread1 \
-object iothread,id=iothread2 \
diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.args
b/tests/qemuxml2argvdata/iothreads-ids-partial.args
index 4e4f4bbacb..b5dbc8694b 100644
--- a/tests/qemuxml2argvdata/iothreads-ids-partial.args
+++ b/tests/qemuxml2argvdata/iothreads-ids-partial.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-object iothread,id=iothread5 \
-object iothread,id=iothread6 \
diff --git a/tests/qemuxml2argvdata/iothreads-ids.args
b/tests/qemuxml2argvdata/iothreads-ids.args
index 6a98117f8c..52e28727d3 100644
--- a/tests/qemuxml2argvdata/iothreads-ids.args
+++ b/tests/qemuxml2argvdata/iothreads-ids.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-object iothread,id=iothread2 \
-object iothread,id=iothread4 \
diff --git a/tests/qemuxml2argvdata/iothreads.args
b/tests/qemuxml2argvdata/iothreads.args
index 0c94a61da8..a72be41a3d 100644
--- a/tests/qemuxml2argvdata/iothreads.args
+++ b/tests/qemuxml2argvdata/iothreads.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-object iothread,id=iothread1 \
-object iothread,id=iothread2 \
diff --git a/tests/qemuxml2argvdata/kvm-features-off.args
b/tests/qemuxml2argvdata/kvm-features-off.args
index efeb680328..e14cc44b5b 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host,kvm-pv-ipi=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/kvm-features.args
b/tests/qemuxml2argvdata/kvm-features.args
index 501a64d6e4..9c0a56d361 100644
--- a/tests/qemuxml2argvdata/kvm-features.args
+++ b/tests/qemuxml2argvdata/kvm-features.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm,dirty-ring-size=4096 \
-cpu host,kvm=off,kvm-hint-dedicated=on,kvm-poll-control=on \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args
b/tests/qemuxml2argvdata/kvm-pit-delay.args
index 0a97b0337d..09e8d5ec3b 100644
--- a/tests/qemuxml2argvdata/kvm-pit-delay.args
+++ b/tests/qemuxml2argvdata/kvm-pit-delay.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args
b/tests/qemuxml2argvdata/kvm-pit-discard.args
index c351558340..c8e25b07ad 100644
--- a/tests/qemuxml2argvdata/kvm-pit-discard.args
+++ b/tests/qemuxml2argvdata/kvm-pit-discard.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args
index 9bb870191b..537466067c 100644
--- a/tests/qemuxml2argvdata/kvmclock.args
+++ b/tests/qemuxml2argvdata/kvmclock.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu qemu32,kvmclock=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
index 0898cdd9cd..ad3ea235ae 100644
--- a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
+++ b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-native.args
b/tests/qemuxml2argvdata/mach-virt-serial-native.args
index 508487ba48..a5f60e10b2 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-native.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-native.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
index 426ba7b8ef..3f6f66bd0a 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
index a0a37802d7..7b65f5bbbc 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
index cfa8cc0288..276edec05b 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,aes-key-wrap=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
index cfa8cc0288..276edec05b 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,aes-key-wrap=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
index 7623de877c..373deaed52 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,aes-key-wrap=on \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
index 7623de877c..373deaed52 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,aes-key-wrap=on \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-aliases1.args
b/tests/qemuxml2argvdata/machine-aliases1.args
index 2d8952b053..038b660afe 100644
--- a/tests/qemuxml2argvdata/machine-aliases1.args
+++ b/tests/qemuxml2argvdata/machine-aliases1.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-aliases2.args
b/tests/qemuxml2argvdata/machine-aliases2.args
index 1081d0a29a..8b87006b0b 100644
--- a/tests/qemuxml2argvdata/machine-aliases2.args
+++ b/tests/qemuxml2argvdata/machine-aliases2.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-core-off.args
b/tests/qemuxml2argvdata/machine-core-off.args
index c154f9de4e..b5f235f530 100644
--- a/tests/qemuxml2argvdata/machine-core-off.args
+++ b/tests/qemuxml2argvdata/machine-core-off.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-core-on.args
b/tests/qemuxml2argvdata/machine-core-on.args
index d231720bc0..4c3cbb1117 100644
--- a/tests/qemuxml2argvdata/machine-core-on.args
+++ b/tests/qemuxml2argvdata/machine-core-on.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=on \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
index 41fe7e72ff..55db1edc3f 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,dea-key-wrap=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
index 41fe7e72ff..55db1edc3f 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,dea-key-wrap=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
index aae529c52a..3617cdccac 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,dea-key-wrap=on \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
index aae529c52a..3617cdccac 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,dea-key-wrap=on \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
index 4c2e86fefc..c107313e88 100644
--- a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.args
b/tests/qemuxml2argvdata/machine-keywrap-none.args
index 4c2e86fefc..c107313e88 100644
--- a/tests/qemuxml2argvdata/machine-keywrap-none.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
index 4798275239..36abcb8b07 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,loadparm=SYSTEM1 \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
index 5bc660cfed..0df3227913 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,loadparm=2 \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390.args
b/tests/qemuxml2argvdata/machine-loadparm-s390.args
index 2da0563699..db65ad22ad 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-s390.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off,loadparm=2 \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-smm-opt.args
b/tests/qemuxml2argvdata/machine-smm-opt.args
index 54cbc6faef..39fb447320 100644
--- a/tests/qemuxml2argvdata/machine-smm-opt.args
+++ b/tests/qemuxml2argvdata/machine-smm-opt.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,smm=on,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args
b/tests/qemuxml2argvdata/machine-vmport-opt.args
index 10f70f2379..c95c972803 100644
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,vmport=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/master-key.args
b/tests/qemuxml2argvdata/master-key.args
index f0a3874bc6..b51cdc129e 100644
--- a/tests/qemuxml2argvdata/master-key.args
+++ b/tests/qemuxml2argvdata/master-key.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
index f52d9ca35a..110b1a32b7 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k,slots=16,maxmem=1099511627776k \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0-1,mem=214 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
index 45dd92924d..3f149ecace 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k,slots=16,maxmem=1099511627776k \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0-1,mem=214 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
index 52a55023ad..8c19c1ed3a 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off,nvdimm=on \
-accel tcg \
-m size=1048576k,slots=16,maxmem=1099511627776k \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0-1,mem=1024 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
index 52a55023ad..8c19c1ed3a 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off,nvdimm=on \
-accel tcg \
-m size=1048576k,slots=16,maxmem=1099511627776k \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0-1,mem=1024 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
index b388d63314..25ae1f55dd 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel kvm \
-m size=1048576k,slots=16,maxmem=4194304k \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \
-display none \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
index f1956609f9..f6d0b3dd6c 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel kvm \
-m size=1310720k,slots=16,maxmem=4194304k \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \
-display none \
diff --git a/tests/qemuxml2argvdata/memory-hotplug.args
b/tests/qemuxml2argvdata/memory-hotplug.args
index 6a1529c3de..4557f99437 100644
--- a/tests/qemuxml2argvdata/memory-hotplug.args
+++ b/tests/qemuxml2argvdata/memory-hotplug.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=219136k,slots=16,maxmem=1099511627776k \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0-1,mem=214 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args
b/tests/qemuxml2argvdata/memtune-unlimited.args
index 340f676399..e02e797142 100644
--- a/tests/qemuxml2argvdata/memtune-unlimited.args
+++ b/tests/qemuxml2argvdata/memtune-unlimited.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args
index 340f676399..e02e797142 100644
--- a/tests/qemuxml2argvdata/memtune.args
+++ b/tests/qemuxml2argvdata/memtune.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
index 66fe6f69a7..9a60c80f36 100644
--- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
+++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 14338 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 32,sockets=32,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=20482048,host-nodes=3,policy=preferred \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.args
index fc3b0813b6..5050ab76bc 100644
--- a/tests/qemuxml2argvdata/migrate.args
+++ b/tests/qemuxml2argvdata/migrate.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args
index 340f676399..e02e797142 100644
--- a/tests/qemuxml2argvdata/minimal.args
+++ b/tests/qemuxml2argvdata/minimal.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/misc-acpi.args
b/tests/qemuxml2argvdata/misc-acpi.args
index 9798323077..ce0b66e43c 100644
--- a/tests/qemuxml2argvdata/misc-acpi.args
+++ b/tests/qemuxml2argvdata/misc-acpi.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args
b/tests/qemuxml2argvdata/misc-disable-s3.args
index e78d23358f..874635aa41 100644
--- a/tests/qemuxml2argvdata/misc-disable-s3.args
+++ b/tests/qemuxml2argvdata/misc-disable-s3.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \
-display none \
diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args
b/tests/qemuxml2argvdata/misc-disable-suspends.args
index 7842e54e66..7df458b259 100644
--- a/tests/qemuxml2argvdata/misc-disable-suspends.args
+++ b/tests/qemuxml2argvdata/misc-disable-suspends.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \
-display none \
diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args
b/tests/qemuxml2argvdata/misc-enable-s4.args
index 541aaff8d6..9b3209340b 100644
--- a/tests/qemuxml2argvdata/misc-enable-s4.args
+++ b/tests/qemuxml2argvdata/misc-enable-s4.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \
-display none \
diff --git a/tests/qemuxml2argvdata/misc-uuid.args
b/tests/qemuxml2argvdata/misc-uuid.args
index 9798323077..ce0b66e43c 100644
--- a/tests/qemuxml2argvdata/misc-uuid.args
+++ b/tests/qemuxml2argvdata/misc-uuid.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/monitor-json.args
b/tests/qemuxml2argvdata/monitor-json.args
index 04104b66b0..b10eb8d5ea 100644
--- a/tests/qemuxml2argvdata/monitor-json.args
+++ b/tests/qemuxml2argvdata/monitor-json.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
-display none \
diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args
b/tests/qemuxml2argvdata/multifunction-pci-device.args
index 5899438a87..4991ab3b6c 100644
--- a/tests/qemuxml2argvdata/multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-client.args
b/tests/qemuxml2argvdata/net-client.args
index 66782c28ca..bdee6a691f 100644
--- a/tests/qemuxml2argvdata/net-client.args
+++ b/tests/qemuxml2argvdata/net-client.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args
b/tests/qemuxml2argvdata/net-eth-hostip.args
index 4f20ea7eee..587c40dc61 100644
--- a/tests/qemuxml2argvdata/net-eth-hostip.args
+++ b/tests/qemuxml2argvdata/net-eth-hostip.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args
b/tests/qemuxml2argvdata/net-eth-ifname.args
index 4f20ea7eee..587c40dc61 100644
--- a/tests/qemuxml2argvdata/net-eth-ifname.args
+++ b/tests/qemuxml2argvdata/net-eth-ifname.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-eth-names.args
b/tests/qemuxml2argvdata/net-eth-names.args
index 9b2be6ce26..325e316d7f 100644
--- a/tests/qemuxml2argvdata/net-eth-names.args
+++ b/tests/qemuxml2argvdata/net-eth-names.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
index 5b7b5f833d..8722f27207 100644
--- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
+++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args
index 4f20ea7eee..587c40dc61 100644
--- a/tests/qemuxml2argvdata/net-eth.args
+++ b/tests/qemuxml2argvdata/net-eth.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
index 9f7139c958..450cd9c0b8 100644
--- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
index 07f713224e..a2805dfcbb 100644
--- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
index e2d6f48c3a..aba9a4a6ed 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args
b/tests/qemuxml2argvdata/net-hostdev-vfio.args
index 3d93f1efb4..c3dc1a5aba 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-hostdev.args
b/tests/qemuxml2argvdata/net-hostdev.args
index d6d6bc48f6..2e2e2f4639 100644
--- a/tests/qemuxml2argvdata/net-hostdev.args
+++ b/tests/qemuxml2argvdata/net-hostdev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-many-models.args
b/tests/qemuxml2argvdata/net-many-models.args
index e89421878f..3e128003f3 100644
--- a/tests/qemuxml2argvdata/net-many-models.args
+++ b/tests/qemuxml2argvdata/net-many-models.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-mcast.args
b/tests/qemuxml2argvdata/net-mcast.args
index 0f1285d909..ceb27541e7 100644
--- a/tests/qemuxml2argvdata/net-mcast.args
+++ b/tests/qemuxml2argvdata/net-mcast.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-server.args
b/tests/qemuxml2argvdata/net-server.args
index bb04344119..8a304b913b 100644
--- a/tests/qemuxml2argvdata/net-server.args
+++ b/tests/qemuxml2argvdata/net-server.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args
index b8adf7d9e7..5cee8250f8 100644
--- a/tests/qemuxml2argvdata/net-udp.args
+++ b/tests/qemuxml2argvdata/net-udp.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-user-addr.args
b/tests/qemuxml2argvdata/net-user-addr.args
index 39be1b4a30..9bc2e554da 100644
--- a/tests/qemuxml2argvdata/net-user-addr.args
+++ b/tests/qemuxml2argvdata/net-user-addr.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args
index 1688a73e63..aef00e219b 100644
--- a/tests/qemuxml2argvdata/net-user.args
+++ b/tests/qemuxml2argvdata/net-user.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
index 4e1a0f54ba..2160756488 100644
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-vhostuser.args
b/tests/qemuxml2argvdata/net-vhostuser.args
index ddb892e57f..877ae58c8f 100644
--- a/tests/qemuxml2argvdata/net-vhostuser.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args
b/tests/qemuxml2argvdata/net-virtio-ccw.args
index 02aea331dd..0294aa8e31 100644
--- a/tests/qemuxml2argvdata/net-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/net-virtio-ccw.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-virtio-device.args
b/tests/qemuxml2argvdata/net-virtio-device.args
index 776ffad5dd..dc13103f4a 100644
--- a/tests/qemuxml2argvdata/net-virtio-device.args
+++ b/tests/qemuxml2argvdata/net-virtio-device.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
index dbfa0e3c77..c9cd8badaf 100644
--- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args
b/tests/qemuxml2argvdata/net-virtio-netdev.args
index 6da55faf05..99dc72d2ae 100644
--- a/tests/qemuxml2argvdata/net-virtio-netdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-netdev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
index 833cafc206..e0e7a3345b 100644
--- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
index dfe76e8a66..f9a96a1bc0 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args
b/tests/qemuxml2argvdata/net-virtio-teaming.args
index 6c6d7e8caa..9aeab9f49f 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/net-virtio.args
b/tests/qemuxml2argvdata/net-virtio.args
index 0b91e5adf5..224f9f34c0 100644
--- a/tests/qemuxml2argvdata/net-virtio.args
+++ b/tests/qemuxml2argvdata/net-virtio.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/nosharepages.args
b/tests/qemuxml2argvdata/nosharepages.args
index 70630f6f79..83e11b91ed 100644
--- a/tests/qemuxml2argvdata/nosharepages.args
+++ b/tests/qemuxml2argvdata/nosharepages.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off,mem-merge=off \
-accel tcg \
-m 215 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
index 31af5ffbbb..3d49cd3bb0 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
index 31af5ffbbb..3d49cd3bb0 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
index 31af5ffbbb..3d49cd3bb0 100644
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
index 31af5ffbbb..3d49cd3bb0 100644
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args
index 31af5ffbbb..3d49cd3bb0 100644
--- a/tests/qemuxml2argvdata/numad.args
+++ b/tests/qemuxml2argvdata/numad.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
index 31af5ffbbb..3d49cd3bb0 100644
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args
b/tests/qemuxml2argvdata/numatune-auto-prefer.args
index 027c52ae8d..85180f80f1 100644
--- a/tests/qemuxml2argvdata/numatune-auto-prefer.args
+++ b/tests/qemuxml2argvdata/numatune-auto-prefer.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 64 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0,mem=64 \
-uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \
diff --git a/tests/qemuxml2argvdata/numatune-distances.args
b/tests/qemuxml2argvdata/numatune-distances.args
index 198d5fffd7..40fa6c9e65 100644
--- a/tests/qemuxml2argvdata/numatune-distances.args
+++ b/tests/qemuxml2argvdata/numatune-distances.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 12288 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 12,sockets=12,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0,cpus=11,mem=2048 \
-numa node,nodeid=1,cpus=1,cpus=10,mem=2048 \
diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
index 08b3c731ea..f2818fb668 100644
--- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 64 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=33554432,host-nodes=3,policy=preferred \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
diff --git a/tests/qemuxml2argvdata/numatune-memnode.args
b/tests/qemuxml2argvdata/numatune-memnode.args
index 4f2fd9fcc6..2ba762f116 100644
--- a/tests/qemuxml2argvdata/numatune-memnode.args
+++ b/tests/qemuxml2argvdata/numatune-memnode.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 24105 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 32,sockets=32,cores=1,threads=1 \
-object memory-backend-ram,id=ram-node0,size=20971520,host-nodes=3,policy=preferred \
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
diff --git a/tests/qemuxml2argvdata/numatune-memory.args
b/tests/qemuxml2argvdata/numatune-memory.args
index 31af5ffbbb..3d49cd3bb0 100644
--- a/tests/qemuxml2argvdata/numatune-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memory.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.args
b/tests/qemuxml2argvdata/numatune-no-vcpu.args
index 5efe3e6dd9..29cc424142 100644
--- a/tests/qemuxml2argvdata/numatune-no-vcpu.args
+++ b/tests/qemuxml2argvdata/numatune-no-vcpu.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 12288 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 12,sockets=12,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0-3,mem=2048 \
-numa node,nodeid=1,cpus=4-7,mem=2048 \
diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args
b/tests/qemuxml2argvdata/pages-dimm-discard.args
index 0d4f66260c..ca6016077a 100644
--- a/tests/qemuxml2argvdata/pages-dimm-discard.args
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m size=1048576k,slots=16,maxmem=1099511627776k \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0-1,mem=1024 \
-uuid 63840878-0deb-4095-97e6-fc444d9bc9fa \
diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.args
b/tests/qemuxml2argvdata/pages-discard-hugepages.args
index 3164db6381..6cce82feaf 100644
--- a/tests/qemuxml2argvdata/pages-discard-hugepages.args
+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-mem-prealloc \
-mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \
diff --git a/tests/qemuxml2argvdata/pages-discard.args
b/tests/qemuxml2argvdata/pages-discard.args
index 042d5578a4..244e7bb820 100644
--- a/tests/qemuxml2argvdata/pages-discard.args
+++ b/tests/qemuxml2argvdata/pages-discard.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 4096 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-numa node,nodeid=0,cpus=0,mem=1024 \
-numa node,nodeid=1,cpus=1,mem=1024 \
diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args
b/tests/qemuxml2argvdata/parallel-parport-chardev.args
index f7de627e78..a0c12ce004 100644
--- a/tests/qemuxml2argvdata/parallel-parport-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
index ccbe0ab5d7..8730d2b59d 100644
--- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args
b/tests/qemuxml2argvdata/pci-autoadd-addr.args
index da5457b28f..676286bb79 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \
-display none \
diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args
b/tests/qemuxml2argvdata/pci-autoadd-idx.args
index d21beb1956..f7ea57c347 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \
-display none \
diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args
b/tests/qemuxml2argvdata/pci-autofill-addr.args
index 297483c842..856a78aeb7 100644
--- a/tests/qemuxml2argvdata/pci-autofill-addr.args
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \
-display none \
diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
index ffb6dd969b..4c98d395af 100644
--- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
+++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
@@ -16,7 +16,7 @@ QEMU_AUDIO_DRV=none \
-cpu qemu64,kvmclock=off \
-bios /usr/share/seabios/bios.bin \
-m 3907 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 04872dc1-e1de-434b-ab21-e3e80e416349 \
-display none \
diff --git a/tests/qemuxml2argvdata/pci-bridge.args
b/tests/qemuxml2argvdata/pci-bridge.args
index 3725c7d6e3..69d048cee1 100644
--- a/tests/qemuxml2argvdata/pci-bridge.args
+++ b/tests/qemuxml2argvdata/pci-bridge.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args
b/tests/qemuxml2argvdata/pci-expander-bus.args
index 839d53cbb0..9a9a18dad9 100644
--- a/tests/qemuxml2argvdata/pci-expander-bus.args
+++ b/tests/qemuxml2argvdata/pci-expander-bus.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 16,sockets=2,cores=4,threads=2 \
-numa node,nodeid=0,cpus=0-7,mem=107 \
-numa node,nodeid=1,cpus=8-15,mem=107 \
diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args
index 4c8d7c8217..3dc932d089 100644
--- a/tests/qemuxml2argvdata/pci-many.args
+++ b/tests/qemuxml2argvdata/pci-many.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \
-display none \
diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args
b/tests/qemuxml2argvdata/pci-rom-disabled.args
index 8e1c037b13..8095fb55dd 100644
--- a/tests/qemuxml2argvdata/pci-rom-disabled.args
+++ b/tests/qemuxml2argvdata/pci-rom-disabled.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args
index 57913fc1f7..e0b2da5409 100644
--- a/tests/qemuxml2argvdata/pci-rom.args
+++ b/tests/qemuxml2argvdata/pci-rom.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
index 39fd56ac49..d1abb8a125 100644
--- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args
b/tests/qemuxml2argvdata/pcie-expander-bus.args
index 1c70afdc61..4661862d25 100644
--- a/tests/qemuxml2argvdata/pcie-expander-bus.args
+++ b/tests/qemuxml2argvdata/pcie-expander-bus.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 16,sockets=2,cores=4,threads=2 \
-numa node,nodeid=0,cpus=0-7,mem=107 \
-numa node,nodeid=1,cpus=8-15,mem=107 \
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
index 38477e3c45..9b70394ac6 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
index d5268190f8..cf7ad03a52 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/pcie-root-port.args
b/tests/qemuxml2argvdata/pcie-root-port.args
index 014866ca11..bf22b1aa14 100644
--- a/tests/qemuxml2argvdata/pcie-root-port.args
+++ b/tests/qemuxml2argvdata/pcie-root-port.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/pcie-root.args
b/tests/qemuxml2argvdata/pcie-root.args
index be19bc10d6..9e505f3b18 100644
--- a/tests/qemuxml2argvdata/pcie-root.args
+++ b/tests/qemuxml2argvdata/pcie-root.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
index 298416badc..48f3442b8b 100644
--- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
index 1b451526db..2bdfda97fa 100644
--- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args
b/tests/qemuxml2argvdata/pcihole64-q35.args
index 4d229ffa85..86ff17a6d7 100644
--- a/tests/qemuxml2argvdata/pcihole64-q35.args
+++ b/tests/qemuxml2argvdata/pcihole64-q35.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/pcihole64.args
b/tests/qemuxml2argvdata/pcihole64.args
index 2257c4e080..859bee2afc 100644
--- a/tests/qemuxml2argvdata/pcihole64.args
+++ b/tests/qemuxml2argvdata/pcihole64.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 3c7c30b5-7866-4b05-8a29-efebccba52a0 \
-display none \
diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args
b/tests/qemuxml2argvdata/pmu-feature-off.args
index c92983751b..efd0747eac 100644
--- a/tests/qemuxml2argvdata/pmu-feature-off.args
+++ b/tests/qemuxml2argvdata/pmu-feature-off.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu qemu32,pmu=off \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/pmu-feature.args
b/tests/qemuxml2argvdata/pmu-feature.args
index c24355caab..298e962f53 100644
--- a/tests/qemuxml2argvdata/pmu-feature.args
+++ b/tests/qemuxml2argvdata/pmu-feature.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu qemu32,pmu=on \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/ppc-dtb.args b/tests/qemuxml2argvdata/ppc-dtb.args
index 1d47a8444d..abb8732029 100644
--- a/tests/qemuxml2argvdata/ppc-dtb.args
+++ b/tests/qemuxml2argvdata/ppc-dtb.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine ppce500,usb=off,dump-guest-core=off \
-accel kvm \
-m 256 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \
-display none \
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
index 6ae8fd3831..a0c4f2eec0 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 256 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
index 9a4342647b..57f2ae4871 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 256 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller.args
b/tests/qemuxml2argvdata/ppc64-usb-controller.args
index 6a14d96c4a..d381d7f5cd 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 256 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/ppce500-serial.args
b/tests/qemuxml2argvdata/ppce500-serial.args
index 2b4fbac081..ae67a0c752 100644
--- a/tests/qemuxml2argvdata/ppce500-serial.args
+++ b/tests/qemuxml2argvdata/ppce500-serial.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine ppce500,usb=off,dump-guest-core=off \
-accel kvm \
-m 256 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-basic.args
b/tests/qemuxml2argvdata/pseries-basic.args
index 54e28180a5..64dc188718 100644
--- a/tests/qemuxml2argvdata/pseries-basic.args
+++ b/tests/qemuxml2argvdata/pseries-basic.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-console-virtio.args
b/tests/qemuxml2argvdata/pseries-console-virtio.args
index 752cc1a5ae..4d68c70e78 100644
--- a/tests/qemuxml2argvdata/pseries-console-virtio.args
+++ b/tests/qemuxml2argvdata/pseries-console-virtio.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
index 1506b8d9ec..233e92f206 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host \
-m 256 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat.args
b/tests/qemuxml2argvdata/pseries-cpu-compat.args
index 0d330015f1..232fcf27e5 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-compat.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host \
-m 256 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-exact.args
b/tests/qemuxml2argvdata/pseries-cpu-exact.args
index 2a289febc7..83c051e2e5 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-exact.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-exact.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu POWER7 \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-le.args
b/tests/qemuxml2argvdata/pseries-cpu-le.args
index f6f40cb92b..12d1c277d9 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-le.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-le.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel kvm \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-features.args
b/tests/qemuxml2argvdata/pseries-features.args
index 8d67434d2e..5452a57bb0 100644
--- a/tests/qemuxml2argvdata/pseries-features.args
+++ b/tests/qemuxml2argvdata/pseries-features.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine
pseries,usb=off,dump-guest-core=off,resize-hpt=required,cap-hpt-max-page-size=1048576k,cap-htm=on,cap-nested-hv=off,cap-ccf-assist=on,cap-cfpc=fixed,cap-sbbc=broken,cap-ibs=fixed-ccd
\
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-1.args
b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
index 2600f14af1..074ec68bdf 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-1.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.args
b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
index d8dbb3d581..a07a175f40 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-2.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.args
b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
index 5105b41a38..ae8a32e0ec 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-3.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
index 48771630b7..d47dffd0e4 100644
--- a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
+++ b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel kvm \
-cpu host \
-m 256 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-many-buses-1.args
b/tests/qemuxml2argvdata/pseries-many-buses-1.args
index 40d5d40ea0..eb7a763094 100644
--- a/tests/qemuxml2argvdata/pseries-many-buses-1.args
+++ b/tests/qemuxml2argvdata/pseries-many-buses-1.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-many-buses-2.args
b/tests/qemuxml2argvdata/pseries-many-buses-2.args
index 8bc3e387e6..aee15cf17e 100644
--- a/tests/qemuxml2argvdata/pseries-many-buses-2.args
+++ b/tests/qemuxml2argvdata/pseries-many-buses-2.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-many-devices.args
b/tests/qemuxml2argvdata/pseries-many-devices.args
index 5d6b7bb48c..1cf9f4ee88 100644
--- a/tests/qemuxml2argvdata/pseries-many-devices.args
+++ b/tests/qemuxml2argvdata/pseries-many-devices.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-nvram.args
b/tests/qemuxml2argvdata/pseries-nvram.args
index 718b36da9c..5bfbb39abb 100644
--- a/tests/qemuxml2argvdata/pseries-nvram.args
+++ b/tests/qemuxml2argvdata/pseries-nvram.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-panic-missing.args
b/tests/qemuxml2argvdata/pseries-panic-missing.args
index 54e28180a5..64dc188718 100644
--- a/tests/qemuxml2argvdata/pseries-panic-missing.args
+++ b/tests/qemuxml2argvdata/pseries-panic-missing.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-panic-no-address.args
b/tests/qemuxml2argvdata/pseries-panic-no-address.args
index 54e28180a5..64dc188718 100644
--- a/tests/qemuxml2argvdata/pseries-panic-no-address.args
+++ b/tests/qemuxml2argvdata/pseries-panic-no-address.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-phb-default-missing.args
b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
index e0931b4ea5..d89f493a52 100644
--- a/tests/qemuxml2argvdata/pseries-phb-default-missing.args
+++ b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.args
b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
index 2adf6aa9a5..dbf193409e 100644
--- a/tests/qemuxml2argvdata/pseries-phb-numa-node.args
+++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 8,sockets=2,cores=1,threads=4 \
-object memory-backend-ram,id=ram-node0,size=1073741824,host-nodes=1,policy=bind \
-numa node,nodeid=0,cpus=0-3,memdev=ram-node0 \
diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.args
b/tests/qemuxml2argvdata/pseries-phb-simple.args
index e0931b4ea5..d89f493a52 100644
--- a/tests/qemuxml2argvdata/pseries-phb-simple.args
+++ b/tests/qemuxml2argvdata/pseries-phb-simple.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-serial-native.args
b/tests/qemuxml2argvdata/pseries-serial-native.args
index 36bd737fec..2b08627e3d 100644
--- a/tests/qemuxml2argvdata/pseries-serial-native.args
+++ b/tests/qemuxml2argvdata/pseries-serial-native.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-serial-pci.args
b/tests/qemuxml2argvdata/pseries-serial-pci.args
index d6ed01748e..b8f4876734 100644
--- a/tests/qemuxml2argvdata/pseries-serial-pci.args
+++ b/tests/qemuxml2argvdata/pseries-serial-pci.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-serial-usb.args
b/tests/qemuxml2argvdata/pseries-serial-usb.args
index adcac1b842..0702bbb224 100644
--- a/tests/qemuxml2argvdata/pseries-serial-usb.args
+++ b/tests/qemuxml2argvdata/pseries-serial-usb.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-usb-default.args
b/tests/qemuxml2argvdata/pseries-usb-default.args
index bb4385b986..581a6ae549 100644
--- a/tests/qemuxml2argvdata/pseries-usb-default.args
+++ b/tests/qemuxml2argvdata/pseries-usb-default.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-usb-kbd.args
b/tests/qemuxml2argvdata/pseries-usb-kbd.args
index 20c495e7aa..901a00e1c3 100644
--- a/tests/qemuxml2argvdata/pseries-usb-kbd.args
+++ b/tests/qemuxml2argvdata/pseries-usb-kbd.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-usb-multi.args
b/tests/qemuxml2argvdata/pseries-usb-multi.args
index 0d67e22267..94b59ee47f 100644
--- a/tests/qemuxml2argvdata/pseries-usb-multi.args
+++ b/tests/qemuxml2argvdata/pseries-usb-multi.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
index ee4f21a4a4..a0750c7d39 100644
--- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
+++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 2754dd7b-ac8a-4850-aec0-1f3fcd43235b \
-display none \
diff --git a/tests/qemuxml2argvdata/pseries-vio.args
b/tests/qemuxml2argvdata/pseries-vio.args
index ee6ff77fb6..a9a393eef9 100644
--- a/tests/qemuxml2argvdata/pseries-vio.args
+++ b/tests/qemuxml2argvdata/pseries-vio.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pseries,usb=off,dump-guest-core=off \
-accel tcg \
-m 512 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 2754dd7b-ac8a-4850-aec0-1f3fcd43235b \
-display none \
diff --git a/tests/qemuxml2argvdata/q35-acpi-nouefi.args
b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
index 4da1af5b5b..d0490b9fef 100644
--- a/tests/qemuxml2argvdata/q35-acpi-nouefi.args
+++ b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu Haswell \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-display none \
diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.args
b/tests/qemuxml2argvdata/q35-acpi-uefi.args
index 8c67134cd4..1ea740d29c 100644
--- a/tests/qemuxml2argvdata/q35-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/q35-acpi-uefi.args
@@ -17,7 +17,7 @@ QEMU_AUDIO_DRV=none \
-drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
-drive file=/some/user/nvram/path/guest_VARS.fd,if=pflash,format=raw,unit=1 \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-display none \
diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.args
b/tests/qemuxml2argvdata/q35-default-devices-only.args
index a2cf4d5942..56defbc6fe 100644
--- a/tests/qemuxml2argvdata/q35-default-devices-only.args
+++ b/tests/qemuxml2argvdata/q35-default-devices-only.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/q35-multifunction.args
b/tests/qemuxml2argvdata/q35-multifunction.args
index 2a846cd67c..f98ae9e6af 100644
--- a/tests/qemuxml2argvdata/q35-multifunction.args
+++ b/tests/qemuxml2argvdata/q35-multifunction.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
index 9ab79b2ad5..79ce26f047 100644
--- a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
+++ b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
@@ -15,7 +15,7 @@ QEMU_AUDIO_DRV=none \
-accel tcg \
-cpu Haswell \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-display none \
diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args
b/tests/qemuxml2argvdata/q35-pci-force-address.args
index e416e376e4..7d761c5875 100644
--- a/tests/qemuxml2argvdata/q35-pci-force-address.args
+++ b/tests/qemuxml2argvdata/q35-pci-force-address.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
index 6f8b7ceb00..ef3767af3a 100644
--- a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
+++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/q35-pcie.args b/tests/qemuxml2argvdata/q35-pcie.args
index 8dee59972c..d860f8ca09 100644
--- a/tests/qemuxml2argvdata/q35-pcie.args
+++ b/tests/qemuxml2argvdata/q35-pcie.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
index 5524552339..05b1b98a0d 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \
-display none \
diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args
b/tests/qemuxml2argvdata/q35-pm-disable.args
index a5b4d1f78c..d65c3379db 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \
-display none \
diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args
b/tests/qemuxml2argvdata/q35-usb2-multi.args
index 58b55a082d..4d59460a13 100644
--- a/tests/qemuxml2argvdata/q35-usb2-multi.args
+++ b/tests/qemuxml2argvdata/q35-usb2-multi.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args
b/tests/qemuxml2argvdata/q35-usb2-reorder.args
index c81cdfaa6b..8af10dbcfe 100644
--- a/tests/qemuxml2argvdata/q35-usb2-reorder.args
+++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args
index f646b75539..94e6713d7e 100644
--- a/tests/qemuxml2argvdata/q35-usb2.args
+++ b/tests/qemuxml2argvdata/q35-usb2.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
index 143382918a..32875f291c 100644
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=spice \
-machine q35,usb=off,vmport=off,dump-guest-core=off \
-accel kvm \
-m 4096 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 1b826c23-8767-47ad-a6b5-c83a88277f71 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.args
b/tests/qemuxml2argvdata/q35-virtio-pci.args
index d7ac5d64c0..887141ebe1 100644
--- a/tests/qemuxml2argvdata/q35-virtio-pci.args
+++ b/tests/qemuxml2argvdata/q35-virtio-pci.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args
index cd3cfd49a2..370110db7d 100644
--- a/tests/qemuxml2argvdata/q35.args
+++ b/tests/qemuxml2argvdata/q35.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,sockets=2,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args
b/tests/qemuxml2argvdata/qemu-ns-alt.args
index 4b77f3592e..eecf66f325 100644
--- a/tests/qemuxml2argvdata/qemu-ns-alt.args
+++ b/tests/qemuxml2argvdata/qemu-ns-alt.args
@@ -16,7 +16,7 @@ BAR='' \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
index ef4778cb6c..40940ff5b9 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
index ef4778cb6c..40940ff5b9 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args
b/tests/qemuxml2argvdata/qemu-ns-commandline.args
index ef4778cb6c..40940ff5b9 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
index ef4778cb6c..40940ff5b9 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
index ef4778cb6c..40940ff5b9 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
index ef4778cb6c..40940ff5b9 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args
b/tests/qemuxml2argvdata/qemu-ns-no-env.args
index 6e0c614c5d..2b92249803 100644
--- a/tests/qemuxml2argvdata/qemu-ns-no-env.args
+++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
index 7a1cea2e3e..f8a72d2bca 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
index e3f3cbb2b6..8f0213c8e5 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 6,sockets=6,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args
b/tests/qemuxml2argvdata/restore-v2-fd.args
index 212fce1c52..d65ed70b2f 100644
--- a/tests/qemuxml2argvdata/restore-v2-fd.args
+++ b/tests/qemuxml2argvdata/restore-v2-fd.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/restore-v2.args
b/tests/qemuxml2argvdata/restore-v2.args
index 758c55c3d9..c24cde2b76 100644
--- a/tests/qemuxml2argvdata/restore-v2.args
+++ b/tests/qemuxml2argvdata/restore-v2.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.args
b/tests/qemuxml2argvdata/riscv64-virt-pci.args
index f8c26585f8..34247c1b6e 100644
--- a/tests/qemuxml2argvdata/riscv64-virt-pci.args
+++ b/tests/qemuxml2argvdata/riscv64-virt-pci.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine virt,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid fd65fc03-8838-4c4d-9d8d-395802488790 \
-display none \
diff --git a/tests/qemuxml2argvdata/riscv64-virt.args
b/tests/qemuxml2argvdata/riscv64-virt.args
index 38615f3da2..a11dd6e1e3 100644
--- a/tests/qemuxml2argvdata/riscv64-virt.args
+++ b/tests/qemuxml2argvdata/riscv64-virt.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine virt,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid fd65fc03-8838-4c4d-9d8d-395802488790 \
-display none \
diff --git a/tests/qemuxml2argvdata/s390-panic-missing.args
b/tests/qemuxml2argvdata/s390-panic-missing.args
index 919737da83..f353802d6e 100644
--- a/tests/qemuxml2argvdata/s390-panic-missing.args
+++ b/tests/qemuxml2argvdata/s390-panic-missing.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 256 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \
-display none \
diff --git a/tests/qemuxml2argvdata/s390-panic-no-address.args
b/tests/qemuxml2argvdata/s390-panic-no-address.args
index f089793be1..a021b706b3 100644
--- a/tests/qemuxml2argvdata/s390-panic-no-address.args
+++ b/tests/qemuxml2argvdata/s390-panic-no-address.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 256 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \
-display none \
diff --git a/tests/qemuxml2argvdata/s390-serial-2.args
b/tests/qemuxml2argvdata/s390-serial-2.args
index cd18fd40e4..50ab7293a2 100644
--- a/tests/qemuxml2argvdata/s390-serial-2.args
+++ b/tests/qemuxml2argvdata/s390-serial-2.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/s390-serial-console.args
b/tests/qemuxml2argvdata/s390-serial-console.args
index aa30d5fdb7..81a864fae5 100644
--- a/tests/qemuxml2argvdata/s390-serial-console.args
+++ b/tests/qemuxml2argvdata/s390-serial-console.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/s390-serial.args
b/tests/qemuxml2argvdata/s390-serial.args
index aa30d5fdb7..81a864fae5 100644
--- a/tests/qemuxml2argvdata/s390-serial.args
+++ b/tests/qemuxml2argvdata/s390-serial.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args
b/tests/qemuxml2argvdata/seclabel-dac-none.args
index 340f676399..e02e797142 100644
--- a/tests/qemuxml2argvdata/seclabel-dac-none.args
+++ b/tests/qemuxml2argvdata/seclabel-dac-none.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
index 340f676399..e02e797142 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
index 340f676399..e02e797142 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
index abf765ecb8..14572d10be 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
index 340f676399..e02e797142 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args
b/tests/qemuxml2argvdata/seclabel-dynamic.args
index 340f676399..e02e797142 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/seclabel-none.args
b/tests/qemuxml2argvdata/seclabel-none.args
index 340f676399..e02e797142 100644
--- a/tests/qemuxml2argvdata/seclabel-none.args
+++ b/tests/qemuxml2argvdata/seclabel-none.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
index 340f676399..e02e797142 100644
--- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args
b/tests/qemuxml2argvdata/seclabel-static-relabel.args
index 340f676399..e02e797142 100644
--- a/tests/qemuxml2argvdata/seclabel-static-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/seclabel-static.args
b/tests/qemuxml2argvdata/seclabel-static.args
index 340f676399..e02e797142 100644
--- a/tests/qemuxml2argvdata/seclabel-static.args
+++ b/tests/qemuxml2argvdata/seclabel-static.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
index eb7cd75d6e..9fc649e8c3 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args
b/tests/qemuxml2argvdata/serial-dev-chardev.args
index 3c655a1808..11e79f8eb5 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args
b/tests/qemuxml2argvdata/serial-file-chardev.args
index 9c6f27116c..e2f7b706da 100644
--- a/tests/qemuxml2argvdata/serial-file-chardev.args
+++ b/tests/qemuxml2argvdata/serial-file-chardev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/serial-file-log.args
b/tests/qemuxml2argvdata/serial-file-log.args
index 33e4734374..1845320539 100644
--- a/tests/qemuxml2argvdata/serial-file-log.args
+++ b/tests/qemuxml2argvdata/serial-file-log.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args
b/tests/qemuxml2argvdata/serial-many-chardev.args
index d0e1d489ed..8e827f08d3 100644
--- a/tests/qemuxml2argvdata/serial-many-chardev.args
+++ b/tests/qemuxml2argvdata/serial-many-chardev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args
b/tests/qemuxml2argvdata/serial-pty-chardev.args
index 43ae215f1b..30d6d5545c 100644
--- a/tests/qemuxml2argvdata/serial-pty-chardev.args
+++ b/tests/qemuxml2argvdata/serial-pty-chardev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.args
b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
index 2d8952b053..038b660afe 100644
--- a/tests/qemuxml2argvdata/serial-spiceport-nospice.args
+++ b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/serial-spiceport.args
b/tests/qemuxml2argvdata/serial-spiceport.args
index b8dd55f32c..79d738f30c 100644
--- a/tests/qemuxml2argvdata/serial-spiceport.args
+++ b/tests/qemuxml2argvdata/serial-spiceport.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=spice \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-chardev.args
index 30abe5e554..0ea0c9846d 100644
--- a/tests/qemuxml2argvdata/serial-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
index a8fb4f5b5b..80b8d8c173 100644
--- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
index 051c3456c1..a277345c75 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
index f750ea5b14..162de2be7a 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
index f750ea5b14..162de2be7a 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
index a378386888..e2fcd4210c 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args
b/tests/qemuxml2argvdata/serial-udp-chardev.args
index d6db2e589a..488c770045 100644
--- a/tests/qemuxml2argvdata/serial-udp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-udp-chardev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args
b/tests/qemuxml2argvdata/serial-unix-chardev.args
index 10a4feb31e..9947742c08 100644
--- a/tests/qemuxml2argvdata/serial-unix-chardev.args
+++ b/tests/qemuxml2argvdata/serial-unix-chardev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args
b/tests/qemuxml2argvdata/serial-vc-chardev.args
index d473e859dc..f296990f03 100644
--- a/tests/qemuxml2argvdata/serial-vc-chardev.args
+++ b/tests/qemuxml2argvdata/serial-vc-chardev.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
index de42070061..47d6bdc1aa 100644
--- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shmem.args
index d9b6bd6f96..45ef8dce5b 100644
--- a/tests/qemuxml2argvdata/shmem.args
+++ b/tests/qemuxml2argvdata/shmem.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/smartcard-controller.args
b/tests/qemuxml2argvdata/smartcard-controller.args
index 2f2623e73b..95817db881 100644
--- a/tests/qemuxml2argvdata/smartcard-controller.args
+++ b/tests/qemuxml2argvdata/smartcard-controller.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
index 5e543584e1..6541b29312 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args
b/tests/qemuxml2argvdata/smartcard-host-certificates.args
index 2b25278701..e77678885a 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/smartcard-host.args
b/tests/qemuxml2argvdata/smartcard-host.args
index 2f2623e73b..95817db881 100644
--- a/tests/qemuxml2argvdata/smartcard-host.args
+++ b/tests/qemuxml2argvdata/smartcard-host.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
index d825ac772c..166f1f081b 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
index 8f7cd4132b..e24aa7fc65 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.args
b/tests/qemuxml2argvdata/smbios-type-fwcfg.args
index 6ad4a7e1a4..6341ec9fc0 100644
--- a/tests/qemuxml2argvdata/smbios-type-fwcfg.args
+++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-smbios 'type=0,vendor=LENOVO,version=6FET82WW (3.12 )' \
diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args
index d8a968e610..9e976e31bb 100644
--- a/tests/qemuxml2argvdata/smbios.args
+++ b/tests/qemuxml2argvdata/smbios.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-smbios 'type=0,vendor=LENOVO,version=6FET82WW (3.12 )' \
diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args
index 07ceea56fc..25e7a35612 100644
--- a/tests/qemuxml2argvdata/smp-dies.args
+++ b/tests/qemuxml2argvdata/smp-dies.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,maxcpus=4,sockets=2,dies=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args
index 1c24cc3ce0..379b45fa4c 100644
--- a/tests/qemuxml2argvdata/smp.args
+++ b/tests/qemuxml2argvdata/smp.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,maxcpus=2,sockets=2,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/sound-device.args
b/tests/qemuxml2argvdata/sound-device.args
index baed241a05..d3a418ce61 100644
--- a/tests/qemuxml2argvdata/sound-device.args
+++ b/tests/qemuxml2argvdata/sound-device.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sound.args
index fc8a836c16..1cffb935c2 100644
--- a/tests/qemuxml2argvdata/sound.args
+++ b/tests/qemuxml2argvdata/sound.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/sparc-minimal.args
b/tests/qemuxml2argvdata/sparc-minimal.args
index 87ddd46576..1296ef1771 100644
--- a/tests/qemuxml2argvdata/sparc-minimal.args
+++ b/tests/qemuxml2argvdata/sparc-minimal.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine SS-5,usb=off,dump-guest-core=off \
-accel tcg \
-m 500 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 00010203-0405-4607-8809-0a0b0c0d0e0f \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args
b/tests/qemuxml2argvdata/usb-controller-default-q35.args
index 80dfa45066..88871b015c 100644
--- a/tests/qemuxml2argvdata/usb-controller-default-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
index c8bef6a469..1dd79d8946 100644
--- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel tcg \
-m 2048 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
index 8a7dee1d55..fb9e2746ba 100644
--- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args
b/tests/qemuxml2argvdata/usb-controller-xhci.args
index f403ac1d70..5e4edc24b6 100644
--- a/tests/qemuxml2argvdata/usb-controller-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-xhci.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-controller.args
b/tests/qemuxml2argvdata/usb-controller.args
index d0628a662c..75e09d7d02 100644
--- a/tests/qemuxml2argvdata/usb-controller.args
+++ b/tests/qemuxml2argvdata/usb-controller.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
index f259cba3ea..805bfe6f58 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args
b/tests/qemuxml2argvdata/usb-hub-autoadd.args
index 7193ad6324..aa0400b933 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args
index 5474feb6ef..505da01810 100644
--- a/tests/qemuxml2argvdata/usb-hub.args
+++ b/tests/qemuxml2argvdata/usb-hub.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
index e8cfe2931a..7c4436fee2 100644
--- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args
b/tests/qemuxml2argvdata/usb-ich9-companion.args
index 0415a4c05b..b43dd84025 100644
--- a/tests/qemuxml2argvdata/usb-ich9-companion.args
+++ b/tests/qemuxml2argvdata/usb-ich9-companion.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
index b59b3a08fc..27c3ee1f17 100644
--- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
+++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args
b/tests/qemuxml2argvdata/usb-long-port-path.args
index 8ef78d87e4..f4ec521ca6 100644
--- a/tests/qemuxml2argvdata/usb-long-port-path.args
+++ b/tests/qemuxml2argvdata/usb-long-port-path.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args
index 683fd12514..0000f6ee13 100644
--- a/tests/qemuxml2argvdata/usb-none.args
+++ b/tests/qemuxml2argvdata/usb-none.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args
b/tests/qemuxml2argvdata/usb-piix3-controller.args
index 379175923e..ca034d6885 100644
--- a/tests/qemuxml2argvdata/usb-piix3-controller.args
+++ b/tests/qemuxml2argvdata/usb-piix3-controller.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args
b/tests/qemuxml2argvdata/usb-port-autoassign.args
index fce7756e7d..da2611c430 100644
--- a/tests/qemuxml2argvdata/usb-port-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-port-autoassign.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-port-missing.args
b/tests/qemuxml2argvdata/usb-port-missing.args
index 7261f8bf19..8ba74ec735 100644
--- a/tests/qemuxml2argvdata/usb-port-missing.args
+++ b/tests/qemuxml2argvdata/usb-port-missing.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-ports.args
b/tests/qemuxml2argvdata/usb-ports.args
index 289e6835e7..458dff8286 100644
--- a/tests/qemuxml2argvdata/usb-ports.args
+++ b/tests/qemuxml2argvdata/usb-ports.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args
b/tests/qemuxml2argvdata/usb-redir-boot.args
index 3abd66a201..b4646a0cd8 100644
--- a/tests/qemuxml2argvdata/usb-redir-boot.args
+++ b/tests/qemuxml2argvdata/usb-redir-boot.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args
b/tests/qemuxml2argvdata/usb-redir-filter-version.args
index 4c46c15ff3..d033a639b6 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter-version.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args
b/tests/qemuxml2argvdata/usb-redir-filter.args
index ea8c20f8a8..e45906eae0 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-redir.args
b/tests/qemuxml2argvdata/usb-redir.args
index 61512bf043..2607860acb 100644
--- a/tests/qemuxml2argvdata/usb-redir.args
+++ b/tests/qemuxml2argvdata/usb-redir.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
index c9f59996a2..71b3777ded 100644
--- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/usb1-usb2.args
b/tests/qemuxml2argvdata/usb1-usb2.args
index 47dc357d60..429be6c3a1 100644
--- a/tests/qemuxml2argvdata/usb1-usb2.args
+++ b/tests/qemuxml2argvdata/usb1-usb2.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/user-aliases-usb.args
b/tests/qemuxml2argvdata/user-aliases-usb.args
index c4bfd26886..6906abd4c1 100644
--- a/tests/qemuxml2argvdata/user-aliases-usb.args
+++ b/tests/qemuxml2argvdata/user-aliases-usb.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m 4096 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-uuid a75aca4b-a02f-2bcb-4a91-c93cd848c34b \
-display none \
diff --git a/tests/qemuxml2argvdata/user-aliases.args
b/tests/qemuxml2argvdata/user-aliases.args
index db31afcb66..f88ebbf11d 100644
--- a/tests/qemuxml2argvdata/user-aliases.args
+++ b/tests/qemuxml2argvdata/user-aliases.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m 4096 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 4,sockets=4,cores=1,threads=1 \
-object
memory-backend-file,id=ram-node0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-gentoo,prealloc=on,size=1073741824
\
-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.args
b/tests/qemuxml2argvdata/vcpu-placement-static.args
index 4699c88deb..515a849e8e 100644
--- a/tests/qemuxml2argvdata/vcpu-placement-static.args
+++ b/tests/qemuxml2argvdata/vcpu-placement-static.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine q35,usb=off,dump-guest-core=off \
-accel kvm \
-m 128 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 2,maxcpus=6,sockets=6,cores=1,threads=1 \
-object iothread,id=iothread1 \
-object iothread,id=iothread2 \
diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
index 8efda2c45e..688585f049 100644
--- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
+++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel kvm \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid cdbebdfa-1d6d-65c3-be0f-fd74b978a773 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/video-none-device.args
b/tests/qemuxml2argvdata/video-none-device.args
index 5be316d08e..b215889d2d 100644
--- a/tests/qemuxml2argvdata/video-none-device.args
+++ b/tests/qemuxml2argvdata/video-none-device.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
index 17300d5538..93c582c100 100644
--- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/video-qxl-device.args
b/tests/qemuxml2argvdata/video-qxl-device.args
index b47737b34f..c5b2267e42 100644
--- a/tests/qemuxml2argvdata/video-qxl-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-device.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args
b/tests/qemuxml2argvdata/video-qxl-heads.args
index 22465283af..1c1943ef05 100644
--- a/tests/qemuxml2argvdata/video-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-qxl-heads.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args
b/tests/qemuxml2argvdata/video-qxl-noheads.args
index 5a8f052095..39699d8a52 100644
--- a/tests/qemuxml2argvdata/video-qxl-noheads.args
+++ b/tests/qemuxml2argvdata/video-qxl-noheads.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args
b/tests/qemuxml2argvdata/video-qxl-resolution.args
index 8d19bba429..17482f9056 100644
--- a/tests/qemuxml2argvdata/video-qxl-resolution.args
+++ b/tests/qemuxml2argvdata/video-qxl-resolution.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
index 61257b8928..d5b54cfac7 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args
b/tests/qemuxml2argvdata/video-qxl-sec-device.args
index 7aa1b9a739..3a4fd981b4 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
index 371db34b0e..75b47c12f5 100644
--- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/video-vga-device.args
b/tests/qemuxml2argvdata/video-vga-device.args
index cc467b5fb1..ac19b4365e 100644
--- a/tests/qemuxml2argvdata/video-vga-device.args
+++ b/tests/qemuxml2argvdata/video-vga-device.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
index 22465283af..1c1943ef05 100644
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
index 2c0da194f1..d002b6daea 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1803 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
index f19815fd17..012f8e50b9 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
index 94dd7b04c7..27343bc101 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
@@ -13,7 +13,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
index ca234f0615..6061c6a34b 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
index bbbec248b1..1b32054121 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=spice \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-no-user-config \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
index 73096822c6..5851e93804 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args
b/tests/qemuxml2argvdata/video-virtio-vga.args
index c590ca529e..bf864efec0 100644
--- a/tests/qemuxml2argvdata/video-virtio-vga.args
+++ b/tests/qemuxml2argvdata/video-virtio-vga.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 1024 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args
b/tests/qemuxml2argvdata/virtio-input-passthrough.args
index 1d00d2f32f..4e45f27965 100644
--- a/tests/qemuxml2argvdata/virtio-input-passthrough.args
+++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/virtio-input.args
b/tests/qemuxml2argvdata/virtio-input.args
index 209ff526ec..34164771c8 100644
--- a/tests/qemuxml2argvdata/virtio-input.args
+++ b/tests/qemuxml2argvdata/virtio-input.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args
b/tests/qemuxml2argvdata/virtio-rng-ccw.args
index 7de554a3e9..0c235200e3 100644
--- a/tests/qemuxml2argvdata/virtio-rng-ccw.args
+++ b/tests/qemuxml2argvdata/virtio-rng-ccw.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args
b/tests/qemuxml2argvdata/virtio-rng-default.args
index aa04d99d18..d4171e4ca3 100644
--- a/tests/qemuxml2argvdata/virtio-rng-default.args
+++ b/tests/qemuxml2argvdata/virtio-rng-default.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args
b/tests/qemuxml2argvdata/virtio-rng-egd.args
index 72e2aaaadd..21d2cb8e47 100644
--- a/tests/qemuxml2argvdata/virtio-rng-egd.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args
b/tests/qemuxml2argvdata/virtio-rng-multiple.args
index 9ac78b7c8a..7df6301d57 100644
--- a/tests/qemuxml2argvdata/virtio-rng-multiple.args
+++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args
b/tests/qemuxml2argvdata/virtio-rng-random.args
index 58402821b2..ee4afdf364 100644
--- a/tests/qemuxml2argvdata/virtio-rng-random.args
+++ b/tests/qemuxml2argvdata/virtio-rng-random.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args
b/tests/qemuxml2argvdata/vmcoreinfo.args
index cc930ecf9d..b19675561a 100644
--- a/tests/qemuxml2argvdata/vmcoreinfo.args
+++ b/tests/qemuxml2argvdata/vmcoreinfo.args
@@ -14,7 +14,7 @@ QEMU_AUDIO_DRV=none \
-machine pc,usb=off,dump-guest-core=off \
-accel tcg \
-m 214 \
--realtime mlock=off \
+-overcommit mem-lock=off \
-smp 1,sockets=1,cores=1,threads=1 \
-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-display none \
--
2.35.1