qemu: command: Always assume QEMU_CAPS_OVERCOMMIT

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@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

src/qemu/qemu_command.c

@@ -7439,14 +7439,8 @@ qemuBuildMemCommandLine(virCommand *cmd,
             return -1;
     }
 
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OVERCOMMIT)) {
+    virCommandAddArg(cmd, "-overcommit");
-        virCommandAddArg(cmd, "-overcommit");
+    virCommandAddArgFormat(cmd, "mem-lock=%s", def->mem.locked ? "on" : "off");
-        virCommandAddArgFormat(cmd, "mem-lock=%s", def->mem.locked ? "on" : "off");
-    } else {
-        virCommandAddArg(cmd, "-realtime");
-        virCommandAddArgFormat(cmd, "mlock=%s",
-                               def->mem.locked ? "on" : "off");
-    }
 
     return 0;
 }

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \

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 \