[PATCH 14/17] qemu: command: Always assume QEMU_CAPS_OVERCOMMIT

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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@xxxxxxxxxx>
---
 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 2c963a7297..134fa0a2b2 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7381,14 +7381,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 85305b53ef..79127e185e 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=/var/lib/libvirt/qemu/nvram/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 \

 [snipped]




[Index of Archives]     [Virt Tools]     [Libvirt Users]     [Lib OS Info]     [Fedora Users]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]     [Fedora Tools]

  Powered by Linux