[PATCH 01/14] qemu: command: Always assume 'QEMU_CAPS_BOOT_STRICT'
Peter Krempa
pkrempa at redhat.com
Mon Sep 20 15:29:23 UTC 2021
Added by c8a6ae8bb9 in qemu-v1.5.0 and can't be compiled out. Assume
that it's present and fix all fake-caps tests.
Signed-off-by: Peter Krempa <pkrempa at redhat.com>
---
src/qemu/qemu_command.c | 10 +++-------
tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args | 1 +
tests/qemuxml2argvdata/aarch64-acpi-uefi.args | 1 +
tests/qemuxml2argvdata/aarch64-cpu-passthrough.args | 1 +
tests/qemuxml2argvdata/aarch64-gic-host.args | 1 +
tests/qemuxml2argvdata/aarch64-gic-none-tcg.args | 1 +
tests/qemuxml2argvdata/aarch64-gic-v2.args | 1 +
tests/qemuxml2argvdata/aarch64-gic-v3.args | 1 +
tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args | 1 +
tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args | 1 +
tests/qemuxml2argvdata/aarch64-noacpi-uefi.args | 1 +
tests/qemuxml2argvdata/aarch64-pci-serial.args | 1 +
tests/qemuxml2argvdata/aarch64-traditional-pci.args | 1 +
.../aarch64-usb-controller-nec-xhci.args | 1 +
.../aarch64-usb-controller-qemu-xhci.args | 1 +
tests/qemuxml2argvdata/aarch64-video-default.args | 1 +
.../qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args | 1 +
.../aarch64-virt-2.6-virtio-pci-default.args | 1 +
tests/qemuxml2argvdata/aarch64-virt-default-nic.args | 1 +
tests/qemuxml2argvdata/aarch64-virt-virtio.args | 1 +
tests/qemuxml2argvdata/aarch64-virtio-pci-default.args | 1 +
.../aarch64-virtio-pci-manual-addresses.args | 1 +
tests/qemuxml2argvdata/acpi-table.args | 1 +
tests/qemuxml2argvdata/arm-vexpressa9-basic.args | 1 +
tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args | 1 +
tests/qemuxml2argvdata/arm-vexpressa9-virtio.args | 1 +
tests/qemuxml2argvdata/arm-virt-virtio.args | 1 +
tests/qemuxml2argvdata/audio-alsa-best.args | 1 +
tests/qemuxml2argvdata/audio-alsa-minimal.args | 1 +
tests/qemuxml2argvdata/audio-coreaudio-best.args | 1 +
tests/qemuxml2argvdata/audio-coreaudio-minimal.args | 1 +
tests/qemuxml2argvdata/audio-default-nographics.args | 1 +
tests/qemuxml2argvdata/audio-default-sdl.args | 1 +
tests/qemuxml2argvdata/audio-default-spice.args | 1 +
tests/qemuxml2argvdata/audio-default-vnc.args | 1 +
tests/qemuxml2argvdata/audio-file-best.args | 1 +
tests/qemuxml2argvdata/audio-file-minimal.args | 1 +
tests/qemuxml2argvdata/audio-none-best.args | 1 +
tests/qemuxml2argvdata/audio-none-minimal.args | 1 +
tests/qemuxml2argvdata/audio-oss-best.args | 1 +
tests/qemuxml2argvdata/audio-oss-minimal.args | 1 +
tests/qemuxml2argvdata/audio-pulseaudio-best.args | 1 +
tests/qemuxml2argvdata/audio-pulseaudio-minimal.args | 1 +
tests/qemuxml2argvdata/audio-sdl-best.args | 1 +
tests/qemuxml2argvdata/audio-sdl-minimal.args | 1 +
tests/qemuxml2argvdata/audio-spice-best.args | 1 +
tests/qemuxml2argvdata/audio-spice-minimal.args | 1 +
tests/qemuxml2argvdata/autoindex.args | 1 +
tests/qemuxml2argvdata/balloon-ccw-deflate.args | 1 +
tests/qemuxml2argvdata/balloon-device-auto.args | 1 +
tests/qemuxml2argvdata/balloon-device-deflate-off.args | 1 +
tests/qemuxml2argvdata/balloon-device-deflate.args | 1 +
tests/qemuxml2argvdata/balloon-device-period.args | 1 +
tests/qemuxml2argvdata/balloon-device.args | 1 +
tests/qemuxml2argvdata/balloon-mmio-deflate.args | 1 +
tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +-
tests/qemuxml2argvdata/bios-nvram.args | 2 +-
tests/qemuxml2argvdata/bios.args | 2 +-
tests/qemuxml2argvdata/blkiotune-device.args | 1 +
tests/qemuxml2argvdata/blkiotune.args | 1 +
tests/qemuxml2argvdata/boot-cdrom.args | 1 +
tests/qemuxml2argvdata/boot-complex.args | 1 +
tests/qemuxml2argvdata/boot-floppy-q35.args | 1 +
tests/qemuxml2argvdata/boot-floppy.args | 1 +
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 | 1 +
tests/qemuxml2argvdata/boot-order.args | 1 +
tests/qemuxml2argvdata/channel-guestfwd.args | 1 +
tests/qemuxml2argvdata/channel-spicevmc.args | 1 +
tests/qemuxml2argvdata/channel-virtio-auto.args | 1 +
tests/qemuxml2argvdata/channel-virtio-autoadd.args | 1 +
tests/qemuxml2argvdata/channel-virtio-autoassign.args | 1 +
tests/qemuxml2argvdata/channel-virtio-default.args | 1 +
tests/qemuxml2argvdata/channel-virtio-state.args | 1 +
tests/qemuxml2argvdata/channel-virtio-unix.args | 1 +
tests/qemuxml2argvdata/channel-virtio.args | 1 +
tests/qemuxml2argvdata/chardev-reconnect.args | 1 +
tests/qemuxml2argvdata/clock-catchup.args | 1 +
tests/qemuxml2argvdata/clock-france.args | 1 +
tests/qemuxml2argvdata/clock-hpet-off.args | 1 +
.../clock-localtime-basis-localtime.args | 1 +
tests/qemuxml2argvdata/clock-localtime.args | 1 +
tests/qemuxml2argvdata/clock-realtime.args | 1 +
tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args | 1 +
tests/qemuxml2argvdata/clock-utc.args | 1 +
tests/qemuxml2argvdata/clock-variable.args | 1 +
tests/qemuxml2argvdata/console-compat-auto.args | 1 +
tests/qemuxml2argvdata/console-compat-chardev.args | 1 +
tests/qemuxml2argvdata/console-compat.args | 1 +
tests/qemuxml2argvdata/console-virtio-ccw.args | 1 +
tests/qemuxml2argvdata/console-virtio-many.args | 1 +
tests/qemuxml2argvdata/console-virtio.args | 1 +
tests/qemuxml2argvdata/controller-order.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 1 +
tests/qemuxml2argvdata/cpu-Haswell.args | 1 +
tests/qemuxml2argvdata/cpu-Haswell2.args | 1 +
tests/qemuxml2argvdata/cpu-Haswell3.args | 1 +
tests/qemuxml2argvdata/cpu-cache-disable.args | 1 +
tests/qemuxml2argvdata/cpu-cache-disable2.args | 1 +
tests/qemuxml2argvdata/cpu-cache-disable3.args | 1 +
tests/qemuxml2argvdata/cpu-cache-emulate-l3.args | 1 +
tests/qemuxml2argvdata/cpu-cache-passthrough.args | 1 +
tests/qemuxml2argvdata/cpu-cache-passthrough2.args | 1 +
tests/qemuxml2argvdata/cpu-check-default-none.args | 1 +
tests/qemuxml2argvdata/cpu-check-default-none2.args | 1 +
tests/qemuxml2argvdata/cpu-check-default-partial.args | 1 +
tests/qemuxml2argvdata/cpu-check-default-partial2.args | 1 +
tests/qemuxml2argvdata/cpu-check-none.args | 1 +
tests/qemuxml2argvdata/cpu-eoi-disabled.args | 1 +
tests/qemuxml2argvdata/cpu-eoi-enabled.args | 1 +
tests/qemuxml2argvdata/cpu-exact1.args | 1 +
tests/qemuxml2argvdata/cpu-exact2-nofallback.args | 1 +
tests/qemuxml2argvdata/cpu-exact2.args | 1 +
tests/qemuxml2argvdata/cpu-fallback.args | 1 +
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 1 +
tests/qemuxml2argvdata/cpu-host-model-cmt.args | 1 +
tests/qemuxml2argvdata/cpu-host-model-fallback.args | 1 +
tests/qemuxml2argvdata/cpu-host-model-vendor.args | 1 +
tests/qemuxml2argvdata/cpu-host-model.args | 1 +
.../cpu-host-passthrough-features.args | 1 +
tests/qemuxml2argvdata/cpu-host-passthrough.args | 1 +
tests/qemuxml2argvdata/cpu-hotplug-startup.args | 1 +
tests/qemuxml2argvdata/cpu-kvmclock.args | 1 +
tests/qemuxml2argvdata/cpu-minimum1.args | 1 +
tests/qemuxml2argvdata/cpu-minimum2.args | 1 +
tests/qemuxml2argvdata/cpu-no-removed-features.args | 1 +
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 1 +
tests/qemuxml2argvdata/cpu-numa-memshared.args | 1 +
tests/qemuxml2argvdata/cpu-numa-no-memory-element.args | 1 +
tests/qemuxml2argvdata/cpu-numa1.args | 1 +
tests/qemuxml2argvdata/cpu-numa2.args | 1 +
tests/qemuxml2argvdata/cpu-s390-features.args | 1 +
tests/qemuxml2argvdata/cpu-s390-zEC12.args | 1 +
tests/qemuxml2argvdata/cpu-strict1.args | 1 +
tests/qemuxml2argvdata/cpu-topology1.args | 1 +
tests/qemuxml2argvdata/cpu-topology2.args | 1 +
tests/qemuxml2argvdata/cpu-topology3.args | 1 +
tests/qemuxml2argvdata/cpu-tsc-frequency.args | 1 +
tests/qemuxml2argvdata/cputune-numatune.args | 1 +
tests/qemuxml2argvdata/cputune-zero-shares.args | 1 +
tests/qemuxml2argvdata/cputune.args | 1 +
tests/qemuxml2argvdata/default-kvm-host-arch.args | 1 +
tests/qemuxml2argvdata/default-qemu-host-arch.args | 1 +
tests/qemuxml2argvdata/disk-aio.args | 1 +
tests/qemuxml2argvdata/disk-blockio.args | 1 +
tests/qemuxml2argvdata/disk-boot-cdrom.args | 1 +
tests/qemuxml2argvdata/disk-boot-disk.args | 1 +
tests/qemuxml2argvdata/disk-cdrom-network.args | 1 +
tests/qemuxml2argvdata/disk-cdrom-tray.args | 2 +-
tests/qemuxml2argvdata/disk-cdrom.args | 1 +
tests/qemuxml2argvdata/disk-copy_on_read.args | 2 +-
tests/qemuxml2argvdata/disk-error-policy.args | 1 +
tests/qemuxml2argvdata/disk-floppy-tray.args | 1 +
tests/qemuxml2argvdata/disk-floppy.args | 1 +
tests/qemuxml2argvdata/disk-fmt-qcow.args | 1 +
tests/qemuxml2argvdata/disk-geometry.args | 1 +
tests/qemuxml2argvdata/disk-ide-split.args | 1 +
tests/qemuxml2argvdata/disk-ide-wwn.args | 1 +
tests/qemuxml2argvdata/disk-ioeventfd.args | 2 +-
tests/qemuxml2argvdata/disk-iscsi.args | 1 +
tests/qemuxml2argvdata/disk-network-gluster.args | 1 +
tests/qemuxml2argvdata/disk-network-iscsi-modern.args | 1 +
tests/qemuxml2argvdata/disk-network-iscsi.args | 1 +
tests/qemuxml2argvdata/disk-network-nbd.args | 1 +
tests/qemuxml2argvdata/disk-network-sheepdog.args | 1 +
tests/qemuxml2argvdata/disk-network-source-auth.args | 1 +
tests/qemuxml2argvdata/disk-network-vxhs.args | 1 +
tests/qemuxml2argvdata/disk-no-boot.args | 1 +
tests/qemuxml2argvdata/disk-order.args | 1 +
tests/qemuxml2argvdata/disk-readonly-disk.args | 1 +
tests/qemuxml2argvdata/disk-sata-device.args | 1 +
tests/qemuxml2argvdata/disk-scsi-disk-split.args | 1 +
tests/qemuxml2argvdata/disk-scsi-disk-vpd.args | 1 +
tests/qemuxml2argvdata/disk-scsi-disk-wwn.args | 1 +
tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args | 1 +
tests/qemuxml2argvdata/disk-serial.args | 1 +
tests/qemuxml2argvdata/disk-snapshot.args | 1 +
tests/qemuxml2argvdata/disk-source-pool-mode.args | 1 +
tests/qemuxml2argvdata/disk-source-pool.args | 1 +
tests/qemuxml2argvdata/disk-usb-device-removable.args | 1 +
tests/qemuxml2argvdata/disk-usb-device.args | 1 +
tests/qemuxml2argvdata/disk-virtio-ccw-many.args | 1 +
tests/qemuxml2argvdata/disk-virtio-ccw.args | 1 +
tests/qemuxml2argvdata/disk-virtio-queues.args | 1 +
tests/qemuxml2argvdata/disk-virtio-s390-zpci.args | 1 +
tests/qemuxml2argvdata/disk-virtio.args | 1 +
tests/qemuxml2argvdata/encrypted-disk-usage.args | 1 +
tests/qemuxml2argvdata/encrypted-disk.args | 1 +
tests/qemuxml2argvdata/event_idx.args | 2 +-
tests/qemuxml2argvdata/fd-memory-no-numa-topology.args | 1 +
tests/qemuxml2argvdata/fd-memory-numa-topology.args | 1 +
tests/qemuxml2argvdata/fd-memory-numa-topology2.args | 1 +
tests/qemuxml2argvdata/fd-memory-numa-topology3.args | 1 +
tests/qemuxml2argvdata/floppy-drive-fat.args | 1 +
tests/qemuxml2argvdata/fs9p-ccw.args | 1 +
tests/qemuxml2argvdata/fs9p.args | 1 +
tests/qemuxml2argvdata/graphics-egl-headless.args | 1 +
tests/qemuxml2argvdata/graphics-sdl-fullscreen.args | 1 +
tests/qemuxml2argvdata/graphics-sdl.args | 1 +
.../graphics-spice-agent-file-xfer.args | 1 +
tests/qemuxml2argvdata/graphics-spice-agentmouse.args | 1 +
.../graphics-spice-auto-socket-cfg.args | 1 +
tests/qemuxml2argvdata/graphics-spice-auto-socket.args | 1 +
tests/qemuxml2argvdata/graphics-spice-compression.args | 1 +
.../qemuxml2argvdata/graphics-spice-egl-headless.args | 1 +
tests/qemuxml2argvdata/graphics-spice-no-args.args | 1 +
tests/qemuxml2argvdata/graphics-spice-qxl-vga.args | 1 +
tests/qemuxml2argvdata/graphics-spice-sasl.args | 1 +
tests/qemuxml2argvdata/graphics-spice-socket.args | 1 +
tests/qemuxml2argvdata/graphics-spice-timeout.args | 2 +-
tests/qemuxml2argvdata/graphics-spice-usb-redir.args | 1 +
tests/qemuxml2argvdata/graphics-spice.args | 1 +
.../qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args | 1 +
tests/qemuxml2argvdata/graphics-vnc-auto-socket.args | 1 +
tests/qemuxml2argvdata/graphics-vnc-egl-headless.args | 1 +
.../qemuxml2argvdata/graphics-vnc-no-listen-attr.args | 1 +
tests/qemuxml2argvdata/graphics-vnc-none.args | 1 +
tests/qemuxml2argvdata/graphics-vnc-policy.args | 1 +
.../graphics-vnc-remove-generated-socket.args | 1 +
tests/qemuxml2argvdata/graphics-vnc-sasl.args | 1 +
.../graphics-vnc-socket-new-cmdline.args | 1 +
tests/qemuxml2argvdata/graphics-vnc-socket.args | 1 +
tests/qemuxml2argvdata/graphics-vnc-tls.args | 1 +
tests/qemuxml2argvdata/graphics-vnc-websocket.args | 1 +
tests/qemuxml2argvdata/graphics-vnc.args | 1 +
tests/qemuxml2argvdata/hostdev-mdev-precreated.args | 1 +
tests/qemuxml2argvdata/hostdev-pci-address-device.args | 1 +
.../hostdev-pci-address-unassigned.args | 1 +
tests/qemuxml2argvdata/hostdev-pci-address.args | 1 +
tests/qemuxml2argvdata/hostdev-pci-multifunction.args | 1 +
.../qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args | 1 +
.../qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args | 1 +
.../qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args | 1 +
.../qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args | 1 +
.../hostdev-usb-address-device-boot.args | 1 +
tests/qemuxml2argvdata/hostdev-usb-address-device.args | 1 +
tests/qemuxml2argvdata/hostdev-usb-address.args | 1 +
tests/qemuxml2argvdata/hostdev-vfio-multidomain.args | 1 +
.../hostdev-vfio-zpci-autogenerate-fids.args | 1 +
.../hostdev-vfio-zpci-autogenerate-uids.args | 1 +
.../hostdev-vfio-zpci-autogenerate.args | 1 +
.../qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args | 1 +
.../hostdev-vfio-zpci-ccw-memballoon.args | 1 +
.../hostdev-vfio-zpci-multidomain-many.args | 1 +
tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 1 +
tests/qemuxml2argvdata/hostdev-vfio.args | 1 +
tests/qemuxml2argvdata/hotplug-base.args | 1 +
tests/qemuxml2argvdata/hugepages-default-2M.args | 1 +
.../hugepages-default-system-size.args | 1 +
tests/qemuxml2argvdata/hugepages-default.args | 1 +
tests/qemuxml2argvdata/hugepages-memaccess.args | 1 +
tests/qemuxml2argvdata/hugepages-memaccess2.args | 1 +
tests/qemuxml2argvdata/hugepages-nodeset.args | 1 +
tests/qemuxml2argvdata/hugepages-numa-default-2M.args | 1 +
.../qemuxml2argvdata/hugepages-numa-default-dimm.args | 1 +
tests/qemuxml2argvdata/hugepages-numa-default.args | 1 +
.../qemuxml2argvdata/hugepages-numa-nodeset-part.args | 1 +
tests/qemuxml2argvdata/hugepages-numa-nodeset.args | 1 +
tests/qemuxml2argvdata/hugepages-shared.args | 1 +
tests/qemuxml2argvdata/input-usbmouse-addr.args | 1 +
tests/qemuxml2argvdata/input-usbmouse.args | 1 +
tests/qemuxml2argvdata/input-usbtablet.args | 1 +
tests/qemuxml2argvdata/input-virtio-ccw.args | 1 +
tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args | 1 +
tests/qemuxml2argvdata/iothreads-disk.args | 1 +
tests/qemuxml2argvdata/iothreads-ids-partial.args | 1 +
tests/qemuxml2argvdata/iothreads-ids.args | 1 +
tests/qemuxml2argvdata/iothreads.args | 1 +
tests/qemuxml2argvdata/kvm-features-off.args | 1 +
tests/qemuxml2argvdata/kvm-features.args | 1 +
tests/qemuxml2argvdata/kvm-pit-delay.args | 1 +
tests/qemuxml2argvdata/kvm-pit-discard.args | 1 +
tests/qemuxml2argvdata/kvmclock.args | 1 +
tests/qemuxml2argvdata/luks-disks-source-qcow2.args | 1 +
tests/qemuxml2argvdata/luks-disks-source.args | 1 +
tests/qemuxml2argvdata/luks-disks.args | 1 +
tests/qemuxml2argvdata/mach-virt-console-virtio.args | 1 +
tests/qemuxml2argvdata/mach-virt-serial-native.args | 1 +
tests/qemuxml2argvdata/mach-virt-serial-pci.args | 1 +
tests/qemuxml2argvdata/mach-virt-serial-usb.args | 1 +
tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args | 1 +
.../qemuxml2argvdata/machine-aeskeywrap-off-caps.args | 1 +
tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args | 1 +
tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args | 1 +
tests/qemuxml2argvdata/machine-aliases1.args | 1 +
tests/qemuxml2argvdata/machine-aliases2.args | 1 +
tests/qemuxml2argvdata/machine-core-off.args | 1 +
tests/qemuxml2argvdata/machine-core-on.args | 1 +
tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args | 1 +
.../qemuxml2argvdata/machine-deakeywrap-off-caps.args | 1 +
tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args | 1 +
tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args | 1 +
tests/qemuxml2argvdata/machine-keywrap-none-caps.args | 1 +
tests/qemuxml2argvdata/machine-keywrap-none.args | 1 +
.../machine-loadparm-multiple-disks-nets-s390.args | 1 +
tests/qemuxml2argvdata/machine-loadparm-net-s390.args | 1 +
tests/qemuxml2argvdata/machine-loadparm-s390.args | 1 +
tests/qemuxml2argvdata/machine-smm-opt.args | 1 +
tests/qemuxml2argvdata/machine-vmport-opt.args | 1 +
tests/qemuxml2argvdata/master-key.args | 1 +
tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args | 1 +
tests/qemuxml2argvdata/memory-hotplug-dimm.args | 1 +
.../memory-hotplug-nvdimm-ppc64-abi-update.args | 1 +
.../qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args | 1 +
.../memory-hotplug-ppc64-nonuma-abi-update.args | 1 +
.../qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args | 1 +
tests/qemuxml2argvdata/memory-hotplug.args | 1 +
tests/qemuxml2argvdata/memtune-unlimited.args | 1 +
tests/qemuxml2argvdata/memtune.args | 1 +
tests/qemuxml2argvdata/migrate-numa-unaligned.args | 1 +
tests/qemuxml2argvdata/migrate.args | 1 +
tests/qemuxml2argvdata/minimal.args | 1 +
tests/qemuxml2argvdata/misc-acpi.args | 1 +
tests/qemuxml2argvdata/misc-disable-s3.args | 1 +
tests/qemuxml2argvdata/misc-disable-suspends.args | 1 +
tests/qemuxml2argvdata/misc-enable-s4.args | 1 +
tests/qemuxml2argvdata/misc-no-reboot.args | 1 +
tests/qemuxml2argvdata/misc-uuid.args | 1 +
tests/qemuxml2argvdata/monitor-json.args | 1 +
tests/qemuxml2argvdata/multifunction-pci-device.args | 1 +
tests/qemuxml2argvdata/name-escape.args | 1 +
tests/qemuxml2argvdata/net-client.args | 1 +
tests/qemuxml2argvdata/net-eth-hostip.args | 1 +
tests/qemuxml2argvdata/net-eth-ifname.args | 1 +
tests/qemuxml2argvdata/net-eth-names.args | 1 +
tests/qemuxml2argvdata/net-eth-unmanaged-tap.args | 1 +
tests/qemuxml2argvdata/net-eth.args | 1 +
tests/qemuxml2argvdata/net-hostdev-bootorder.args | 1 +
tests/qemuxml2argvdata/net-hostdev-multidomain.args | 1 +
.../qemuxml2argvdata/net-hostdev-vfio-multidomain.args | 1 +
tests/qemuxml2argvdata/net-hostdev-vfio.args | 1 +
tests/qemuxml2argvdata/net-hostdev.args | 1 +
tests/qemuxml2argvdata/net-many-models.args | 1 +
tests/qemuxml2argvdata/net-mcast.args | 1 +
tests/qemuxml2argvdata/net-server.args | 1 +
tests/qemuxml2argvdata/net-udp.args | 1 +
tests/qemuxml2argvdata/net-user-addr.args | 1 +
tests/qemuxml2argvdata/net-user.args | 1 +
tests/qemuxml2argvdata/net-vhostuser-multiq.args | 1 +
tests/qemuxml2argvdata/net-vhostuser.args | 1 +
tests/qemuxml2argvdata/net-virtio-ccw.args | 1 +
tests/qemuxml2argvdata/net-virtio-device.args | 1 +
.../qemuxml2argvdata/net-virtio-disable-offloads.args | 1 +
tests/qemuxml2argvdata/net-virtio-netdev.args | 1 +
tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args | 1 +
tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args | 1 +
tests/qemuxml2argvdata/net-virtio-teaming.args | 1 +
tests/qemuxml2argvdata/net-virtio.args | 1 +
tests/qemuxml2argvdata/nosharepages.args | 1 +
.../numad-auto-memory-vcpu-cpuset.args | 1 +
...numad-auto-memory-vcpu-no-cpuset-and-placement.args | 1 +
.../numad-auto-vcpu-static-numatune.args | 1 +
.../numad-static-memory-auto-vcpu.args | 1 +
tests/qemuxml2argvdata/numad.args | 1 +
.../numatune-auto-nodeset-invalid.args | 1 +
tests/qemuxml2argvdata/numatune-auto-prefer.args | 1 +
tests/qemuxml2argvdata/numatune-distances.args | 1 +
tests/qemuxml2argvdata/numatune-memnode-no-memory.args | 1 +
tests/qemuxml2argvdata/numatune-memnode.args | 1 +
tests/qemuxml2argvdata/numatune-memory.args | 1 +
tests/qemuxml2argvdata/numatune-no-vcpu.args | 1 +
tests/qemuxml2argvdata/pages-dimm-discard.args | 1 +
tests/qemuxml2argvdata/pages-discard-hugepages.args | 1 +
tests/qemuxml2argvdata/pages-discard.args | 1 +
tests/qemuxml2argvdata/panic-double.args | 1 +
tests/qemuxml2argvdata/panic-no-address.args | 1 +
tests/qemuxml2argvdata/panic.args | 1 +
tests/qemuxml2argvdata/parallel-parport-chardev.args | 1 +
tests/qemuxml2argvdata/parallel-tcp-chardev.args | 1 +
tests/qemuxml2argvdata/pci-autoadd-addr.args | 1 +
tests/qemuxml2argvdata/pci-autoadd-idx.args | 1 +
tests/qemuxml2argvdata/pci-autofill-addr.args | 1 +
tests/qemuxml2argvdata/pci-bridge-many-disks.args | 1 +
tests/qemuxml2argvdata/pci-bridge.args | 1 +
tests/qemuxml2argvdata/pci-expander-bus.args | 1 +
tests/qemuxml2argvdata/pci-many.args | 1 +
tests/qemuxml2argvdata/pci-rom-disabled.args | 1 +
tests/qemuxml2argvdata/pci-rom.args | 1 +
tests/qemuxml2argvdata/pci-serial-dev-chardev.args | 1 +
tests/qemuxml2argvdata/pcie-expander-bus.args | 1 +
.../qemuxml2argvdata/pcie-root-port-model-generic.args | 1 +
.../qemuxml2argvdata/pcie-root-port-model-ioh3420.args | 1 +
tests/qemuxml2argvdata/pcie-root-port.args | 1 +
tests/qemuxml2argvdata/pcie-root.args | 1 +
.../qemuxml2argvdata/pcie-switch-downstream-port.args | 1 +
tests/qemuxml2argvdata/pcie-switch-upstream-port.args | 1 +
tests/qemuxml2argvdata/pcihole64-q35.args | 1 +
tests/qemuxml2argvdata/pcihole64.args | 1 +
tests/qemuxml2argvdata/pmu-feature-off.args | 1 +
tests/qemuxml2argvdata/pmu-feature.args | 1 +
tests/qemuxml2argvdata/ppc-dtb.args | 1 +
.../qemuxml2argvdata/ppc64-usb-controller-legacy.args | 1 +
.../ppc64-usb-controller-qemu-xhci.args | 1 +
tests/qemuxml2argvdata/ppc64-usb-controller.args | 1 +
tests/qemuxml2argvdata/ppce500-serial.args | 1 +
tests/qemuxml2argvdata/pseries-basic.args | 1 +
tests/qemuxml2argvdata/pseries-console-virtio.args | 1 +
tests/qemuxml2argvdata/pseries-cpu-compat-power9.args | 1 +
tests/qemuxml2argvdata/pseries-cpu-compat.args | 1 +
tests/qemuxml2argvdata/pseries-cpu-exact.args | 1 +
tests/qemuxml2argvdata/pseries-cpu-le.args | 1 +
tests/qemuxml2argvdata/pseries-features.args | 1 +
tests/qemuxml2argvdata/pseries-hostdevs-1.args | 1 +
tests/qemuxml2argvdata/pseries-hostdevs-2.args | 1 +
tests/qemuxml2argvdata/pseries-hostdevs-3.args | 1 +
.../pseries-machine-max-cpu-compat.args | 1 +
tests/qemuxml2argvdata/pseries-many-buses-1.args | 1 +
tests/qemuxml2argvdata/pseries-many-buses-2.args | 1 +
tests/qemuxml2argvdata/pseries-many-devices.args | 1 +
tests/qemuxml2argvdata/pseries-nvram.args | 1 +
tests/qemuxml2argvdata/pseries-panic-missing.args | 1 +
tests/qemuxml2argvdata/pseries-panic-no-address.args | 1 +
.../qemuxml2argvdata/pseries-phb-default-missing.args | 1 +
tests/qemuxml2argvdata/pseries-phb-numa-node.args | 1 +
tests/qemuxml2argvdata/pseries-phb-simple.args | 1 +
tests/qemuxml2argvdata/pseries-serial-native.args | 1 +
tests/qemuxml2argvdata/pseries-serial-pci.args | 1 +
tests/qemuxml2argvdata/pseries-serial-usb.args | 1 +
tests/qemuxml2argvdata/pseries-usb-default.args | 1 +
tests/qemuxml2argvdata/pseries-usb-kbd.args | 1 +
tests/qemuxml2argvdata/pseries-usb-multi.args | 1 +
tests/qemuxml2argvdata/pseries-vio-user-assigned.args | 1 +
tests/qemuxml2argvdata/pseries-vio.args | 1 +
tests/qemuxml2argvdata/q35-acpi-nouefi.args | 1 +
tests/qemuxml2argvdata/q35-acpi-uefi.args | 1 +
tests/qemuxml2argvdata/q35-default-devices-only.args | 1 +
tests/qemuxml2argvdata/q35-multifunction.args | 1 +
tests/qemuxml2argvdata/q35-noacpi-nouefi.args | 1 +
tests/qemuxml2argvdata/q35-pci-force-address.args | 1 +
tests/qemuxml2argvdata/q35-pcie-autoadd.args | 1 +
tests/qemuxml2argvdata/q35-pcie.args | 1 +
tests/qemuxml2argvdata/q35-pm-disable-fallback.args | 1 +
tests/qemuxml2argvdata/q35-pm-disable.args | 1 +
tests/qemuxml2argvdata/q35-usb2-multi.args | 1 +
tests/qemuxml2argvdata/q35-usb2-reorder.args | 1 +
tests/qemuxml2argvdata/q35-usb2.args | 1 +
tests/qemuxml2argvdata/q35-virt-manager-basic.args | 1 +
tests/qemuxml2argvdata/q35-virtio-pci.args | 1 +
tests/qemuxml2argvdata/q35.args | 1 +
tests/qemuxml2argvdata/qemu-ns-alt.args | 1 +
tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args | 1 +
tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args | 1 +
tests/qemuxml2argvdata/qemu-ns-commandline.args | 1 +
.../qemu-ns-domain-commandline-ns0.args | 1 +
tests/qemuxml2argvdata/qemu-ns-domain-commandline.args | 1 +
tests/qemuxml2argvdata/qemu-ns-domain-ns0.args | 1 +
tests/qemuxml2argvdata/qemu-ns-no-env.args | 1 +
tests/qemuxml2argvdata/reboot-timeout-disabled.args | 2 +-
tests/qemuxml2argvdata/reboot-timeout-enabled.args | 2 +-
tests/qemuxml2argvdata/restore-v2-fd.args | 1 +
tests/qemuxml2argvdata/restore-v2.args | 1 +
tests/qemuxml2argvdata/riscv64-virt-pci.args | 1 +
tests/qemuxml2argvdata/riscv64-virt.args | 1 +
tests/qemuxml2argvdata/s390-panic-missing.args | 1 +
tests/qemuxml2argvdata/s390-panic-no-address.args | 1 +
tests/qemuxml2argvdata/s390-serial-2.args | 1 +
tests/qemuxml2argvdata/s390-serial-console.args | 1 +
tests/qemuxml2argvdata/s390-serial.args | 1 +
tests/qemuxml2argvdata/seclabel-dac-none.args | 1 +
tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args | 1 +
tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args | 1 +
tests/qemuxml2argvdata/seclabel-dynamic-override.args | 1 +
tests/qemuxml2argvdata/seclabel-dynamic-relabel.args | 1 +
tests/qemuxml2argvdata/seclabel-dynamic.args | 1 +
tests/qemuxml2argvdata/seclabel-none.args | 1 +
tests/qemuxml2argvdata/seclabel-static-labelskip.args | 1 +
tests/qemuxml2argvdata/seclabel-static-relabel.args | 1 +
tests/qemuxml2argvdata/seclabel-static.args | 1 +
tests/qemuxml2argvdata/serial-dev-chardev-iobase.args | 1 +
tests/qemuxml2argvdata/serial-dev-chardev.args | 1 +
tests/qemuxml2argvdata/serial-file-chardev.args | 1 +
tests/qemuxml2argvdata/serial-file-log.args | 1 +
tests/qemuxml2argvdata/serial-many-chardev.args | 1 +
tests/qemuxml2argvdata/serial-pty-chardev.args | 1 +
tests/qemuxml2argvdata/serial-spiceport-nospice.args | 1 +
tests/qemuxml2argvdata/serial-spiceport.args | 1 +
tests/qemuxml2argvdata/serial-tcp-chardev.args | 1 +
tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args | 1 +
.../serial-tcp-tlsx509-chardev-notls.args | 1 +
.../serial-tcp-tlsx509-chardev-verify.args | 1 +
tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args | 1 +
.../serial-tcp-tlsx509-secret-chardev.args | 1 +
tests/qemuxml2argvdata/serial-udp-chardev.args | 1 +
tests/qemuxml2argvdata/serial-unix-chardev.args | 1 +
tests/qemuxml2argvdata/serial-vc-chardev.args | 1 +
tests/qemuxml2argvdata/shmem-plain-doorbell.args | 1 +
tests/qemuxml2argvdata/shmem.args | 1 +
tests/qemuxml2argvdata/smartcard-controller.args | 1 +
.../smartcard-host-certificates-database.args | 1 +
.../qemuxml2argvdata/smartcard-host-certificates.args | 1 +
tests/qemuxml2argvdata/smartcard-host.args | 1 +
.../smartcard-passthrough-spicevmc.args | 1 +
tests/qemuxml2argvdata/smartcard-passthrough-tcp.args | 1 +
tests/qemuxml2argvdata/smbios-type-fwcfg.args | 1 +
tests/qemuxml2argvdata/smbios.args | 1 +
tests/qemuxml2argvdata/smp-dies.args | 1 +
tests/qemuxml2argvdata/smp.args | 1 +
tests/qemuxml2argvdata/sound-device.args | 1 +
tests/qemuxml2argvdata/sound.args | 1 +
tests/qemuxml2argvdata/sparc-minimal.args | 1 +
tests/qemuxml2argvdata/usb-controller-default-q35.args | 1 +
.../qemuxml2argvdata/usb-controller-explicit-q35.args | 1 +
tests/qemuxml2argvdata/usb-controller-qemu-xhci.args | 1 +
tests/qemuxml2argvdata/usb-controller-xhci.args | 1 +
tests/qemuxml2argvdata/usb-controller.args | 1 +
tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args | 1 +
tests/qemuxml2argvdata/usb-hub-autoadd.args | 1 +
tests/qemuxml2argvdata/usb-hub.args | 1 +
tests/qemuxml2argvdata/usb-ich9-autoassign.args | 1 +
tests/qemuxml2argvdata/usb-ich9-companion.args | 1 +
tests/qemuxml2argvdata/usb-ich9-ehci-addr.args | 1 +
tests/qemuxml2argvdata/usb-long-port-path.args | 1 +
tests/qemuxml2argvdata/usb-none.args | 1 +
tests/qemuxml2argvdata/usb-piix3-controller.args | 1 +
tests/qemuxml2argvdata/usb-port-autoassign.args | 1 +
tests/qemuxml2argvdata/usb-port-missing.args | 1 +
tests/qemuxml2argvdata/usb-ports.args | 1 +
tests/qemuxml2argvdata/usb-redir-boot.args | 1 +
tests/qemuxml2argvdata/usb-redir-filter-version.args | 1 +
tests/qemuxml2argvdata/usb-redir-filter.args | 1 +
tests/qemuxml2argvdata/usb-redir.args | 1 +
tests/qemuxml2argvdata/usb-xhci-autoassign.args | 1 +
tests/qemuxml2argvdata/usb1-usb2.args | 1 +
tests/qemuxml2argvdata/user-aliases-usb.args | 1 +
tests/qemuxml2argvdata/user-aliases.args | 1 +
tests/qemuxml2argvdata/vcpu-placement-static.args | 1 +
.../qemuxml2argvdata/video-device-pciaddr-default.args | 1 +
tests/qemuxml2argvdata/video-none-device.args | 1 +
tests/qemuxml2argvdata/video-qxl-device-vgamem.args | 1 +
tests/qemuxml2argvdata/video-qxl-device.args | 1 +
tests/qemuxml2argvdata/video-qxl-heads.args | 1 +
tests/qemuxml2argvdata/video-qxl-noheads.args | 1 +
tests/qemuxml2argvdata/video-qxl-resolution.args | 1 +
.../qemuxml2argvdata/video-qxl-sec-device-vgamem.args | 1 +
tests/qemuxml2argvdata/video-qxl-sec-device.args | 1 +
tests/qemuxml2argvdata/video-vga-device-vgamem.args | 1 +
tests/qemuxml2argvdata/video-vga-device.args | 1 +
tests/qemuxml2argvdata/video-vga-qxl-heads.args | 1 +
tests/qemuxml2argvdata/video-virtio-gpu-ccw.args | 1 +
tests/qemuxml2argvdata/video-virtio-gpu-device.args | 1 +
tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args | 1 +
tests/qemuxml2argvdata/video-virtio-gpu-secondary.args | 1 +
tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args | 1 +
tests/qemuxml2argvdata/video-virtio-gpu-virgl.args | 1 +
tests/qemuxml2argvdata/video-virtio-vga.args | 1 +
tests/qemuxml2argvdata/virtio-input-passthrough.args | 1 +
tests/qemuxml2argvdata/virtio-input.args | 1 +
tests/qemuxml2argvdata/virtio-lun.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-ccw.args | 1 +
tests/qemuxml2argvdata/virtio-rng-default.args | 1 +
tests/qemuxml2argvdata/virtio-rng-egd.args | 1 +
tests/qemuxml2argvdata/virtio-rng-multiple.args | 1 +
tests/qemuxml2argvdata/virtio-rng-random.args | 1 +
tests/qemuxml2argvdata/vmcoreinfo.args | 1 +
tests/qemuxml2argvdata/watchdog-device.args | 1 +
tests/qemuxml2argvdata/watchdog-dump.args | 1 +
tests/qemuxml2argvdata/watchdog-injectnmi.args | 1 +
tests/qemuxml2argvdata/watchdog.args | 1 +
tests/qemuxml2argvdata/x86-kvm-32-on-64.args | 1 +
tests/qemuxml2argvtest.c | 1 -
564 files changed, 565 insertions(+), 25 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 73868ab4b7..c626acee8c 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6203,8 +6203,7 @@ qemuBuildPMCommandLine(virCommand *cmd,
static int
qemuBuildBootCommandLine(virCommand *cmd,
- const virDomainDef *def,
- virQEMUCaps *qemuCaps)
+ const virDomainDef *def)
{
g_auto(virBuffer) boot_buf = VIR_BUFFER_INITIALIZER;
g_autofree char *boot_opts_str = NULL;
@@ -6225,10 +6224,7 @@ qemuBuildBootCommandLine(virCommand *cmd,
if (def->os.bm_timeout_set)
virBufferAsprintf(&boot_buf, "splash-time=%u,", def->os.bm_timeout);
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BOOT_STRICT))
- virBufferAddLit(&boot_buf, "strict=on,");
-
- virBufferTrim(&boot_buf, ",");
+ virBufferAddLit(&boot_buf, "strict=on");
boot_opts_str = virBufferContentAndReset(&boot_buf);
if (boot_opts_str) {
@@ -10560,7 +10556,7 @@ qemuBuildCommandLine(virQEMUDriver *driver,
if (qemuBuildPMCommandLine(cmd, def, priv) < 0)
return NULL;
- if (qemuBuildBootCommandLine(cmd, def, qemuCaps) < 0)
+ if (qemuBuildBootCommandLine(cmd, def) < 0)
return NULL;
if (qemuBuildIOMMUCommandLine(cmd, def) < 0)
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index 821204aaee..2c22d808c1 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-kernel /aarch64.kernel \
-initrd /aarch64.initrd \
-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
index 87c76dc1e8..cd65e44611 100644
--- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
@@ -25,4 +25,5 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
index 42b20b789a..581cd96752 100644
--- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
+++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-drive file=/aarch64.raw,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args b/tests/qemuxml2argvdata/aarch64-gic-host.args
index cbb58cf3fb..f451c9ff68 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-host.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-host.args
@@ -24,4 +24,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
index 9b7ebea60e..7080701c95 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
@@ -24,4 +24,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args b/tests/qemuxml2argvdata/aarch64-gic-v2.args
index 9b2acc95ca..46c31127af 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v2.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v2.args
@@ -24,4 +24,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args b/tests/qemuxml2argvdata/aarch64-gic-v3.args
index f620955dd4..acf10ec0b2 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v3.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v3.args
@@ -24,4 +24,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
index 5c11c5cfd1..bb6dd39c3d 100644
--- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-kernel /arm.kernel \
-initrd /arm.initrd \
-append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \
diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
index 84f3dbf554..c99e6138f4 100644
--- a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
+++ b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-kernel /var/lib/libvirt/images/guest.vmlinuz \
-initrd /var/lib/libvirt/images/guest.initramfs \
-append 'console=ttyAMA0 rw root=/dev/vda rootwait' \
diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
index 26e56d7bc9..edbe667606 100644
--- a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
+++ b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
@@ -26,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-pci-serial.args b/tests/qemuxml2argvdata/aarch64-pci-serial.args
index b3d424b913..41073b84ed 100644
--- a/tests/qemuxml2argvdata/aarch64-pci-serial.args
+++ b/tests/qemuxml2argvdata/aarch64-pci-serial.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device pcie-root-port,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.args b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
index 4ed2bba46b..ece10b258d 100644
--- a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device pcie-root-port,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
-device pcie-pci-bridge,id=pci.2,bus=pci.1,addr=0x0 \
-device pcie-root-port,port=0x9,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x1 \
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
index af633b2552..1840334b98 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
@@ -23,5 +23,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device nec-usb-xhci,id=usb,bus=pcie.0,addr=0x1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
index d109078c0d..23290c624c 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
@@ -23,5 +23,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device qemu-xhci,id=usb,bus=pcie.0,addr=0x1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-video-default.args b/tests/qemuxml2argvdata/aarch64-video-default.args
index 7919618df4..3da5c13f55 100644
--- a/tests/qemuxml2argvdata/aarch64-video-default.args
+++ b/tests/qemuxml2argvdata/aarch64-video-default.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
index b6e0fd0313..638e304b89 100644
--- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ioh3420,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
-device ioh3420,port=0x9,chassis=2,id=pci.2,bus=pcie.0,multifunction=on,addr=0x1.0x1 \
-netdev user,id=hostnet0 \
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 0731a04cf1..926266bd2e 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-kernel /aarch64.kernel \
-initrd /aarch64.initrd \
-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
index cd5aa88997..d6290d486c 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-kernel /aarch64.kernel \
-initrd /aarch64.initrd \
-append console=ttyAMA0 \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
index 9fd12fda10..00c90cc93e 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-kernel /aarch64.kernel \
-initrd /aarch64.initrd \
-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
index ffcbd0e04b..bd617a3fec 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-kernel /aarch64.kernel \
-initrd /aarch64.initrd \
-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
index 489acc6f2e..f53ee1570a 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-kernel /aarch64.kernel \
-initrd /aarch64.initrd \
-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
diff --git a/tests/qemuxml2argvdata/acpi-table.args b/tests/qemuxml2argvdata/acpi-table.args
index f4441ea8d2..0cf2a4e9e1 100644
--- a/tests/qemuxml2argvdata/acpi-table.args
+++ b/tests/qemuxml2argvdata/acpi-table.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-acpitable sig=SLIC,file=/var/lib/libvirt/acpi/slic.dat \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
index 773b9cdad3..15bc5e0c55 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-kernel /arm.kernel \
-initrd /arm.initrd \
-append 'console=ttyAMA0,115200n8 rw root=/dev/mmcblk0p3 rootwait physmap.enabled=0' \
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
index ede8740a2f..1a410872b6 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-kernel /arm.kernel \
-initrd /arm.initrd \
-append console=ttyAMA0,115200n8 \
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
index 1b0e2199d1..87edf5b2a4 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-kernel /arm.kernel \
-initrd /arm.initrd \
-append 'console=ttyAMA0,115200n8 rw root=/dev/vda3 rootwait physmap.enabled=0' \
diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.args b/tests/qemuxml2argvdata/arm-virt-virtio.args
index 3647bb30dd..8cdb49f5ec 100644
--- a/tests/qemuxml2argvdata/arm-virt-virtio.args
+++ b/tests/qemuxml2argvdata/arm-virt-virtio.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-kernel /arm.kernel \
-initrd /arm.initrd \
-append 'console=ttyAMA0,115200n8 rw root=/dev/vda rootwait physmap.enabled=0' \
diff --git a/tests/qemuxml2argvdata/audio-alsa-best.args b/tests/qemuxml2argvdata/audio-alsa-best.args
index b25a826391..cdc04fb469 100644
--- a/tests/qemuxml2argvdata/audio-alsa-best.args
+++ b/tests/qemuxml2argvdata/audio-alsa-best.args
@@ -36,6 +36,7 @@ QEMU_AUDIO_DAC_DEV=/dev/dsp1 \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-alsa-minimal.args b/tests/qemuxml2argvdata/audio-alsa-minimal.args
index 76a1cbfa9b..31ac502e38 100644
--- a/tests/qemuxml2argvdata/audio-alsa-minimal.args
+++ b/tests/qemuxml2argvdata/audio-alsa-minimal.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=alsa \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-best.args b/tests/qemuxml2argvdata/audio-coreaudio-best.args
index 953feb036f..defdbbc7bc 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-best.args
+++ b/tests/qemuxml2argvdata/audio-coreaudio-best.args
@@ -36,6 +36,7 @@ QEMU_COREAUDIO_BUFFER_SIZE=200 \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-coreaudio-minimal.args b/tests/qemuxml2argvdata/audio-coreaudio-minimal.args
index 6ca9b0a06c..740a31f791 100644
--- a/tests/qemuxml2argvdata/audio-coreaudio-minimal.args
+++ b/tests/qemuxml2argvdata/audio-coreaudio-minimal.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=coreaudio \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-default-nographics.args b/tests/qemuxml2argvdata/audio-default-nographics.args
index 76a1cbfa9b..31ac502e38 100644
--- a/tests/qemuxml2argvdata/audio-default-nographics.args
+++ b/tests/qemuxml2argvdata/audio-default-nographics.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=alsa \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-default-sdl.args b/tests/qemuxml2argvdata/audio-default-sdl.args
index bdb145e5f7..9e57c39886 100644
--- a/tests/qemuxml2argvdata/audio-default-sdl.args
+++ b/tests/qemuxml2argvdata/audio-default-sdl.args
@@ -23,6 +23,7 @@ SDL_AUDIODRIVER=esd \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-default-spice.args b/tests/qemuxml2argvdata/audio-default-spice.args
index 7600e2de7e..735f8fb52d 100644
--- a/tests/qemuxml2argvdata/audio-default-spice.args
+++ b/tests/qemuxml2argvdata/audio-default-spice.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-default-vnc.args b/tests/qemuxml2argvdata/audio-default-vnc.args
index 659026fcec..7520b5bd99 100644
--- a/tests/qemuxml2argvdata/audio-default-vnc.args
+++ b/tests/qemuxml2argvdata/audio-default-vnc.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=alsa \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-file-best.args b/tests/qemuxml2argvdata/audio-file-best.args
index 83dd021dbb..adc467803c 100644
--- a/tests/qemuxml2argvdata/audio-file-best.args
+++ b/tests/qemuxml2argvdata/audio-file-best.args
@@ -35,6 +35,7 @@ QEMU_WAV_PATH=audio.wav \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-file-minimal.args b/tests/qemuxml2argvdata/audio-file-minimal.args
index fca322f77b..b458361a05 100644
--- a/tests/qemuxml2argvdata/audio-file-minimal.args
+++ b/tests/qemuxml2argvdata/audio-file-minimal.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=wav \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-none-best.args b/tests/qemuxml2argvdata/audio-none-best.args
index 48866a7627..ccfbaf6273 100644
--- a/tests/qemuxml2argvdata/audio-none-best.args
+++ b/tests/qemuxml2argvdata/audio-none-best.args
@@ -34,6 +34,7 @@ QEMU_AUDIO_DAC_FIXED_FMT=f32 \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-none-minimal.args b/tests/qemuxml2argvdata/audio-none-minimal.args
index c729c00503..431457dead 100644
--- a/tests/qemuxml2argvdata/audio-none-minimal.args
+++ b/tests/qemuxml2argvdata/audio-none-minimal.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-oss-best.args b/tests/qemuxml2argvdata/audio-oss-best.args
index fc5cbcb82a..9b4d93f0c4 100644
--- a/tests/qemuxml2argvdata/audio-oss-best.args
+++ b/tests/qemuxml2argvdata/audio-oss-best.args
@@ -39,6 +39,7 @@ QEMU_OSS_NFRAGS=30 \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-oss-minimal.args b/tests/qemuxml2argvdata/audio-oss-minimal.args
index d02512f046..8295db971f 100644
--- a/tests/qemuxml2argvdata/audio-oss-minimal.args
+++ b/tests/qemuxml2argvdata/audio-oss-minimal.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=oss \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-best.args b/tests/qemuxml2argvdata/audio-pulseaudio-best.args
index f3e816a8e5..6a026741ee 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-best.args
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-best.args
@@ -38,6 +38,7 @@ QEMU_PA_SERVER=%s=acme.example.org \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.args b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.args
index 49042412b7..7e9b4e90c4 100644
--- a/tests/qemuxml2argvdata/audio-pulseaudio-minimal.args
+++ b/tests/qemuxml2argvdata/audio-pulseaudio-minimal.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=pa \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-sdl-best.args b/tests/qemuxml2argvdata/audio-sdl-best.args
index 997b3e1a9d..a049d48f22 100644
--- a/tests/qemuxml2argvdata/audio-sdl-best.args
+++ b/tests/qemuxml2argvdata/audio-sdl-best.args
@@ -36,6 +36,7 @@ SDL_AUDIODRIVER=pulseaudio \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-sdl-minimal.args b/tests/qemuxml2argvdata/audio-sdl-minimal.args
index 3901ca9e5d..8e8a397635 100644
--- a/tests/qemuxml2argvdata/audio-sdl-minimal.args
+++ b/tests/qemuxml2argvdata/audio-sdl-minimal.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=sdl \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-spice-best.args b/tests/qemuxml2argvdata/audio-spice-best.args
index e08406c211..62248cbd84 100644
--- a/tests/qemuxml2argvdata/audio-spice-best.args
+++ b/tests/qemuxml2argvdata/audio-spice-best.args
@@ -34,6 +34,7 @@ QEMU_AUDIO_DAC_FIXED_FMT=f32 \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/audio-spice-minimal.args b/tests/qemuxml2argvdata/audio-spice-minimal.args
index 4e249affb1..d250328ee1 100644
--- a/tests/qemuxml2argvdata/audio-spice-minimal.args
+++ b/tests/qemuxml2argvdata/audio-spice-minimal.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata/autoindex.args
index 720faa313e..23e9b73182 100644
--- a/tests/qemuxml2argvdata/autoindex.args
+++ b/tests/qemuxml2argvdata/autoindex.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.args b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
index 7aa27e424e..c14304907c 100644
--- a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
@@ -22,5 +22,6 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a,deflate-on-oom=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.args
index 5bfb18196f..34895f1a70 100644
--- a/tests/qemuxml2argvdata/balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/balloon-device-auto.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
index 639a5fa761..e1e589bb96 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.args
index 458fb7704d..e4140235cb 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.args
index 63843b9a38..4522e25bd3 100644
--- a/tests/qemuxml2argvdata/balloon-device-period.args
+++ b/tests/qemuxml2argvdata/balloon-device-period.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2argvdata/balloon-device.args
index 63843b9a38..4522e25bd3 100644
--- a/tests/qemuxml2argvdata/balloon-device.args
+++ b/tests/qemuxml2argvdata/balloon-device.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.args b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
index 40a26a2605..4989f9ee4a 100644
--- a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-kernel /aarch64.kernel \
-initrd /aarch64.initrd \
-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args b/tests/qemuxml2argvdata/bios-nvram-secure.args
index 0bc5e7591b..c1053b263b 100644
--- a/tests/qemuxml2argvdata/bios-nvram-secure.args
+++ b/tests/qemuxml2argvdata/bios-nvram-secure.args
@@ -25,7 +25,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--boot menu=on \
+-boot menu=on,strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
diff --git a/tests/qemuxml2argvdata/bios-nvram.args b/tests/qemuxml2argvdata/bios-nvram.args
index 44bb1c8564..e18ba68c3a 100644
--- a/tests/qemuxml2argvdata/bios-nvram.args
+++ b/tests/qemuxml2argvdata/bios-nvram.args
@@ -24,7 +24,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--boot menu=on \
+-boot menu=on,strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/bios.args
index 7d831a716d..ba9297fe12 100644
--- a/tests/qemuxml2argvdata/bios.args
+++ b/tests/qemuxml2argvdata/bios.args
@@ -24,7 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--boot menu=on \
+-boot menu=on,strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args
index 5bfb18196f..34895f1a70 100644
--- a/tests/qemuxml2argvdata/blkiotune-device.args
+++ b/tests/qemuxml2argvdata/blkiotune-device.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.args
index 5bfb18196f..34895f1a70 100644
--- a/tests/qemuxml2argvdata/blkiotune.args
+++ b/tests/qemuxml2argvdata/blkiotune.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/boot-cdrom.args b/tests/qemuxml2argvdata/boot-cdrom.args
index c729c00503..431457dead 100644
--- a/tests/qemuxml2argvdata/boot-cdrom.args
+++ b/tests/qemuxml2argvdata/boot-cdrom.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/boot-complex.args b/tests/qemuxml2argvdata/boot-complex.args
index 7454e608aa..0977e8f664 100644
--- a/tests/qemuxml2argvdata/boot-complex.args
+++ b/tests/qemuxml2argvdata/boot-complex.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/tmp/vda.img,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-pci,scsi=off,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=3 \
diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.args b/tests/qemuxml2argvdata/boot-floppy-q35.args
index 8464031118..fda0100afd 100644
--- a/tests/qemuxml2argvdata/boot-floppy-q35.args
+++ b/tests/qemuxml2argvdata/boot-floppy-q35.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-0 \
-device isa-fdc,driveA=drive-fdc0-0-0,bootindexA=1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-floppy.args b/tests/qemuxml2argvdata/boot-floppy.args
index 3cc0672f13..80ffc22e44 100644
--- a/tests/qemuxml2argvdata/boot-floppy.args
+++ b/tests/qemuxml2argvdata/boot-floppy.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
index 794d9ef438..5c1c22a0e1 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--boot menu=off \
+-boot menu=off,strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args b/tests/qemuxml2argvdata/boot-menu-disable.args
index 794d9ef438..5c1c22a0e1 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--boot menu=off \
+-boot menu=off,strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
index 791bd269c2..8000fd21e0 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--boot menu=on,splash-time=3000 \
+-boot menu=on,splash-time=3000,strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args b/tests/qemuxml2argvdata/boot-menu-enable.args
index cfdbd215e7..6568ddebc6 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--boot menu=on \
+-boot menu=on,strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/boot-multi.args b/tests/qemuxml2argvdata/boot-multi.args
index cfdbd215e7..6568ddebc6 100644
--- a/tests/qemuxml2argvdata/boot-multi.args
+++ b/tests/qemuxml2argvdata/boot-multi.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--boot menu=on \
+-boot menu=on,strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/boot-network.args b/tests/qemuxml2argvdata/boot-network.args
index b2eb6fa64d..c20f343ed5 100644
--- a/tests/qemuxml2argvdata/boot-network.args
+++ b/tests/qemuxml2argvdata/boot-network.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdata/boot-order.args
index 371947bcec..5f69065c1d 100644
--- a/tests/qemuxml2argvdata/boot-order.args
+++ b/tests/qemuxml2argvdata/boot-order.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args
index 86a13576e8..6a89361336 100644
--- a/tests/qemuxml2argvdata/channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args
index bc08060ac2..844d82beeb 100644
--- a/tests/qemuxml2argvdata/channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args
index d508928b20..74c1d10eb8 100644
--- a/tests/qemuxml2argvdata/channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-serial-pci,id=virtio-serial0,max_ports=16,vectors=4,bus=pci.0,addr=0x2 \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-device virtio-serial-pci,id=virtio-serial2,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
index c46b49f6ba..beee5df4bb 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,addr=0x2 \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0x3 \
-usb \
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
index bd210262b2..1512212361 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-serial-pci,id=virtio-serial0,max_ports=4,vectors=4,bus=pci.0,addr=0x2 \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-usb \
diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.args
index 42c3d76ade..6b56e75b04 100644
--- a/tests/qemuxml2argvdata/channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/channel-virtio-default.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
-usb \
diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.args
index 5fef3fe03d..0b8b668e0f 100644
--- a/tests/qemuxml2argvdata/channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/channel-virtio-state.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.args
index 5c2ae6b112..f4b9624a4a 100644
--- a/tests/qemuxml2argvdata/channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
-usb \
diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.args
index 179b98713b..bccb6785f6 100644
--- a/tests/qemuxml2argvdata/channel-virtio.args
+++ b/tests/qemuxml2argvdata/channel-virtio.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2argvdata/chardev-reconnect.args
index 7ed66430e7..51c1c6c2f0 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect.args
+++ b/tests/qemuxml2argvdata/chardev-reconnect.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
-usb \
diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.args
index 3dbcb6b794..05240e42ac 100644
--- a/tests/qemuxml2argvdata/clock-catchup.args
+++ b/tests/qemuxml2argvdata/clock-catchup.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc,driftfix=slew \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.args
index 190aa44825..4fd26239f7 100644
--- a/tests/qemuxml2argvdata/clock-france.args
+++ b/tests/qemuxml2argvdata/clock-france.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=localtime \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.args
index f55600d07c..00c8fb2c9f 100644
--- a/tests/qemuxml2argvdata/clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/clock-hpet-off.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-no-hpet \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
index 512afa6f03..f52da780ba 100644
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=2009-02-14T00:01:30 \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.args
index 2d0582e06a..11eff915f0 100644
--- a/tests/qemuxml2argvdata/clock-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=localtime \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/clock-realtime.args b/tests/qemuxml2argvdata/clock-realtime.args
index 82886bc3a2..4025597d83 100644
--- a/tests/qemuxml2argvdata/clock-realtime.args
+++ b/tests/qemuxml2argvdata/clock-realtime.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc,clock=rt \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
index 035196c2a9..67dd66b9a0 100644
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata/clock-utc.args
index 1aaf10cab1..5498c5c7b7 100644
--- a/tests/qemuxml2argvdata/clock-utc.args
+++ b/tests/qemuxml2argvdata/clock-utc.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.args
index 3450a1c682..a2a86d39d0 100644
--- a/tests/qemuxml2argvdata/clock-variable.args
+++ b/tests/qemuxml2argvdata/clock-variable.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=2009-02-15T09:49:06 \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxml2argvdata/console-compat-auto.args
index 96fd60c31f..ce48dde74f 100644
--- a/tests/qemuxml2argvdata/console-compat-auto.args
+++ b/tests/qemuxml2argvdata/console-compat-auto.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qemuxml2argvdata/console-compat-chardev.args
index 96fd60c31f..ce48dde74f 100644
--- a/tests/qemuxml2argvdata/console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/console-compat-chardev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/console-compat.args b/tests/qemuxml2argvdata/console-compat.args
index 94058a80f0..25f617fc8d 100644
--- a/tests/qemuxml2argvdata/console-compat.args
+++ b/tests/qemuxml2argvdata/console-compat.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args b/tests/qemuxml2argvdata/console-virtio-ccw.args
index 2398e30aff..b527c1b7de 100644
--- a/tests/qemuxml2argvdata/console-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/console-virtio-ccw.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.args
index 980d2103bc..b968e32914 100644
--- a/tests/qemuxml2argvdata/console-virtio-many.args
+++ b/tests/qemuxml2argvdata/console-virtio-many.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args
index cdfc6f7d70..fac52c0a5c 100644
--- a/tests/qemuxml2argvdata/console-virtio.args
+++ b/tests/qemuxml2argvdata/console-virtio.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x2 \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.args
index 5fb186b9c7..1bf5febef2 100644
--- a/tests/qemuxml2argvdata/controller-order.args
+++ b/tests/qemuxml2argvdata/controller-order.args
@@ -21,7 +21,7 @@ QEMU_AUDIO_DRV=spice \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--boot menu=off \
+-boot menu=off,strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x7 \
-device usb-hub,id=hub0,bus=usb.0,port=1 \
diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
index a23a37628a..8ae6ff36e1 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvdata/cpu-Haswell.args
index a5c6b406c6..6958203d1d 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvdata/cpu-Haswell2.args
index 82c67890a3..9ce3f23bdf 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell2.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell2.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvdata/cpu-Haswell3.args
index 6143d31bf6..38f8a5070c 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell3.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell3.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2argvdata/cpu-cache-disable.args
index dd7e2c540e..f53b00b897 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.args b/tests/qemuxml2argvdata/cpu-cache-disable2.args
index 36c469a35d..c3a0f4f5d2 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable2.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args b/tests/qemuxml2argvdata/cpu-cache-disable3.args
index 31116e6e12..df21f0f20b 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
index d1f1750426..18acc83045 100644
--- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
index eb6313466c..4fa585e120 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
index bf79bae23c..e9d9ce2667 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qemuxml2argvdata/cpu-check-default-none.args
index 298b259171..c4fa2a86fb 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args b/tests/qemuxml2argvdata/cpu-check-default-none2.args
index 1b62aca490..143079f61d 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args b/tests/qemuxml2argvdata/cpu-check-default-partial.args
index c405c99fb7..7cf52c5c08 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
index 9cc7199a8f..779688f208 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-check-none.args b/tests/qemuxml2argvdata/cpu-check-none.args
index 9cc7199a8f..779688f208 100644
--- a/tests/qemuxml2argvdata/cpu-check-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-none.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
index dd92db15e3..57c95e04ec 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
index 57f83d99f2..82b93ed24f 100644
--- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdata/cpu-exact1.args
index 1b829434a3..43f1f72d9b 100644
--- a/tests/qemuxml2argvdata/cpu-exact1.args
+++ b/tests/qemuxml2argvdata/cpu-exact1.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
index 29d21a8c8d..6683bfe184 100644
--- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
+++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdata/cpu-exact2.args
index 29d21a8c8d..6683bfe184 100644
--- a/tests/qemuxml2argvdata/cpu-exact2.args
+++ b/tests/qemuxml2argvdata/cpu-exact2.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvdata/cpu-fallback.args
index 41dcb05410..2c68ff0c50 100644
--- a/tests/qemuxml2argvdata/cpu-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-fallback.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
index 2d15fc0ee6..0efd156e97 100644
--- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
index c97e7180c8..264bd8007d 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
index f88f141bf9..166e2d6dce 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
index 8ebacc1434..3a65105537 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model.args b/tests/qemuxml2argvdata/cpu-host-model.args
index f4511fef83..513d94e846 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
index ade39e3ada..c4da30ed83 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemuxml2argvdata/cpu-host-passthrough.args
index 298b259171..c4fa2a86fb 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.args b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
index d28cb2d6ce..0ab1b97680 100644
--- a/tests/qemuxml2argvdata/cpu-hotplug-startup.args
+++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvdata/cpu-kvmclock.args
index e4019f2c7e..b0254932ea 100644
--- a/tests/qemuxml2argvdata/cpu-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvdata/cpu-minimum1.args
index 279b224762..0a865cd5e2 100644
--- a/tests/qemuxml2argvdata/cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/cpu-minimum1.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args b/tests/qemuxml2argvdata/cpu-minimum2.args
index 4380dbabab..68be93c24d 100644
--- a/tests/qemuxml2argvdata/cpu-minimum2.args
+++ b/tests/qemuxml2argvdata/cpu-minimum2.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args b/tests/qemuxml2argvdata/cpu-no-removed-features.args
index 9cc7199a8f..779688f208 100644
--- a/tests/qemuxml2argvdata/cpu-no-removed-features.args
+++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
index f5b696131e..fc60503e05 100644
--- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
+++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
@@ -25,6 +25,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml2argvdata/cpu-numa-memshared.args
index 9b5251d45e..62a2fb94e7 100644
--- a/tests/qemuxml2argvdata/cpu-numa-memshared.args
+++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args
@@ -27,6 +27,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
index 40a3063fb1..7e9f431df7 100644
--- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
+++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
@@ -25,6 +25,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata/cpu-numa1.args
index 40a3063fb1..7e9f431df7 100644
--- a/tests/qemuxml2argvdata/cpu-numa1.args
+++ b/tests/qemuxml2argvdata/cpu-numa1.args
@@ -25,6 +25,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata/cpu-numa2.args
index 40a3063fb1..7e9f431df7 100644
--- a/tests/qemuxml2argvdata/cpu-numa2.args
+++ b/tests/qemuxml2argvdata/cpu-numa2.args
@@ -25,6 +25,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-s390-features.args b/tests/qemuxml2argvdata/cpu-s390-features.args
index 21c3b05322..cfdcf9bf0f 100644
--- a/tests/qemuxml2argvdata/cpu-s390-features.args
+++ b/tests/qemuxml2argvdata/cpu-s390-features.args
@@ -23,4 +23,5 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-s390-zEC12.args b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
index 07c876055c..f0e9e41bb7 100644
--- a/tests/qemuxml2argvdata/cpu-s390-zEC12.args
+++ b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
@@ -23,4 +23,5 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-strict1.args b/tests/qemuxml2argvdata/cpu-strict1.args
index 821fee8e95..e1b041f22c 100644
--- a/tests/qemuxml2argvdata/cpu-strict1.args
+++ b/tests/qemuxml2argvdata/cpu-strict1.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argvdata/cpu-topology1.args
index 48e48cfe70..91063ed61d 100644
--- a/tests/qemuxml2argvdata/cpu-topology1.args
+++ b/tests/qemuxml2argvdata/cpu-topology1.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-topology2.args b/tests/qemuxml2argvdata/cpu-topology2.args
index 0816251e47..bafaff8e0f 100644
--- a/tests/qemuxml2argvdata/cpu-topology2.args
+++ b/tests/qemuxml2argvdata/cpu-topology2.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argvdata/cpu-topology3.args
index 48e48cfe70..91063ed61d 100644
--- a/tests/qemuxml2argvdata/cpu-topology3.args
+++ b/tests/qemuxml2argvdata/cpu-topology3.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
index 2a031b6ef0..d2156c8c7f 100644
--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
+++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cputune-numatune.args b/tests/qemuxml2argvdata/cputune-numatune.args
index 6cecb7a469..88a8a88190 100644
--- a/tests/qemuxml2argvdata/cputune-numatune.args
+++ b/tests/qemuxml2argvdata/cputune-numatune.args
@@ -25,5 +25,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args b/tests/qemuxml2argvdata/cputune-zero-shares.args
index 81b3667c7b..17e16f41ea 100644
--- a/tests/qemuxml2argvdata/cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args
index 81b3667c7b..17e16f41ea 100644
--- a/tests/qemuxml2argvdata/cputune.args
+++ b/tests/qemuxml2argvdata/cputune.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args b/tests/qemuxml2argvdata/default-kvm-host-arch.args
index 36993566fc..aa159dac4c 100644
--- a/tests/qemuxml2argvdata/default-kvm-host-arch.args
+++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args b/tests/qemuxml2argvdata/default-qemu-host-arch.args
index b43f10d20e..c96564961b 100644
--- a/tests/qemuxml2argvdata/default-qemu-host-arch.args
+++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/disk-aio.args b/tests/qemuxml2argvdata/disk-aio.args
index ec701cbf41..3796344592 100644
--- a/tests/qemuxml2argvdata/disk-aio.args
+++ b/tests/qemuxml2argvdata/disk-aio.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none,aio=native \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-blockio.args b/tests/qemuxml2argvdata/disk-blockio.args
index 69095678b3..c4353c19a9 100644
--- a/tests/qemuxml2argvdata/disk-blockio.args
+++ b/tests/qemuxml2argvdata/disk-blockio.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1,readonly=on \
-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.args b/tests/qemuxml2argvdata/disk-boot-cdrom.args
index b30caa86c7..b6fe321071 100644
--- a/tests/qemuxml2argvdata/disk-boot-cdrom.args
+++ b/tests/qemuxml2argvdata/disk-boot-cdrom.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
diff --git a/tests/qemuxml2argvdata/disk-boot-disk.args b/tests/qemuxml2argvdata/disk-boot-disk.args
index d04d8b9a44..3fd91ae2c8 100644
--- a/tests/qemuxml2argvdata/disk-boot-disk.args
+++ b/tests/qemuxml2argvdata/disk-boot-disk.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.args b/tests/qemuxml2argvdata/disk-cdrom-network.args
index 5617efd78a..951a82e429 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-network.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-network.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-drive file=ftp://host.name:21/url/path/file.iso,format=raw,if=none,id=drive-ide0-0-0,readonly=on \
-device ide-cd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.args b/tests/qemuxml2argvdata/disk-cdrom-tray.args
index 6ce552a568..d097da292b 100644
--- a/tests/qemuxml2argvdata/disk-cdrom-tray.args
+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--boot menu=on \
+-boot menu=on,strict=on \
-usb \
-drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,id=drive-virtio-disk0 \
-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=2 \
diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdata/disk-cdrom.args
index 5e31baba88..637110e45c 100644
--- a/tests/qemuxml2argvdata/disk-cdrom.args
+++ b/tests/qemuxml2argvdata/disk-cdrom.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-0-0,readonly=on \
-device ide-cd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.args b/tests/qemuxml2argvdata/disk-copy_on_read.args
index 81bf298d1b..e585358b46 100644
--- a/tests/qemuxml2argvdata/disk-copy_on_read.args
+++ b/tests/qemuxml2argvdata/disk-copy_on_read.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--boot menu=on \
+-boot menu=on,strict=on \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
-usb \
-drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,id=drive-virtio-disk0,copy-on-read=on \
diff --git a/tests/qemuxml2argvdata/disk-error-policy.args b/tests/qemuxml2argvdata/disk-error-policy.args
index 37c8438fb8..b5d17352e3 100644
--- a/tests/qemuxml2argvdata/disk-error-policy.args
+++ b/tests/qemuxml2argvdata/disk-error-policy.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,werror=stop,rerror=stop,cache=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.args b/tests/qemuxml2argvdata/disk-floppy-tray.args
index 65f2a51270..c513a11960 100644
--- a/tests/qemuxml2argvdata/disk-floppy-tray.args
+++ b/tests/qemuxml2argvdata/disk-floppy-tray.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-floppy.args b/tests/qemuxml2argvdata/disk-floppy.args
index 6723a52234..1bc2f9417e 100644
--- a/tests/qemuxml2argvdata/disk-floppy.args
+++ b/tests/qemuxml2argvdata/disk-floppy.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.args b/tests/qemuxml2argvdata/disk-fmt-qcow.args
index b12aa9aade..9bde88ead2 100644
--- a/tests/qemuxml2argvdata/disk-fmt-qcow.args
+++ b/tests/qemuxml2argvdata/disk-fmt-qcow.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-geometry.args b/tests/qemuxml2argvdata/disk-geometry.args
index 61a5ffefd9..6be777a0df 100644
--- a/tests/qemuxml2argvdata/disk-geometry.args
+++ b/tests/qemuxml2argvdata/disk-geometry.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1,cyls=16383,heads=16,secs=63,bios-chs-trans=lba \
diff --git a/tests/qemuxml2argvdata/disk-ide-split.args b/tests/qemuxml2argvdata/disk-ide-split.args
index 0702461aaa..bb164b4c7a 100644
--- a/tests/qemuxml2argvdata/disk-ide-split.args
+++ b/tests/qemuxml2argvdata/disk-ide-split.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1,readonly=on \
-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.args b/tests/qemuxml2argvdata/disk-ide-wwn.args
index 2ea2675e53..c6f27bca8e 100644
--- a/tests/qemuxml2argvdata/disk-ide-wwn.args
+++ b/tests/qemuxml2argvdata/disk-ide-wwn.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \
-device ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,bootindex=1,wwn=0x5000c50015ea71ad,serial=WD-WMAP9A966149 \
diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.args b/tests/qemuxml2argvdata/disk-ioeventfd.args
index cebbe4bc6d..0326d13c73 100644
--- a/tests/qemuxml2argvdata/disk-ioeventfd.args
+++ b/tests/qemuxml2argvdata/disk-ioeventfd.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--boot menu=on \
+-boot menu=on,strict=on \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
-usb \
-drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,id=drive-virtio-disk0 \
diff --git a/tests/qemuxml2argvdata/disk-iscsi.args b/tests/qemuxml2argvdata/disk-iscsi.args
index 9201b7d6e9..af1788b11a 100644
--- a/tests/qemuxml2argvdata/disk-iscsi.args
+++ b/tests/qemuxml2argvdata/disk-iscsi.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/disk/by-path/ip-192.168.44.1:3260-iscsi-iqn.2011-02.lan.hdserver:hydrar-desktop.win7vm-lun-0,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-network-gluster.args b/tests/qemuxml2argvdata/disk-network-gluster.args
index e92e662f9b..00399c5924 100644
--- a/tests/qemuxml2argvdata/disk-network-gluster.args
+++ b/tests/qemuxml2argvdata/disk-network-gluster.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=gluster://example.org:6000/Volume1/Image,file.debug=4,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
index 514a334bbc..bcf8c153c2 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
-usb \
-drive file.driver=iscsi,file.portal=example.org:6000,file.target=iqn.1992-01.com.example,file.lun=0,file.transport=tcp,format=raw,if=none,id=drive-virtio-disk0 \
diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args b/tests/qemuxml2argvdata/disk-network-iscsi.args
index 24e77f4f18..276afefc4d 100644
--- a/tests/qemuxml2argvdata/disk-network-iscsi.args
+++ b/tests/qemuxml2argvdata/disk-network-iscsi.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
-usb \
-drive file=iscsi://example.org:6000/iqn.1992-01.com.example/0,format=raw,if=none,id=drive-virtio-disk0 \
diff --git a/tests/qemuxml2argvdata/disk-network-nbd.args b/tests/qemuxml2argvdata/disk-network-nbd.args
index 1a2902d10e..e3d9f3e328 100644
--- a/tests/qemuxml2argvdata/disk-network-nbd.args
+++ b/tests/qemuxml2argvdata/disk-network-nbd.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=nbd:example.org:6000,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.args b/tests/qemuxml2argvdata/disk-network-sheepdog.args
index a3f0af36fe..27a3b5b076 100644
--- a/tests/qemuxml2argvdata/disk-network-sheepdog.args
+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMU,,Guest,,,,1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.args b/tests/qemuxml2argvdata/disk-network-source-auth.args
index c3a6954f5f..b461ba5b9e 100644
--- a/tests/qemuxml2argvdata/disk-network-source-auth.args
+++ b/tests/qemuxml2argvdata/disk-network-source-auth.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=iscsi://myname:AQCVn5hO6HzFAhAAq0NCv8jtJcIcE+HOBlMQ1A@example.org:6000/iqn.1992-01.com.example%3Astorage/1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-pci,bus=pci.0,addr=0x2,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-network-vxhs.args b/tests/qemuxml2argvdata/disk-network-vxhs.args
index 3a2509c9cb..6cbb38cab1 100644
--- a/tests/qemuxml2argvdata/disk-network-vxhs.args
+++ b/tests/qemuxml2argvdata/disk-network-vxhs.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file.driver=vxhs,file.vdisk-id=eb90327c-8302-4725-9e1b-4e85ed4dc251,file.server.host=192.168.0.1,file.server.port=9999,format=raw,if=none,id=drive-virtio-disk0,cache=none \
-device virtio-blk-pci,bus=pci.0,addr=0x4,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1,serial=eb90327c-8302-4725-9e1b-4e85ed4dc251 \
diff --git a/tests/qemuxml2argvdata/disk-no-boot.args b/tests/qemuxml2argvdata/disk-no-boot.args
index a31fbeda6b..d7829f612d 100644
--- a/tests/qemuxml2argvdata/disk-no-boot.args
+++ b/tests/qemuxml2argvdata/disk-no-boot.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=2 \
diff --git a/tests/qemuxml2argvdata/disk-order.args b/tests/qemuxml2argvdata/disk-order.args
index f94ae501aa..a4f9cd563e 100644
--- a/tests/qemuxml2argvdata/disk-order.args
+++ b/tests/qemuxml2argvdata/disk-order.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.args b/tests/qemuxml2argvdata/disk-readonly-disk.args
index a0a6e3e7b0..d61d349d33 100644
--- a/tests/qemuxml2argvdata/disk-readonly-disk.args
+++ b/tests/qemuxml2argvdata/disk-readonly-disk.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-sata-device.args b/tests/qemuxml2argvdata/disk-sata-device.args
index 1322744325..6d504ac06b 100644
--- a/tests/qemuxml2argvdata/disk-sata-device.args
+++ b/tests/qemuxml2argvdata/disk-sata-device.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ahci,id=sata0,bus=pci.0,addr=0x2 \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.args b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
index 527d4c6292..4a94918621 100644
--- a/tests/qemuxml2argvdata/disk-scsi-disk-split.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
-device lsi,id=scsi1,bus=pci.0,addr=0x3 \
-device lsi,id=scsi2,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
index a94b001193..7c161dca7b 100644
--- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
-device lsi,id=scsi1,bus=pci.0,addr=0x3 \
-usb \
diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
index d740b7e66a..42a1ce7658 100644
--- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
+++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
-device lsi,id=scsi1,bus=pci.0,addr=0x3 \
-usb \
diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
index d52ce2e366..cc8ccba930 100644
--- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
+++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x2 \
-device lsi,id=scsi1,bus=pci.0,addr=0x3 \
-usb \
diff --git a/tests/qemuxml2argvdata/disk-serial.args b/tests/qemuxml2argvdata/disk-serial.args
index 5ec7c8f172..e2a75e376f 100644
--- a/tests/qemuxml2argvdata/disk-serial.args
+++ b/tests/qemuxml2argvdata/disk-serial.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-1 \
-device 'ide-hd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1,bootindex=1,serial=\ \ WD-WMAP9A966149' \
diff --git a/tests/qemuxml2argvdata/disk-snapshot.args b/tests/qemuxml2argvdata/disk-snapshot.args
index 05c0b8680a..de075dfeb5 100644
--- a/tests/qemuxml2argvdata/disk-snapshot.args
+++ b/tests/qemuxml2argvdata/disk-snapshot.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.args b/tests/qemuxml2argvdata/disk-source-pool-mode.args
index ff3339973e..524c20e71d 100644
--- a/tests/qemuxml2argvdata/disk-source-pool-mode.args
+++ b/tests/qemuxml2argvdata/disk-source-pool-mode.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/some/block/device/unit:0:0:1,format=raw,if=none,id=drive-ide0-0-1,readonly=on \
-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
diff --git a/tests/qemuxml2argvdata/disk-source-pool.args b/tests/qemuxml2argvdata/disk-source-pool.args
index 445dbc8332..e03a042fd1 100644
--- a/tests/qemuxml2argvdata/disk-source-pool.args
+++ b/tests/qemuxml2argvdata/disk-source-pool.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/some/block/device/cdrom,format=raw,if=none,id=drive-ide0-0-1,readonly=on \
-device ide-cd,bus=ide.0,unit=1,drive=drive-ide0-0-1,id=ide0-0-1 \
diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.args b/tests/qemuxml2argvdata/disk-usb-device-removable.args
index d2d045a1ca..3e9dbf0a62 100644
--- a/tests/qemuxml2argvdata/disk-usb-device-removable.args
+++ b/tests/qemuxml2argvdata/disk-usb-device-removable.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-usb-device.args b/tests/qemuxml2argvdata/disk-usb-device.args
index 292103b00f..e1a1564b6d 100644
--- a/tests/qemuxml2argvdata/disk-usb-device.args
+++ b/tests/qemuxml2argvdata/disk-usb-device.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args b/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
index 18dd09068b..543782a561 100644
--- a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
+++ b/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=0.0.0007,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-drive file=/dev/HostVG/QEMUGuest4,format=raw,if=none,id=drive-virtio-disk1 \
diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.args b/tests/qemuxml2argvdata/disk-virtio-ccw.args
index 875c7ce3d1..6ccf6c8bd5 100644
--- a/tests/qemuxml2argvdata/disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/disk-virtio-ccw.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-virtio-disk1 \
diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.args b/tests/qemuxml2argvdata/disk-virtio-queues.args
index c0166357e7..07049f457d 100644
--- a/tests/qemuxml2argvdata/disk-virtio-queues.args
+++ b/tests/qemuxml2argvdata/disk-virtio-queues.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/tmp/data.img,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-pci,num-queues=4,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
index b402973e77..da3fe3aa93 100644
--- a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
+++ b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device zpci,uid=25,fid=31,target=virtio-disk0,id=zpci25 \
-device virtio-blk-pci,bus=pci.0,addr=0x8,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/disk-virtio.args b/tests/qemuxml2argvdata/disk-virtio.args
index 90a1044f46..50e062a258 100644
--- a/tests/qemuxml2argvdata/disk-virtio.args
+++ b/tests/qemuxml2argvdata/disk-virtio.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.args b/tests/qemuxml2argvdata/encrypted-disk-usage.args
index b89926d3f9..7e28fe8d2b 100644
--- a/tests/qemuxml2argvdata/encrypted-disk-usage.args
+++ b/tests/qemuxml2argvdata/encrypted-disk-usage.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-object secret,id=virtio-disk0-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-drive file=/storage/guest_disks/encryptdisk,encrypt.format=luks,encrypt.key-secret=virtio-disk0-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk0 \
diff --git a/tests/qemuxml2argvdata/encrypted-disk.args b/tests/qemuxml2argvdata/encrypted-disk.args
index d19d6e852b..c850f3afaf 100644
--- a/tests/qemuxml2argvdata/encrypted-disk.args
+++ b/tests/qemuxml2argvdata/encrypted-disk.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-object secret,id=virtio-disk0-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-drive file=/storage/guest_disks/encryptdisk,encrypt.format=luks,encrypt.key-secret=virtio-disk0-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk0 \
diff --git a/tests/qemuxml2argvdata/event_idx.args b/tests/qemuxml2argvdata/event_idx.args
index d5a9428cc6..1147798786 100644
--- a/tests/qemuxml2argvdata/event_idx.args
+++ b/tests/qemuxml2argvdata/event_idx.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--boot menu=on \
+-boot menu=on,strict=on \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
-usb \
-drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,id=drive-virtio-disk0 \
diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
index 417b95c25e..6592d4d70b 100644
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
@@ -25,6 +25,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
index c8c1b0a613..e990490df5 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
@@ -26,6 +26,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
index c07a6b1244..1630ef45ab 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
@@ -28,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
index 5b2e8af09b..4b69654096 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
@@ -30,6 +30,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.args b/tests/qemuxml2argvdata/floppy-drive-fat.args
index 7effa43573..42ccab52ce 100644
--- a/tests/qemuxml2argvdata/floppy-drive-fat.args
+++ b/tests/qemuxml2argvdata/floppy-drive-fat.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=fat:floppy:/var/somefiles,if=none,id=drive-fdc0-0-0,readonly=on \
-global isa-fdc.driveA=drive-fdc0-0-0 \
diff --git a/tests/qemuxml2argvdata/fs9p-ccw.args b/tests/qemuxml2argvdata/fs9p-ccw.args
index e866116f38..2211dd775f 100644
--- a/tests/qemuxml2argvdata/fs9p-ccw.args
+++ b/tests/qemuxml2argvdata/fs9p-ccw.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
diff --git a/tests/qemuxml2argvdata/fs9p.args b/tests/qemuxml2argvdata/fs9p.args
index 596727b39a..5ff9dfcec4 100644
--- a/tests/qemuxml2argvdata/fs9p.args
+++ b/tests/qemuxml2argvdata/fs9p.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/to/guest \
-device virtio-9p-pci,id=fs0,fsdev=fsdev-fs0,mount_tag=/import/from/host,bus=pci.0,addr=0x2 \
-fsdev local,security_model=mapped,writeout=immediate,id=fsdev-fs1,path=/export/to/guest2 \
diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args b/tests/qemuxml2argvdata/graphics-egl-headless.args
index f823ecef4b..7d9cfcace0 100644
--- a/tests/qemuxml2argvdata/graphics-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-egl-headless.args
@@ -21,6 +21,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
index c6695da9d8..fd626bd8df 100644
--- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
+++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
@@ -23,6 +23,7 @@ DISPLAY=:0.1 \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.args
index ca12c88f8f..48fa126136 100644
--- a/tests/qemuxml2argvdata/graphics-sdl.args
+++ b/tests/qemuxml2argvdata/graphics-sdl.args
@@ -23,6 +23,7 @@ DISPLAY=:0.1 \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
index b2c3fdcd72..ec3f5326cf 100644
--- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
index bc74fb9976..09fab18d91 100644
--- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
+++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-serial-pci,id=virtio-serial1,bus=pci.0,addr=0xa \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
index 6ed83288ae..be502f064e 100644
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-spice unix,addr=/tmp/lib/domain--1-QEMUGuest1/spice.sock,seamless-migration=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
index 6ed83288ae..be502f064e 100644
--- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-spice unix,addr=/tmp/lib/domain--1-QEMUGuest1/spice.sock,seamless-migration=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args b/tests/qemuxml2argvdata/graphics-spice-compression.args
index 045a57f8b8..6f1a30305f 100644
--- a/tests/qemuxml2argvdata/graphics-spice-compression.args
+++ b/tests/qemuxml2argvdata/graphics-spice-compression.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
index ced879c517..151c2bbf12 100644
--- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.args b/tests/qemuxml2argvdata/graphics-spice-no-args.args
index c3df95e561..ee85b07956 100644
--- a/tests/qemuxml2argvdata/graphics-spice-no-args.args
+++ b/tests/qemuxml2argvdata/graphics-spice-no-args.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-spice port=0,seamless-migration=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
index 7a8cf9abb7..3f69461202 100644
--- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
+++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args b/tests/qemuxml2argvdata/graphics-spice-sasl.args
index d8462b3b1e..aae9382991 100644
--- a/tests/qemuxml2argvdata/graphics-spice-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args
@@ -23,6 +23,7 @@ SASL_CONF_PATH=/root/.sasl2 \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.args b/tests/qemuxml2argvdata/graphics-spice-socket.args
index 8204b3d6cf..c7ecae5566 100644
--- a/tests/qemuxml2argvdata/graphics-spice-socket.args
+++ b/tests/qemuxml2argvdata/graphics-spice-socket.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-spice unix,addr=/tmp/spice.sock,seamless-migration=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args b/tests/qemuxml2argvdata/graphics-spice-timeout.args
index 9d98afe1fe..9d81e94529 100644
--- a/tests/qemuxml2argvdata/graphics-spice-timeout.args
+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args
@@ -22,7 +22,7 @@ QEMU_AUDIO_DRV=spice \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
--boot menu=on \
+-boot menu=on,strict=on \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
-usb \
-drive file=/var/lib/libvirt/images/f14.img,format=qcow2,if=none,id=drive-virtio-disk0 \
diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
index 76e17a8b49..e38bae4e46 100644
--- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
+++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \
-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
-device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
diff --git a/tests/qemuxml2argvdata/graphics-spice.args b/tests/qemuxml2argvdata/graphics-spice.args
index 2d61852b74..d2cfe513c3 100644
--- a/tests/qemuxml2argvdata/graphics-spice.args
+++ b/tests/qemuxml2argvdata/graphics-spice.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
index fd29002dd0..2cce3b7e1c 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
index f7107e0079..0a6f28b7da 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-vnc unix:/tmp/lib/domain--1-QEMUGuest1/vnc.sock \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
index 7e5f8727e2..dad8d0e568 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
index 5f8c33af83..166179a4d4 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.args b/tests/qemuxml2argvdata/graphics-vnc-none.args
index d4a5ac234b..5899549838 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-none.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-none.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-vnc none \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.args b/tests/qemuxml2argvdata/graphics-vnc-policy.args
index 4013ad91b9..65acad3d2b 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-policy.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-policy.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
index 809ac4ed40..fc43310731 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.args b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
index ad9b1f346a..13d4e087fc 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
@@ -23,6 +23,7 @@ SASL_CONF_PATH=/root/.sasl2 \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
index ca3217e08b..992aff75e0 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-vnc vnc=unix:/tmp/foo=bar.sock \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.args b/tests/qemuxml2argvdata/graphics-vnc-socket.args
index b5622968ea..16a0f0bb7a 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-socket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-socket.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-vnc unix:/tmp/vnc.sock \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args b/tests/qemuxml2argvdata/graphics-vnc-tls.args
index c99a0ecd69..aa525e828d 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.args
@@ -23,6 +23,7 @@ SASL_CONF_PATH=/root/.sasl2 \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-vnc 127.0.0.1:3,tls,x509verify=/etc/pki/libvirt-vnc,sasl \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.args b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
index 5b41afb83c..3b9a2fa846 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-websocket.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-vnc 127.0.0.1:0,websocket=5700 \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/graphics-vnc.args b/tests/qemuxml2argvdata/graphics-vnc.args
index 5f8c33af83..166179a4d4 100644
--- a/tests/qemuxml2argvdata/graphics-vnc.args
+++ b/tests/qemuxml2argvdata/graphics-vnc.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
index 1b40ced659..b2794d64b0 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device vfio-pci,id=hostdev0,sysfsdev=/sys/bus/mdev/devices/53764d0e-85a0-42b4-af5c-2046b460b1dc,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.args b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
index 3e91dfa92a..b495b2bfe1 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
index 37e1e1fc8d..fb86e819e3 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.0,addr=0x2 \
-device vfio-pci,host=0005:90:01.2,id=hostdev2,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.args b/tests/qemuxml2argvdata/hostdev-pci-address.args
index 946b5df11f..7e207ff19a 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
index 446143447f..50327805b7 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.0,addr=0x2 \
-device vfio-pci,host=0001:01:00.1,id=hostdev1,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
index 223398532d..8c369c1c9d 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device virtio-scsi-ccw,id=scsi0,devno=fe.0.0001 \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
index 441e16e266..c2f57af0cf 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
-usb \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
index b08005d8a1..d49d43c8b9 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device pcie-root-port,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
-device pcie-root-port,port=0x9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
-device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.1,addr=0x0 \
diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
index 9a88354388..4136d1d0ff 100644
--- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device vfio-ccw,id=hostdev0,sysfsdev=/sys/bus/mdev/devices/90c6c135-ad44-41d0-b1b7-bae47de48627,devno=fe.0.0000 \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
index abaa39845f..5a0cfaf95f 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0 \
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.args b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
index a6ee4c95c3..8ce179a225 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.args b/tests/qemuxml2argvdata/hostdev-usb-address.args
index f446e52e51..ee9632314e 100644
--- a/tests/qemuxml2argvdata/hostdev-usb-address.args
+++ b/tests/qemuxml2argvdata/hostdev-usb-address.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
index 7e60989287..ed6beb1d40 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
index bf2ab506b4..ce6fff263b 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device zpci,uid=1,fid=0,target=hostdev0,id=zpci1 \
-device vfio-pci,host=0000:00:00.0,id=hostdev0,bus=pci.0,addr=0x1 \
-device zpci,uid=5,fid=1,target=hostdev1,id=zpci5 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
index b29f8ee91a..d2417f5c27 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device zpci,uid=1,fid=0,target=hostdev0,id=zpci1 \
-device vfio-pci,host=0000:00:00.0,id=hostdev0,bus=pci.0,addr=0x1 \
-device zpci,uid=2,fid=31,target=hostdev1,id=zpci2 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
index 34cabcc40e..b9b1bad515 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device zpci,uid=1,fid=0,target=hostdev0,id=zpci1 \
-device vfio-pci,host=0000:00:00.0,id=hostdev0,bus=pci.0,addr=0x1 \
-device zpci,uid=2,fid=1,target=balloon0,id=zpci2 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
index 6a17207660..a82ee00d6f 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device zpci,uid=3,fid=2,target=pci.1,id=zpci3 \
-device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x1 \
-device zpci,uid=65535,fid=4294967295,target=hostdev0,id=zpci65535 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
index b1501bab0d..a18d3d2dcf 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device zpci,uid=1,fid=0,target=hostdev0,id=zpci1 \
-device vfio-pci,host=0000:00:00.0,id=hostdev0,bus=pci.0,addr=0x1 \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0000 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
index c5e6d3f57f..172931dc33 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device zpci,uid=35,fid=63,target=hostdev0,id=zpci35 \
-device vfio-pci,host=0001:00:00.0,id=hostdev0,bus=pci.0,addr=0x3 \
-device zpci,uid=53,fid=104,target=hostdev1,id=zpci53 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
index e0b641e546..ae5dfb5c4f 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device zpci,uid=25,fid=31,target=hostdev0,id=zpci25 \
-device vfio-pci,host=0000:00:00.0,id=hostdev0,bus=pci.0,addr=0x8 \
-device zpci,uid=1,fid=0,target=balloon0,id=zpci1 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.args
index 456a519c9d..b78ad10b99 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/hotplug-base.args b/tests/qemuxml2argvdata/hotplug-base.args
index de778d174a..f8b67d3996 100644
--- a/tests/qemuxml2argvdata/hotplug-base.args
+++ b/tests/qemuxml2argvdata/hotplug-base.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x4 \
-usb \
diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.args b/tests/qemuxml2argvdata/hugepages-default-2M.args
index 6ddc48ce9a..8176b7c3a3 100644
--- a/tests/qemuxml2argvdata/hugepages-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.args
@@ -25,5 +25,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.args b/tests/qemuxml2argvdata/hugepages-default-system-size.args
index 939e338000..f95f32d2b1 100644
--- a/tests/qemuxml2argvdata/hugepages-default-system-size.args
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.args
@@ -23,5 +23,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-default.args b/tests/qemuxml2argvdata/hugepages-default.args
index 1d68312b78..6b728fc937 100644
--- a/tests/qemuxml2argvdata/hugepages-default.args
+++ b/tests/qemuxml2argvdata/hugepages-default.args
@@ -25,6 +25,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args b/tests/qemuxml2argvdata/hugepages-memaccess.args
index 8c5779d508..47bbdbaceb 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.args
@@ -33,6 +33,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args b/tests/qemuxml2argvdata/hugepages-memaccess2.args
index b9f42c5113..9dbb480302 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args
@@ -33,6 +33,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.args b/tests/qemuxml2argvdata/hugepages-nodeset.args
index 6ddc48ce9a..8176b7c3a3 100644
--- a/tests/qemuxml2argvdata/hugepages-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-nodeset.args
@@ -25,5 +25,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
index fb56c5b9a5..3b68039b0e 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
@@ -27,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
index 8013e4088b..5a788724fc 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
@@ -28,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.args b/tests/qemuxml2argvdata/hugepages-numa-default.args
index 54d4ed3d8c..44e99904f9 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default.args
@@ -26,5 +26,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
index 496735607d..a90f4f2cce 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
@@ -27,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
index 8dbafc0184..32819f0368 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
@@ -31,5 +31,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-shared.args b/tests/qemuxml2argvdata/hugepages-shared.args
index f0b33a0371..0630995483 100644
--- a/tests/qemuxml2argvdata/hugepages-shared.args
+++ b/tests/qemuxml2argvdata/hugepages-shared.args
@@ -31,6 +31,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.args
index fecb204f34..8780fd7a4a 100644
--- a/tests/qemuxml2argvdata/input-usbmouse-addr.args
+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2argvdata/input-usbmouse.args
index 3c80092fa8..2c89720027 100644
--- a/tests/qemuxml2argvdata/input-usbmouse.args
+++ b/tests/qemuxml2argvdata/input-usbmouse.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2argvdata/input-usbtablet.args
index 4aaad9feb1..bc5c2080f7 100644
--- a/tests/qemuxml2argvdata/input-usbtablet.args
+++ b/tests/qemuxml2argvdata/input-usbtablet.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.args b/tests/qemuxml2argvdata/input-virtio-ccw.args
index 8247c04f21..40dbd932c7 100644
--- a/tests/qemuxml2argvdata/input-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/input-virtio-ccw.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-device virtio-keyboard-ccw,id=input0,devno=fe.0.0002 \
diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
index 43244954db..3112c2e9f5 100644
--- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,iothread=iothread1,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-virtio-disk1 \
diff --git a/tests/qemuxml2argvdata/iothreads-disk.args b/tests/qemuxml2argvdata/iothreads-disk.args
index c96a932d95..ebb1213132 100644
--- a/tests/qemuxml2argvdata/iothreads-disk.args
+++ b/tests/qemuxml2argvdata/iothreads-disk.args
@@ -25,6 +25,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.args b/tests/qemuxml2argvdata/iothreads-ids-partial.args
index a8086823ae..3735943164 100644
--- a/tests/qemuxml2argvdata/iothreads-ids-partial.args
+++ b/tests/qemuxml2argvdata/iothreads-ids-partial.args
@@ -27,6 +27,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/iothreads-ids.args b/tests/qemuxml2argvdata/iothreads-ids.args
index 858d98e400..0f61daccbe 100644
--- a/tests/qemuxml2argvdata/iothreads-ids.args
+++ b/tests/qemuxml2argvdata/iothreads-ids.args
@@ -25,6 +25,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/iothreads.args b/tests/qemuxml2argvdata/iothreads.args
index 44c2c2c67d..ed3d70b23e 100644
--- a/tests/qemuxml2argvdata/iothreads.args
+++ b/tests/qemuxml2argvdata/iothreads.args
@@ -25,6 +25,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/kvm-features-off.args b/tests/qemuxml2argvdata/kvm-features-off.args
index ca86748a2d..6d0cf13817 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-features.args b/tests/qemuxml2argvdata/kvm-features.args
index c62e73adc6..7fff1ddda2 100644
--- a/tests/qemuxml2argvdata/kvm-features.args
+++ b/tests/qemuxml2argvdata/kvm-features.args
@@ -23,5 +23,6 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args
index 7736ae0433..0167c62268 100644
--- a/tests/qemuxml2argvdata/kvm-pit-delay.args
+++ b/tests/qemuxml2argvdata/kvm-pit-delay.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-global kvm-pit.lost_tick_policy=delay \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.args
index 4b96f8a09e..cd345f6af6 100644
--- a/tests/qemuxml2argvdata/kvm-pit-discard.args
+++ b/tests/qemuxml2argvdata/kvm-pit-discard.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-global kvm-pit.lost_tick_policy=discard \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args
index b6df1473bb..4ebb09347a 100644
--- a/tests/qemuxml2argvdata/kvmclock.args
+++ b/tests/qemuxml2argvdata/kvmclock.args
@@ -24,5 +24,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
index 2b4f9e6a7d..881fa5c1ca 100644
--- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
+++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-object secret,id=virtio-disk0-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-drive file=/storage/guest_disks/encryptdisk,encrypt.format=luks,encrypt.key-secret=virtio-disk0-encryption-secret0,format=qcow2,if=none,id=drive-virtio-disk0 \
diff --git a/tests/qemuxml2argvdata/luks-disks-source.args b/tests/qemuxml2argvdata/luks-disks-source.args
index caeeb01cf4..5854f3b153 100644
--- a/tests/qemuxml2argvdata/luks-disks-source.args
+++ b/tests/qemuxml2argvdata/luks-disks-source.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-object secret,id=virtio-disk0-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-drive file=/storage/guest_disks/encryptdisk,key-secret=virtio-disk0-encryption-secret0,format=luks,if=none,id=drive-virtio-disk0 \
diff --git a/tests/qemuxml2argvdata/luks-disks.args b/tests/qemuxml2argvdata/luks-disks.args
index ba2d49481c..1cd04329e6 100644
--- a/tests/qemuxml2argvdata/luks-disks.args
+++ b/tests/qemuxml2argvdata/luks-disks.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-object secret,id=virtio-disk0-encryption-secret0,data=9eao5F8qtkGt+seB1HYivWIxbtwUu6MQtg1zpj/oDtUsPr1q8wBYM91uEHCn6j/1,keyid=masterKey0,iv=AAECAwQFBgcICQoLDA0ODw==,format=base64 \
-drive file=/storage/guest_disks/encryptdisk,key-secret=virtio-disk0-encryption-secret0,format=luks,if=none,id=drive-virtio-disk0 \
diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.args b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
index ee84ea8ef5..bae141e6c0 100644
--- a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
+++ b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-serial-device,id=virtio-serial0 \
-chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-native.args b/tests/qemuxml2argvdata/mach-virt-serial-native.args
index 576bead9d9..884b4389aa 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-native.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-native.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-chardev pty,id=charserial0 \
-serial chardev:charserial0 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.args b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
index 811cfd9ca5..002b6573fa 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1 \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device pcie-root-port,port=0x10,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-usb.args b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
index 51d6718fc0..905feca3b9 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device pcie-root-port,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
-device pcie-root-port,port=0x9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
-device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
index 0ece34d195..4d1109fd34 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
index 0ece34d195..4d1109fd34 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
index 78368f3fc8..7d1f3129f3 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
index 78368f3fc8..7d1f3129f3 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2argvdata/machine-aliases1.args
index 8569672fd2..630e0708e1 100644
--- a/tests/qemuxml2argvdata/machine-aliases1.args
+++ b/tests/qemuxml2argvdata/machine-aliases1.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2argvdata/machine-aliases2.args
index 19e5526808..d088bd0f6c 100644
--- a/tests/qemuxml2argvdata/machine-aliases2.args
+++ b/tests/qemuxml2argvdata/machine-aliases2.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2argvdata/machine-core-off.args
index 1aaf10cab1..5498c5c7b7 100644
--- a/tests/qemuxml2argvdata/machine-core-off.args
+++ b/tests/qemuxml2argvdata/machine-core-off.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2argvdata/machine-core-on.args
index aedb760692..0fe8747aec 100644
--- a/tests/qemuxml2argvdata/machine-core-on.args
+++ b/tests/qemuxml2argvdata/machine-core-on.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
index cdfbdf82e8..87881903a5 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
index cdfbdf82e8..87881903a5 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
index d9e533d0eb..b18eb1c9bf 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
index d9e533d0eb..b18eb1c9bf 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
index 967a829d42..1f99518c39 100644
--- a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.args b/tests/qemuxml2argvdata/machine-keywrap-none.args
index 967a829d42..1f99518c39 100644
--- a/tests/qemuxml2argvdata/machine-keywrap-none.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
index 49af159730..c132e55eaa 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0002,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-virtio-disk1 \
diff --git a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
index 99bce6df70..0e57d5260e 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-netdev user,id=hostnet0 \
-device virtio-net-ccw,netdev=hostnet0,id=net0,mac=00:11:22:33:44:54,devno=fe.0.0000,bootindex=1 \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390.args b/tests/qemuxml2argvdata/machine-loadparm-s390.args
index fe4d93bc35..26fc85d875 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-s390.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
diff --git a/tests/qemuxml2argvdata/machine-smm-opt.args b/tests/qemuxml2argvdata/machine-smm-opt.args
index ea44f0d090..8f01ccc0b5 100644
--- a/tests/qemuxml2argvdata/machine-smm-opt.args
+++ b/tests/qemuxml2argvdata/machine-smm-opt.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args
index 4f5870c84f..38e1927e4f 100644
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/master-key.args b/tests/qemuxml2argvdata/master-key.args
index ac3236edcb..74d6b5720c 100644
--- a/tests/qemuxml2argvdata/master-key.args
+++ b/tests/qemuxml2argvdata/master-key.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
index 2da8c7b775..80a0ed5165 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
@@ -28,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
index 1b11d6e4a0..9fe6c71a8a 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
@@ -28,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
index 0c15819e4d..7ee96f47db 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
@@ -25,4 +25,5 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
index 0c15819e4d..7ee96f47db 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
@@ -25,4 +25,5 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
index 4e540f4b44..08eb024fe3 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
@@ -26,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
index b740badd4b..d9a0afd702 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
@@ -26,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.args
index 56305c10d7..3f08f69358 100644
--- a/tests/qemuxml2argvdata/memory-hotplug.args
+++ b/tests/qemuxml2argvdata/memory-hotplug.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.args
index 5bfb18196f..34895f1a70 100644
--- a/tests/qemuxml2argvdata/memtune-unlimited.args
+++ b/tests/qemuxml2argvdata/memtune-unlimited.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args
index 5bfb18196f..34895f1a70 100644
--- a/tests/qemuxml2argvdata/memtune.args
+++ b/tests/qemuxml2argvdata/memtune.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
index ae2762f28d..35826f400a 100644
--- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
+++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
@@ -29,6 +29,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-incoming fd:7 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.args
index 5d0f9730da..97b688ec09 100644
--- a/tests/qemuxml2argvdata/migrate.args
+++ b/tests/qemuxml2argvdata/migrate.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args
index 5bfb18196f..34895f1a70 100644
--- a/tests/qemuxml2argvdata/minimal.args
+++ b/tests/qemuxml2argvdata/minimal.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata/misc-acpi.args
index 612741ce8f..1c354ebbce 100644
--- a/tests/qemuxml2argvdata/misc-acpi.args
+++ b/tests/qemuxml2argvdata/misc-acpi.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2argvdata/misc-disable-s3.args
index 67a369c391..92984bba76 100644
--- a/tests/qemuxml2argvdata/misc-disable-s3.args
+++ b/tests/qemuxml2argvdata/misc-disable-s3.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-global PIIX4_PM.disable_s3=1 \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemuxml2argvdata/misc-disable-suspends.args
index 53f63555af..13642a25b5 100644
--- a/tests/qemuxml2argvdata/misc-disable-suspends.args
+++ b/tests/qemuxml2argvdata/misc-disable-suspends.args
@@ -25,6 +25,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-global PIIX4_PM.disable_s3=1 \
-global PIIX4_PM.disable_s4=1 \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2argvdata/misc-enable-s4.args
index 4ab1fd5578..039dd63609 100644
--- a/tests/qemuxml2argvdata/misc-enable-s4.args
+++ b/tests/qemuxml2argvdata/misc-enable-s4.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-global PIIX4_PM.disable_s4=0 \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/misc-no-reboot.args b/tests/qemuxml2argvdata/misc-no-reboot.args
index a46c743b27..fbf9bba921 100644
--- a/tests/qemuxml2argvdata/misc-no-reboot.args
+++ b/tests/qemuxml2argvdata/misc-no-reboot.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-reboot \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata/misc-uuid.args
index 612741ce8f..1c354ebbce 100644
--- a/tests/qemuxml2argvdata/misc-uuid.args
+++ b/tests/qemuxml2argvdata/misc-uuid.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvdata/monitor-json.args
index 40daaa8c0b..ae6829ba73 100644
--- a/tests/qemuxml2argvdata/monitor-json.args
+++ b/tests/qemuxml2argvdata/monitor-json.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/hda1,format=qcow2,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args
index cab1e96104..d03aa53c67 100644
--- a/tests/qemuxml2argvdata/multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device lsi,id=scsi0,bus=pci.0,multifunction=off,addr=0x3 \
-device lsi,id=scsi1,bus=pci.0,multifunction=on,addr=0x4 \
-device lsi,id=scsi2,bus=pci.0,multifunction=on,addr=0x4.0x1 \
diff --git a/tests/qemuxml2argvdata/name-escape.args b/tests/qemuxml2argvdata/name-escape.args
index 0542521835..028b6efbbd 100644
--- a/tests/qemuxml2argvdata/name-escape.args
+++ b/tests/qemuxml2argvdata/name-escape.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
diff --git a/tests/qemuxml2argvdata/net-client.args b/tests/qemuxml2argvdata/net-client.args
index 542c027ffd..2d91d978e0 100644
--- a/tests/qemuxml2argvdata/net-client.args
+++ b/tests/qemuxml2argvdata/net-client.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args b/tests/qemuxml2argvdata/net-eth-hostip.args
index 1fc079641c..51a50259c1 100644
--- a/tests/qemuxml2argvdata/net-eth-hostip.args
+++ b/tests/qemuxml2argvdata/net-eth-hostip.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args b/tests/qemuxml2argvdata/net-eth-ifname.args
index 1fc079641c..51a50259c1 100644
--- a/tests/qemuxml2argvdata/net-eth-ifname.args
+++ b/tests/qemuxml2argvdata/net-eth-ifname.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-eth-names.args b/tests/qemuxml2argvdata/net-eth-names.args
index 2cf47a141f..2369d494b4 100644
--- a/tests/qemuxml2argvdata/net-eth-names.args
+++ b/tests/qemuxml2argvdata/net-eth-names.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
index 7dd257b6a7..948746f07c 100644
--- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
+++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args
index 1fc079641c..51a50259c1 100644
--- a/tests/qemuxml2argvdata/net-eth.args
+++ b/tests/qemuxml2argvdata/net-eth.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
index 961cad9db1..187be11892 100644
--- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=2 \
diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
index e3db452283..e711d47138 100644
--- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
index e988b96520..685c38675a 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args b/tests/qemuxml2argvdata/net-hostdev-vfio.args
index 9380bf4698..cc071b64dc 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-hostdev.args b/tests/qemuxml2argvdata/net-hostdev.args
index 8dc0040149..5679cd7623 100644
--- a/tests/qemuxml2argvdata/net-hostdev.args
+++ b/tests/qemuxml2argvdata/net-hostdev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-many-models.args b/tests/qemuxml2argvdata/net-many-models.args
index b14b690287..c16260f38d 100644
--- a/tests/qemuxml2argvdata/net-many-models.args
+++ b/tests/qemuxml2argvdata/net-many-models.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-netdev user,id=hostnet0 \
-device idontexist,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
-netdev user,id=hostnet1 \
diff --git a/tests/qemuxml2argvdata/net-mcast.args b/tests/qemuxml2argvdata/net-mcast.args
index 3d7e00e3cf..a9b4801a02 100644
--- a/tests/qemuxml2argvdata/net-mcast.args
+++ b/tests/qemuxml2argvdata/net-mcast.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-server.args b/tests/qemuxml2argvdata/net-server.args
index c7da6231f7..f382eaf8c7 100644
--- a/tests/qemuxml2argvdata/net-server.args
+++ b/tests/qemuxml2argvdata/net-server.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args
index 54fea5e46c..a4e12daf16 100644
--- a/tests/qemuxml2argvdata/net-udp.args
+++ b/tests/qemuxml2argvdata/net-udp.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-user-addr.args b/tests/qemuxml2argvdata/net-user-addr.args
index 4fea5dc388..9bc7053cf0 100644
--- a/tests/qemuxml2argvdata/net-user-addr.args
+++ b/tests/qemuxml2argvdata/net-user-addr.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args
index 0149c89ee8..f127fa5285 100644
--- a/tests/qemuxml2argvdata/net-user.args
+++ b/tests/qemuxml2argvdata/net-user.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
index 761dc3d7df..2b76f64821 100644
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-vhostuser.args b/tests/qemuxml2argvdata/net-vhostuser.args
index 6464f93869..92c8347662 100644
--- a/tests/qemuxml2argvdata/net-vhostuser.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-chardev socket,id=charnet0,path=/tmp/vhost0.sock,server=on \
-netdev vhost-user,chardev=charnet0,id=hostnet0 \
diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args b/tests/qemuxml2argvdata/net-virtio-ccw.args
index 3b1d230805..573475dbf3 100644
--- a/tests/qemuxml2argvdata/net-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/net-virtio-ccw.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-netdev user,id=hostnet0 \
-device virtio-net-ccw,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,devno=fe.0.0001 \
-netdev user,id=hostnet1 \
diff --git a/tests/qemuxml2argvdata/net-virtio-device.args b/tests/qemuxml2argvdata/net-virtio-device.args
index e948cb1805..f8a8970f97 100644
--- a/tests/qemuxml2argvdata/net-virtio-device.args
+++ b/tests/qemuxml2argvdata/net-virtio-device.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
index 488238662f..3ddfe258b2 100644
--- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest7,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args b/tests/qemuxml2argvdata/net-virtio-netdev.args
index b83fd76b8f..7962a89c7f 100644
--- a/tests/qemuxml2argvdata/net-virtio-netdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-netdev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
index e2451c4097..a922d23efd 100644
--- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
index bdcab5e5ec..c65ead25cc 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args b/tests/qemuxml2argvdata/net-virtio-teaming.args
index 21d4800e52..da1a276767 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/net-virtio.args b/tests/qemuxml2argvdata/net-virtio.args
index 86be7d35b7..483cc0bcea 100644
--- a/tests/qemuxml2argvdata/net-virtio.args
+++ b/tests/qemuxml2argvdata/net-virtio.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvdata/nosharepages.args
index 860f44eadc..87e27927a8 100644
--- a/tests/qemuxml2argvdata/nosharepages.args
+++ b/tests/qemuxml2argvdata/nosharepages.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
index 81b3667c7b..17e16f41ea 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
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 81b3667c7b..17e16f41ea 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
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
index 81b3667c7b..17e16f41ea 100644
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
index 81b3667c7b..17e16f41ea 100644
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args
index 81b3667c7b..17e16f41ea 100644
--- a/tests/qemuxml2argvdata/numad.args
+++ b/tests/qemuxml2argvdata/numad.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
index 81b3667c7b..17e16f41ea 100644
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args b/tests/qemuxml2argvdata/numatune-auto-prefer.args
index 6e85ab4765..f23786895b 100644
--- a/tests/qemuxml2argvdata/numatune-auto-prefer.args
+++ b/tests/qemuxml2argvdata/numatune-auto-prefer.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-distances.args b/tests/qemuxml2argvdata/numatune-distances.args
index 7272003924..3da36e5484 100644
--- a/tests/qemuxml2argvdata/numatune-distances.args
+++ b/tests/qemuxml2argvdata/numatune-distances.args
@@ -64,6 +64,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
index 2a78628a9d..9adfceb13c 100644
--- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
@@ -27,6 +27,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-memnode.args b/tests/qemuxml2argvdata/numatune-memnode.args
index d1099f6539..5243c7919a 100644
--- a/tests/qemuxml2argvdata/numatune-memnode.args
+++ b/tests/qemuxml2argvdata/numatune-memnode.args
@@ -29,6 +29,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2argvdata/numatune-memory.args
index 81b3667c7b..17e16f41ea 100644
--- a/tests/qemuxml2argvdata/numatune-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memory.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.args b/tests/qemuxml2argvdata/numatune-no-vcpu.args
index d63ff1fe15..c286c6237a 100644
--- a/tests/qemuxml2argvdata/numatune-no-vcpu.args
+++ b/tests/qemuxml2argvdata/numatune-no-vcpu.args
@@ -28,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args b/tests/qemuxml2argvdata/pages-dimm-discard.args
index 1072d8a3b6..e777eeb266 100644
--- a/tests/qemuxml2argvdata/pages-dimm-discard.args
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.args
@@ -28,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.args b/tests/qemuxml2argvdata/pages-discard-hugepages.args
index fb56c5b9a5..3b68039b0e 100644
--- a/tests/qemuxml2argvdata/pages-discard-hugepages.args
+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.args
@@ -27,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pages-discard.args b/tests/qemuxml2argvdata/pages-discard.args
index 7619bffb7a..3f89d66776 100644
--- a/tests/qemuxml2argvdata/pages-discard.args
+++ b/tests/qemuxml2argvdata/pages-discard.args
@@ -27,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/panic-double.args b/tests/qemuxml2argvdata/panic-double.args
index a5e05115cb..8fcc0e9571 100644
--- a/tests/qemuxml2argvdata/panic-double.args
+++ b/tests/qemuxml2argvdata/panic-double.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-device pvpanic,ioport=1285 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/panic-no-address.args b/tests/qemuxml2argvdata/panic-no-address.args
index a6197379e7..c9002d73b1 100644
--- a/tests/qemuxml2argvdata/panic-no-address.args
+++ b/tests/qemuxml2argvdata/panic-no-address.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/panic.args b/tests/qemuxml2argvdata/panic.args
index 0eafa64fb6..d125f5287f 100644
--- a/tests/qemuxml2argvdata/panic.args
+++ b/tests/qemuxml2argvdata/panic.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args b/tests/qemuxml2argvdata/parallel-parport-chardev.args
index aa047689f5..ea701c3739 100644
--- a/tests/qemuxml2argvdata/parallel-parport-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
index 228be9e97b..aaa32437e5 100644
--- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.args
index bdc5d7aad8..88d69bcb05 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x3 \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \
-device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.0,addr=0x5 \
diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.args
index 6df7134252..f55830a082 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device pci-bridge,chassis_nr=8,id=pci.8,bus=pci.0,addr=0x3 \
-device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x4 \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x5 \
diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.args
index f28ff5dbfb..3ac2bdf523 100644
--- a/tests/qemuxml2argvdata/pci-autofill-addr.args
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-virtio-disk0,readonly=on \
-device virtio-blk-pci,bus=pci.0,addr=0x3,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
index 74cb12a695..5f42211d01 100644
--- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
+++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x2 \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x3 \
-device pci-bridge,chassis_nr=3,id=pci.3,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.args
index bc4b120ff9..c2e28d64d4 100644
--- a/tests/qemuxml2argvdata/pci-bridge.args
+++ b/tests/qemuxml2argvdata/pci-bridge.args
@@ -21,6 +21,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device pci-bridge,chassis_nr=1,id=pci.1,bus=pci.0,addr=0x3 \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.0,addr=0x4 \
-usb \
diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2argvdata/pci-expander-bus.args
index 2277b66941..08ac1a8bc5 100644
--- a/tests/qemuxml2argvdata/pci-expander-bus.args
+++ b/tests/qemuxml2argvdata/pci-expander-bus.args
@@ -25,6 +25,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device pxb,bus_nr=254,id=pci.1,numa_node=1,bus=pci.0,addr=0x2 \
-device pxb,bus_nr=252,id=pci.2,bus=pci.0,addr=0x3 \
-netdev user,id=hostnet0 \
diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args
index 873dd99f98..e97cfd61aa 100644
--- a/tests/qemuxml2argvdata/pci-many.args
+++ b/tests/qemuxml2argvdata/pci-many.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-drive file=/var/iso/f18kde.iso,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0 \
diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args b/tests/qemuxml2argvdata/pci-rom-disabled.args
index f457994252..e67342c15b 100644
--- a/tests/qemuxml2argvdata/pci-rom-disabled.args
+++ b/tests/qemuxml2argvdata/pci-rom-disabled.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-netdev user,id=hostnet0 \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x2,romfile= \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args
index 217dd9dafe..95755eb3cf 100644
--- a/tests/qemuxml2argvdata/pci-rom.args
+++ b/tests/qemuxml2argvdata/pci-rom.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest2,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
index 2f3c3532ff..4370955e2d 100644
--- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.args
index 69e1daf4bd..abe3675cfa 100644
--- a/tests/qemuxml2argvdata/pcie-expander-bus.args
+++ b/tests/qemuxml2argvdata/pcie-expander-bus.args
@@ -25,6 +25,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device pxb-pcie,bus_nr=254,id=pci.1,numa_node=0,bus=pcie.0,addr=0x4 \
-device ioh3420,port=0x0,chassis=2,id=pci.2,bus=pci.1,addr=0x0 \
-device x3130-upstream,id=pci.3,bus=pci.2,addr=0x0 \
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
index d8121eb72b..665f0e92ec 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device pcie-root-port,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
-device pcie-root-port,port=0x9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
-device ioh3420,port=0xa,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
index 631d08db04..a2a8cbcb76 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ioh3420,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
-device ioh3420,port=0x9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.args
index 2ea23ddf5d..9c11c3e515 100644
--- a/tests/qemuxml2argvdata/pcie-root-port.args
+++ b/tests/qemuxml2argvdata/pcie-root-port.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
-device ioh3420,port=0x1a,chassis=40,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
diff --git a/tests/qemuxml2argvdata/pcie-root.args b/tests/qemuxml2argvdata/pcie-root.args
index 973a430c34..ceb430b9e8 100644
--- a/tests/qemuxml2argvdata/pcie-root.args
+++ b/tests/qemuxml2argvdata/pcie-root.args
@@ -23,4 +23,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
index e16f9cdc52..0dd8e084b2 100644
--- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,addr=0x2 \
-device x3130-upstream,id=pci.2,bus=pci.1,addr=0x0 \
-device xio3130-downstream,port=0x0,chassis=3,id=pci.3,bus=pci.2,addr=0x0 \
diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
index b665a396d2..91f69f47b1 100644
--- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
-device ioh3420,port=0x11,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
-device x3130-upstream,id=pci.3,bus=pci.1,addr=0x0 \
diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argvdata/pcihole64-q35.args
index 73b7f60191..03257d4d40 100644
--- a/tests/qemuxml2argvdata/pcihole64-q35.args
+++ b/tests/qemuxml2argvdata/pcihole64-q35.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-global q35-pcihost.pci-hole64-size=1048576K \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-sata0-0-0 \
-device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata/pcihole64.args
index e0a26eac11..8d34b0b020 100644
--- a/tests/qemuxml2argvdata/pcihole64.args
+++ b/tests/qemuxml2argvdata/pcihole64.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-global i440FX-pcihost.pci-hole64-size=1048576K \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args b/tests/qemuxml2argvdata/pmu-feature-off.args
index 4574197064..cd77cf3983 100644
--- a/tests/qemuxml2argvdata/pmu-feature-off.args
+++ b/tests/qemuxml2argvdata/pmu-feature-off.args
@@ -23,5 +23,6 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvdata/pmu-feature.args
index bff7c5a19d..396c6553e8 100644
--- a/tests/qemuxml2argvdata/pmu-feature.args
+++ b/tests/qemuxml2argvdata/pmu-feature.args
@@ -23,5 +23,6 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/ppc-dtb.args b/tests/qemuxml2argvdata/ppc-dtb.args
index 69d69e7851..6c91ca58f9 100644
--- a/tests/qemuxml2argvdata/ppc-dtb.args
+++ b/tests/qemuxml2argvdata/ppc-dtb.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-kernel /media/ram/uImage \
-initrd /media/ram/ramdisk \
-append 'root=/dev/ram rw console=ttyS0,115200' \
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
index db83234be5..c80f5e0491 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
index 5734d3eac2..e7180983ed 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device qemu-xhci,id=usb,bus=pci.0,addr=0x1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller.args b/tests/qemuxml2argvdata/ppc64-usb-controller.args
index 97e76d39b8..d1610e7e11 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/ppce500-serial.args b/tests/qemuxml2argvdata/ppce500-serial.args
index 7ffb81611c..8d2530bc54 100644
--- a/tests/qemuxml2argvdata/ppce500-serial.args
+++ b/tests/qemuxml2argvdata/ppce500-serial.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-kernel /media/ram/uImage \
-initrd /media/ram/ramdisk \
-append 'root=/dev/ram rw console=ttyS0,115200' \
diff --git a/tests/qemuxml2argvdata/pseries-basic.args b/tests/qemuxml2argvdata/pseries-basic.args
index a8399d6e8f..6f99f1c544 100644
--- a/tests/qemuxml2argvdata/pseries-basic.args
+++ b/tests/qemuxml2argvdata/pseries-basic.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
diff --git a/tests/qemuxml2argvdata/pseries-console-virtio.args b/tests/qemuxml2argvdata/pseries-console-virtio.args
index a192898edb..2a49796b64 100644
--- a/tests/qemuxml2argvdata/pseries-console-virtio.args
+++ b/tests/qemuxml2argvdata/pseries-console-virtio.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x1 \
-chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
index f8a75c46bb..e8421d6875 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat.args b/tests/qemuxml2argvdata/pseries-cpu-compat.args
index 758a5fb3ee..884f75f4f0 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-compat.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-exact.args b/tests/qemuxml2argvdata/pseries-cpu-exact.args
index ae5764968f..8b698edc5f 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-exact.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-exact.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
diff --git a/tests/qemuxml2argvdata/pseries-cpu-le.args b/tests/qemuxml2argvdata/pseries-cpu-le.args
index 6800b90688..dfcc69d234 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-le.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-le.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
diff --git a/tests/qemuxml2argvdata/pseries-features.args b/tests/qemuxml2argvdata/pseries-features.args
index 132f2fe0ed..defb5e2f39 100644
--- a/tests/qemuxml2argvdata/pseries-features.args
+++ b/tests/qemuxml2argvdata/pseries-features.args
@@ -22,4 +22,5 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-1.args b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
index 5f0395f187..5f7c8360bb 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-1.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device spapr-pci-host-bridge,index=1,id=pci.1 \
-device spapr-pci-host-bridge,index=2,id=pci.2 \
-device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.1.0,addr=0x1 \
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.args b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
index 60e7cccea3..e63b229533 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-2.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device spapr-pci-host-bridge,index=1,id=pci.1 \
-device spapr-pci-host-bridge,index=2,id=pci.2 \
-device virtio-scsi-pci,id=scsi0,bus=pci.1.0,addr=0x1 \
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.args b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
index 77e9925f6d..8ba58fd147 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-3.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device spapr-pci-host-bridge,index=1,id=pci.1 \
-device spapr-pci-host-bridge,index=2,id=pci.2 \
-device vfio-pci,host=0001:01:00.0,id=hostdev0,bus=pci.2.0,addr=0x1 \
diff --git a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
index 6fe1e51f38..b44889a951 100644
--- a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
+++ b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
@@ -23,4 +23,5 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-many-buses-1.args b/tests/qemuxml2argvdata/pseries-many-buses-1.args
index 9ef2aa907e..a1776b0c2e 100644
--- a/tests/qemuxml2argvdata/pseries-many-buses-1.args
+++ b/tests/qemuxml2argvdata/pseries-many-buses-1.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device spapr-pci-host-bridge,index=1,id=pci.1 \
-device virtio-scsi-pci,id=scsi0,bus=pci.1.0,addr=0x1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-many-buses-2.args b/tests/qemuxml2argvdata/pseries-many-buses-2.args
index 5aa4aefa31..23c59e7633 100644
--- a/tests/qemuxml2argvdata/pseries-many-buses-2.args
+++ b/tests/qemuxml2argvdata/pseries-many-buses-2.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device spapr-pci-host-bridge,index=1,id=pci.2 \
-device spapr-pci-host-bridge,index=2,id=pci.1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-many-devices.args b/tests/qemuxml2argvdata/pseries-many-devices.args
index 67bf2b0f70..134e2d8be1 100644
--- a/tests/qemuxml2argvdata/pseries-many-devices.args
+++ b/tests/qemuxml2argvdata/pseries-many-devices.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device spapr-pci-host-bridge,index=1,id=pci.1 \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x1 \
-device virtio-scsi-pci,id=scsi1,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/pseries-nvram.args b/tests/qemuxml2argvdata/pseries-nvram.args
index 5bf0f59522..38df986d3a 100644
--- a/tests/qemuxml2argvdata/pseries-nvram.args
+++ b/tests/qemuxml2argvdata/pseries-nvram.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-global spapr-nvram.reg=0x4000 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-panic-missing.args b/tests/qemuxml2argvdata/pseries-panic-missing.args
index a8399d6e8f..6f99f1c544 100644
--- a/tests/qemuxml2argvdata/pseries-panic-missing.args
+++ b/tests/qemuxml2argvdata/pseries-panic-missing.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
diff --git a/tests/qemuxml2argvdata/pseries-panic-no-address.args b/tests/qemuxml2argvdata/pseries-panic-no-address.args
index a8399d6e8f..6f99f1c544 100644
--- a/tests/qemuxml2argvdata/pseries-panic-no-address.args
+++ b/tests/qemuxml2argvdata/pseries-panic-no-address.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
diff --git a/tests/qemuxml2argvdata/pseries-phb-default-missing.args b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
index e854714236..37368cbe9c 100644
--- a/tests/qemuxml2argvdata/pseries-phb-default-missing.args
+++ b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device spapr-pci-host-bridge,index=1,id=pci.1 \
-device spapr-pci-host-bridge,index=2,id=pci.2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.args b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
index 64a0bb20f8..e203f2e90e 100644
--- a/tests/qemuxml2argvdata/pseries-phb-numa-node.args
+++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
@@ -26,6 +26,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device spapr-pci-host-bridge,index=1,id=pci.1,numa_node=1 \
-device spapr-pci-host-bridge,index=2,id=pci.2 \
-device spapr-pci-host-bridge,index=3,id=pci.3,numa_node=0 \
diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.args b/tests/qemuxml2argvdata/pseries-phb-simple.args
index e854714236..37368cbe9c 100644
--- a/tests/qemuxml2argvdata/pseries-phb-simple.args
+++ b/tests/qemuxml2argvdata/pseries-phb-simple.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device spapr-pci-host-bridge,index=1,id=pci.1 \
-device spapr-pci-host-bridge,index=2,id=pci.2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-serial-native.args b/tests/qemuxml2argvdata/pseries-serial-native.args
index 7c3330be10..dc50f0a00e 100644
--- a/tests/qemuxml2argvdata/pseries-serial-native.args
+++ b/tests/qemuxml2argvdata/pseries-serial-native.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-serial-pci.args b/tests/qemuxml2argvdata/pseries-serial-pci.args
index f09d53b049..a8d01b002e 100644
--- a/tests/qemuxml2argvdata/pseries-serial-pci.args
+++ b/tests/qemuxml2argvdata/pseries-serial-pci.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-chardev pty,id=charserial0 \
-device pci-serial,chardev=charserial0,id=serial0,bus=pci.0,addr=0x1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-serial-usb.args b/tests/qemuxml2argvdata/pseries-serial-usb.args
index 15b6531fa4..cd6e47363e 100644
--- a/tests/qemuxml2argvdata/pseries-serial-usb.args
+++ b/tests/qemuxml2argvdata/pseries-serial-usb.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device qemu-xhci,id=usb,bus=pci.0,addr=0x1 \
-chardev pty,id=charserial0 \
-device usb-serial,chardev=charserial0,id=serial0,bus=usb.0,port=1 \
diff --git a/tests/qemuxml2argvdata/pseries-usb-default.args b/tests/qemuxml2argvdata/pseries-usb-default.args
index caea432e7a..1810baf83a 100644
--- a/tests/qemuxml2argvdata/pseries-usb-default.args
+++ b/tests/qemuxml2argvdata/pseries-usb-default.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
diff --git a/tests/qemuxml2argvdata/pseries-usb-kbd.args b/tests/qemuxml2argvdata/pseries-usb-kbd.args
index 412c7d1754..5fde085de8 100644
--- a/tests/qemuxml2argvdata/pseries-usb-kbd.args
+++ b/tests/qemuxml2argvdata/pseries-usb-kbd.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=0x30000000 \
diff --git a/tests/qemuxml2argvdata/pseries-usb-multi.args b/tests/qemuxml2argvdata/pseries-usb-multi.args
index b001c72d48..77bb8538b0 100644
--- a/tests/qemuxml2argvdata/pseries-usb-multi.args
+++ b/tests/qemuxml2argvdata/pseries-usb-multi.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1 \
-device pci-ohci,id=usb1,bus=pci.0,addr=0x2 \
-chardev pty,id=charserial0 \
diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
index ead0c90e2c..35ad8a7c66 100644
--- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
+++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device spapr-vscsi,id=scsi0,reg=0x00002000 \
-device spapr-vscsi,id=scsi1,reg=0x30000000 \
-usb \
diff --git a/tests/qemuxml2argvdata/pseries-vio.args b/tests/qemuxml2argvdata/pseries-vio.args
index 79a6e28dbd..2c1c4e0f8b 100644
--- a/tests/qemuxml2argvdata/pseries-vio.args
+++ b/tests/qemuxml2argvdata/pseries-vio.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device spapr-vscsi,id=scsi0,reg=0x00002000 \
-device spapr-vscsi,id=scsi1,reg=0x00003000 \
-usb \
diff --git a/tests/qemuxml2argvdata/q35-acpi-nouefi.args b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
index f066950f11..e8bfdd3c57 100644
--- a/tests/qemuxml2argvdata/q35-acpi-nouefi.args
+++ b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-kernel /var/lib/libvirt/images/guest.vmlinuz \
-initrd /var/lib/libvirt/images/guest.initramfs \
-append 'rw root=/dev/vda rootwait' \
diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.args b/tests/qemuxml2argvdata/q35-acpi-uefi.args
index 750a524cd6..2c01a8eb6c 100644
--- a/tests/qemuxml2argvdata/q35-acpi-uefi.args
+++ b/tests/qemuxml2argvdata/q35-acpi-uefi.args
@@ -25,4 +25,5 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.args b/tests/qemuxml2argvdata/q35-default-devices-only.args
index 95b4be5815..0a16e8c5a6 100644
--- a/tests/qemuxml2argvdata/q35-default-devices-only.args
+++ b/tests/qemuxml2argvdata/q35-default-devices-only.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ioh3420,port=0x8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
-device ioh3420,port=0x9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
-device ioh3420,port=0xa,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
diff --git a/tests/qemuxml2argvdata/q35-multifunction.args b/tests/qemuxml2argvdata/q35-multifunction.args
index 859d155c96..92a346f61f 100644
--- a/tests/qemuxml2argvdata/q35-multifunction.args
+++ b/tests/qemuxml2argvdata/q35-multifunction.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
-device ioh3420,port=0x11,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
-device ioh3420,port=0x12,chassis=3,id=pci.3,bus=pcie.0,addr=0x2.0x2 \
diff --git a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
index e44d9f1951..9886d0406d 100644
--- a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
+++ b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-kernel /var/lib/libvirt/images/guest.vmlinuz \
-initrd /var/lib/libvirt/images/guest.initramfs \
-append 'rw root=/dev/vda rootwait' \
diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemuxml2argvdata/q35-pci-force-address.args
index 32fe113760..27a731b26a 100644
--- a/tests/qemuxml2argvdata/q35-pci-force-address.args
+++ b/tests/qemuxml2argvdata/q35-pci-force-address.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.args b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
index ddc336e8bb..a39a63b0d0 100644
--- a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
+++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
-device ioh3420,port=0x11,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
-device ioh3420,port=0x12,chassis=3,id=pci.3,bus=pcie.0,addr=0x2.0x2 \
diff --git a/tests/qemuxml2argvdata/q35-pcie.args b/tests/qemuxml2argvdata/q35-pcie.args
index df81c31540..4c07563457 100644
--- a/tests/qemuxml2argvdata/q35-pcie.args
+++ b/tests/qemuxml2argvdata/q35-pcie.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,multifunction=on,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
index 153936a858..c9d4fa7d1b 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
@@ -25,6 +25,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-global PIIX4_PM.disable_s3=1 \
-global PIIX4_PM.disable_s4=1 \
+-boot strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args b/tests/qemuxml2argvdata/q35-pm-disable.args
index ad6c9a55a4..b8acbcc053 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable.args
@@ -25,6 +25,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-global ICH9-LPC.disable_s3=1 \
-global ICH9-LPC.disable_s4=1 \
+-boot strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device ioh3420,port=0x8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2argvdata/q35-usb2-multi.args
index 517d383eda..2d847da079 100644
--- a/tests/qemuxml2argvdata/q35-usb2-multi.args
+++ b/tests/qemuxml2argvdata/q35-usb2-multi.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=56,id=pci.2,bus=pci.1,addr=0x0 \
-device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \
diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2argvdata/q35-usb2-reorder.args
index 6931da6002..a6cfb4465d 100644
--- a/tests/qemuxml2argvdata/q35-usb2-reorder.args
+++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=56,id=pci.2,bus=pci.1,addr=0x0 \
-device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \
diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args
index be863d9adc..77807d8189 100644
--- a/tests/qemuxml2argvdata/q35-usb2.args
+++ b/tests/qemuxml2argvdata/q35-usb2.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=56,id=pci.2,bus=pci.1,addr=0x0 \
-device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \
diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
index 262548baed..f448e4219d 100644
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=spice \
-no-shutdown \
-global ICH9-LPC.disable_s3=1 \
-global ICH9-LPC.disable_s4=1 \
+-boot strict=on \
-device ioh3420,port=0x10,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x2 \
-device ioh3420,port=0x11,chassis=2,id=pci.2,bus=pcie.0,addr=0x2.0x1 \
-device ioh3420,port=0x12,chassis=3,id=pci.3,bus=pcie.0,addr=0x2.0x2 \
diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.args b/tests/qemuxml2argvdata/q35-virtio-pci.args
index c6f3c6accd..8f81d21bc0 100644
--- a/tests/qemuxml2argvdata/q35-virtio-pci.args
+++ b/tests/qemuxml2argvdata/q35-virtio-pci.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device i82801b11-bridge,id=pci.1,bus=pcie.0,addr=0x1e \
-device pci-bridge,chassis_nr=2,id=pci.2,bus=pci.1,addr=0x0 \
-device ioh3420,port=0x10,chassis=3,id=pci.3,bus=pcie.0,multifunction=on,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args
index ef48c371ae..e9b1060d18 100644
--- a/tests/qemuxml2argvdata/q35.args
+++ b/tests/qemuxml2argvdata/q35.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ich9-usb-ehci1,id=usb,bus=pcie.0,addr=0x1d.0x7 \
-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pcie.0,multifunction=on,addr=0x1d \
-device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pcie.0,addr=0x1d.0x1 \
diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.args
index 238303c952..8cb2611b82 100644
--- a/tests/qemuxml2argvdata/qemu-ns-alt.args
+++ b/tests/qemuxml2argvdata/qemu-ns-alt.args
@@ -25,6 +25,7 @@ BAR='' \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
index ae46dc5967..dcbbe84ea4 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
index ae46dc5967..dcbbe84ea4 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.args
index ae46dc5967..dcbbe84ea4 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
index ae46dc5967..dcbbe84ea4 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
index ae46dc5967..dcbbe84ea4 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
index ae46dc5967..dcbbe84ea4 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemu-ns-no-env.args
index db96cdaa32..9833bda423 100644
--- a/tests/qemuxml2argvdata/qemu-ns-no-env.args
+++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
index c7b9fa5290..5018828b48 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
@@ -23,6 +23,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--boot reboot-timeout=-1 \
+-boot reboot-timeout=-1,strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
index 9c2b0edfc3..98a2c323fc 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
@@ -23,6 +23,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--boot reboot-timeout=128 \
+-boot reboot-timeout=128,strict=on \
-usb \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args b/tests/qemuxml2argvdata/restore-v2-fd.args
index 7c8f2d9bb1..9468513cdd 100644
--- a/tests/qemuxml2argvdata/restore-v2-fd.args
+++ b/tests/qemuxml2argvdata/restore-v2-fd.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/restore-v2.args b/tests/qemuxml2argvdata/restore-v2.args
index 79cedcb020..e149ce2015 100644
--- a/tests/qemuxml2argvdata/restore-v2.args
+++ b/tests/qemuxml2argvdata/restore-v2.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.args b/tests/qemuxml2argvdata/riscv64-virt-pci.args
index e273017347..63fb11004a 100644
--- a/tests/qemuxml2argvdata/riscv64-virt-pci.args
+++ b/tests/qemuxml2argvdata/riscv64-virt-pci.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-kernel /var/lib/libvirt/images/riscv64.bbl \
-append root=/dev/vda \
-drive file=/var/lib/libvirt/images/riscv64.qcow2,format=qcow2,if=none,id=drive-virtio-disk0 \
diff --git a/tests/qemuxml2argvdata/riscv64-virt.args b/tests/qemuxml2argvdata/riscv64-virt.args
index 7de7318f06..4b630cc58f 100644
--- a/tests/qemuxml2argvdata/riscv64-virt.args
+++ b/tests/qemuxml2argvdata/riscv64-virt.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-kernel /var/lib/libvirt/images/bbl \
-append 'console=ttyS0 ro root=/dev/vda' \
-drive file=/var/lib/libvirt/images/stage4-disk.img,format=raw,if=none,id=drive-virtio-disk0 \
diff --git a/tests/qemuxml2argvdata/s390-panic-missing.args b/tests/qemuxml2argvdata/s390-panic-missing.args
index 5d5e7c2bc4..2ae8240458 100644
--- a/tests/qemuxml2argvdata/s390-panic-missing.args
+++ b/tests/qemuxml2argvdata/s390-panic-missing.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0000 \
-chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 \
diff --git a/tests/qemuxml2argvdata/s390-panic-no-address.args b/tests/qemuxml2argvdata/s390-panic-no-address.args
index 4d1a7aecff..71b4020186 100644
--- a/tests/qemuxml2argvdata/s390-panic-no-address.args
+++ b/tests/qemuxml2argvdata/s390-panic-no-address.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0000 \
-chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 \
diff --git a/tests/qemuxml2argvdata/s390-serial-2.args b/tests/qemuxml2argvdata/s390-serial-2.args
index 28532e6dc0..62c71b1fd5 100644
--- a/tests/qemuxml2argvdata/s390-serial-2.args
+++ b/tests/qemuxml2argvdata/s390-serial-2.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-chardev pty,id=charserial0 \
-device sclpconsole,chardev=charserial0,id=serial0 \
-chardev pty,id=charserial1 \
diff --git a/tests/qemuxml2argvdata/s390-serial-console.args b/tests/qemuxml2argvdata/s390-serial-console.args
index a498c92f62..af9a799d85 100644
--- a/tests/qemuxml2argvdata/s390-serial-console.args
+++ b/tests/qemuxml2argvdata/s390-serial-console.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-chardev pty,id=charserial0 \
-device sclpconsole,chardev=charserial0,id=serial0 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/s390-serial.args b/tests/qemuxml2argvdata/s390-serial.args
index a498c92f62..af9a799d85 100644
--- a/tests/qemuxml2argvdata/s390-serial.args
+++ b/tests/qemuxml2argvdata/s390-serial.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-chardev pty,id=charserial0 \
-device sclpconsole,chardev=charserial0,id=serial0 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.args
index 5bfb18196f..34895f1a70 100644
--- a/tests/qemuxml2argvdata/seclabel-dac-none.args
+++ b/tests/qemuxml2argvdata/seclabel-dac-none.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
index 5bfb18196f..34895f1a70 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
index 5bfb18196f..34895f1a70 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
index f242e65f7c..f9125b25ba 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
index 5bfb18196f..34895f1a70 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.args
index 5bfb18196f..34895f1a70 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.args
index 5bfb18196f..34895f1a70 100644
--- a/tests/qemuxml2argvdata/seclabel-none.args
+++ b/tests/qemuxml2argvdata/seclabel-none.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
index 5bfb18196f..34895f1a70 100644
--- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.args
index 5bfb18196f..34895f1a70 100644
--- a/tests/qemuxml2argvdata/seclabel-static-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.args
index 5bfb18196f..34895f1a70 100644
--- a/tests/qemuxml2argvdata/seclabel-static.args
+++ b/tests/qemuxml2argvdata/seclabel-static.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
index ea4156f4f2..22238c042b 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml2argvdata/serial-dev-chardev.args
index a22288af6a..b391f6cdc9 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args b/tests/qemuxml2argvdata/serial-file-chardev.args
index c77793b756..d1c6ea19d1 100644
--- a/tests/qemuxml2argvdata/serial-file-chardev.args
+++ b/tests/qemuxml2argvdata/serial-file-chardev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/serial-file-log.args b/tests/qemuxml2argvdata/serial-file-log.args
index 5d3c1f02bf..a995a5cd39 100644
--- a/tests/qemuxml2argvdata/serial-file-log.args
+++ b/tests/qemuxml2argvdata/serial-file-log.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args b/tests/qemuxml2argvdata/serial-many-chardev.args
index 34810fd637..030dd96cae 100644
--- a/tests/qemuxml2argvdata/serial-many-chardev.args
+++ b/tests/qemuxml2argvdata/serial-many-chardev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args b/tests/qemuxml2argvdata/serial-pty-chardev.args
index 96fd60c31f..ce48dde74f 100644
--- a/tests/qemuxml2argvdata/serial-pty-chardev.args
+++ b/tests/qemuxml2argvdata/serial-pty-chardev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.args b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
index 5bfb18196f..34895f1a70 100644
--- a/tests/qemuxml2argvdata/serial-spiceport-nospice.args
+++ b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2argvdata/serial-spiceport.args
index a95630a001..287e683af3 100644
--- a/tests/qemuxml2argvdata/serial-spiceport.args
+++ b/tests/qemuxml2argvdata/serial-spiceport.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args b/tests/qemuxml2argvdata/serial-tcp-chardev.args
index 70e2320f9d..a411c4b4a5 100644
--- a/tests/qemuxml2argvdata/serial-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
index 69ccb6579e..efab1dce27 100644
--- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
index e2a095d3ec..8e4fce1f78 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
index 26f158a738..8f1560e0f9 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
index 26f158a738..8f1560e0f9 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
index 388fc20ac3..64b667c6f7 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args b/tests/qemuxml2argvdata/serial-udp-chardev.args
index feabbdd0f5..af4a347ef9 100644
--- a/tests/qemuxml2argvdata/serial-udp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-udp-chardev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args b/tests/qemuxml2argvdata/serial-unix-chardev.args
index b8acc5006b..eb779fbe40 100644
--- a/tests/qemuxml2argvdata/serial-unix-chardev.args
+++ b/tests/qemuxml2argvdata/serial-unix-chardev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-chardev socket,id=charserial0,path=/tmp/serial.sock \
-device isa-serial,chardev=charserial0,id=serial0 \
diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args b/tests/qemuxml2argvdata/serial-vc-chardev.args
index 7e00265b10..458b61e396 100644
--- a/tests/qemuxml2argvdata/serial-vc-chardev.args
+++ b/tests/qemuxml2argvdata/serial-vc-chardev.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
index b1785d6936..59252a65cc 100644
--- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-object memory-backend-file,id=shmmem-shmem0,mem-path=/dev/shm/shmem0,size=4194304,share=on \
-device ivshmem-plain,id=shmem0,memdev=shmmem-shmem0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shmem.args
index c16921be0a..b6e986d25e 100644
--- a/tests/qemuxml2argvdata/shmem.args
+++ b/tests/qemuxml2argvdata/shmem.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device ivshmem,id=shmem0,size=4m,shm=shmem0,bus=pci.0,addr=0x2 \
-device ivshmem,id=shmem1,size=128m,shm=shmem1,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemuxml2argvdata/smartcard-controller.args
index f6645f8d66..edb20b7f8f 100644
--- a/tests/qemuxml2argvdata/smartcard-controller.args
+++ b/tests/qemuxml2argvdata/smartcard-controller.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
index 4591746257..1df8f0fd0d 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-device ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,cert3=cert3,db=/tmp/foo,id=smartcard0,bus=ccid0.0 \
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/tests/qemuxml2argvdata/smartcard-host-certificates.args
index 117bbfe298..48544e8692 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-device ccid-card-emulated,backend=certificates,cert1=cert1,cert2=cert2,cert3=cert3,db=/etc/pki/nssdb,id=smartcard0,bus=ccid0.0 \
diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2argvdata/smartcard-host.args
index f6645f8d66..edb20b7f8f 100644
--- a/tests/qemuxml2argvdata/smartcard-host.args
+++ b/tests/qemuxml2argvdata/smartcard-host.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
index b0ff93f097..52be7b407a 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-chardev spicevmc,id=charsmartcard0,name=smartcard \
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
index 2002e7760c..d717cd1a11 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-chardev socket,id=charsmartcard0,host=127.0.0.1,port=2001,server=on,wait=off \
diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.args b/tests/qemuxml2argvdata/smbios-type-fwcfg.args
index e6ec484c92..0a610de10d 100644
--- a/tests/qemuxml2argvdata/smbios-type-fwcfg.args
+++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.args
@@ -28,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args
index 0d38984f93..0cab82d29b 100644
--- a/tests/qemuxml2argvdata/smbios.args
+++ b/tests/qemuxml2argvdata/smbios.args
@@ -28,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args
index 4cf7c2ac80..3cbd328d01 100644
--- a/tests/qemuxml2argvdata/smp-dies.args
+++ b/tests/qemuxml2argvdata/smp-dies.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args
index 3c45d2caed..0f45f05c39 100644
--- a/tests/qemuxml2argvdata/smp.args
+++ b/tests/qemuxml2argvdata/smp.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/sound-device.args b/tests/qemuxml2argvdata/sound-device.args
index 25da438f48..6a6b6f01da 100644
--- a/tests/qemuxml2argvdata/sound-device.args
+++ b/tests/qemuxml2argvdata/sound-device.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sound.args
index 01c5831610..62d53627f5 100644
--- a/tests/qemuxml2argvdata/sound.args
+++ b/tests/qemuxml2argvdata/sound.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/sparc-minimal.args b/tests/qemuxml2argvdata/sparc-minimal.args
index c6af3ad975..143375043b 100644
--- a/tests/qemuxml2argvdata/sparc-minimal.args
+++ b/tests/qemuxml2argvdata/sparc-minimal.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-usb \
-drive file=/home/berrange/VirtualMachines/redhat-6.2-sparc.img,format=qcow2,if=none,id=drive-scsi0-0-0-0 \
-device scsi-hd,bus=scsi.0,scsi-id=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args b/tests/qemuxml2argvdata/usb-controller-default-q35.args
index 7afb179653..9ffc6ab5e5 100644
--- a/tests/qemuxml2argvdata/usb-controller-default-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args
@@ -23,5 +23,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pcie.0,addr=0x1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
index 8af464a690..cb32b341e2 100644
--- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
@@ -23,5 +23,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device nec-usb-xhci,id=usb,bus=pcie.0,addr=0x1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
index 99d36b730d..ed0487a84e 100644
--- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
@@ -23,5 +23,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device qemu-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxml2argvdata/usb-controller-xhci.args
index b9e9b09f7c..9b84c4ed0a 100644
--- a/tests/qemuxml2argvdata/usb-controller-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-xhci.args
@@ -23,5 +23,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device nec-usb-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller.args b/tests/qemuxml2argvdata/usb-controller.args
index 363892b0e2..ef6b82f8e6 100644
--- a/tests/qemuxml2argvdata/usb-controller.args
+++ b/tests/qemuxml2argvdata/usb-controller.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
index e18b3c5961..69d4d1b014 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device usb-hub,id=hub0,bus=usb.0,port=1 \
-device usb-hub,id=hub1,bus=usb.0,port=2 \
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2argvdata/usb-hub-autoadd.args
index 7546dc4ad9..fc498d7bdb 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device usb-hub,id=hub0,bus=usb.0,port=1 \
-device usb-mouse,id=input0,bus=usb.0,port=2 \
diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args
index c0cf4630c3..0d3f13396c 100644
--- a/tests/qemuxml2argvdata/usb-hub.args
+++ b/tests/qemuxml2argvdata/usb-hub.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device usb-hub,id=hub0,bus=usb.0,port=1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
index a46d24ff2d..7c2a2325b3 100644
--- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \
-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
-device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml2argvdata/usb-ich9-companion.args
index 1dbe8dc7fe..9ab8a7a4d7 100644
--- a/tests/qemuxml2argvdata/usb-ich9-companion.args
+++ b/tests/qemuxml2argvdata/usb-ich9-companion.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \
-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
-device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
index 34f0f9cf51..f76d1f6f76 100644
--- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
+++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x2.0x7 \
-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x2 \
-device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x2.0x2 \
diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml2argvdata/usb-long-port-path.args
index 9117309f07..5e5e588e01 100644
--- a/tests/qemuxml2argvdata/usb-long-port-path.args
+++ b/tests/qemuxml2argvdata/usb-long-port-path.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device usb-hub,id=hub0,bus=usb.0,port=1 \
-device usb-hub,id=hub1,bus=usb.0,port=1.1 \
diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args
index d01ecf40f4..82b72ea57b 100644
--- a/tests/qemuxml2argvdata/usb-none.args
+++ b/tests/qemuxml2argvdata/usb-none.args
@@ -23,5 +23,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemuxml2argvdata/usb-piix3-controller.args
index f75856d5b9..4609816cd1 100644
--- a/tests/qemuxml2argvdata/usb-piix3-controller.args
+++ b/tests/qemuxml2argvdata/usb-piix3-controller.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxml2argvdata/usb-port-autoassign.args
index 573f6afcb5..47999bf1ad 100644
--- a/tests/qemuxml2argvdata/usb-port-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-port-autoassign.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device usb-hub,id=hub0,bus=usb.0,port=1 \
-device usb-hub,id=hub1,bus=usb.0,port=2 \
diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2argvdata/usb-port-missing.args
index 7dc89ab92a..cdae771500 100644
--- a/tests/qemuxml2argvdata/usb-port-missing.args
+++ b/tests/qemuxml2argvdata/usb-port-missing.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device usb-hub,id=hub0,bus=usb.0,port=1 \
-device usb-hub,id=hub1,bus=usb.0,port=2 \
diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata/usb-ports.args
index 3d83a1d71b..2aae99e62d 100644
--- a/tests/qemuxml2argvdata/usb-ports.args
+++ b/tests/qemuxml2argvdata/usb-ports.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device usb-hub,id=hub0,bus=usb.0,port=1 \
-device usb-hub,id=hub1,bus=usb.0,port=1.2 \
diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2argvdata/usb-redir-boot.args
index 7e085d164f..5fe01243ab 100644
--- a/tests/qemuxml2argvdata/usb-redir-boot.args
+++ b/tests/qemuxml2argvdata/usb-redir-boot.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \
-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
-device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/qemuxml2argvdata/usb-redir-filter-version.args
index 150d3600bf..da2c47fc67 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter-version.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-chardev spicevmc,id=charredir0,name=usbredir \
-device 'usb-redir,chardev=charredir0,id=redir0,filter=0x08:0x15E1:0x2007:0x0109:1|0x08:0x15E1:0x2007:0x0940:1|-1:-1:-1:-1:0,bus=usb.0,port=1' \
diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2argvdata/usb-redir-filter.args
index a95fe98778..1cc639f055 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \
-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
-device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata/usb-redir.args
index 5d987e833a..b70bddbea4 100644
--- a/tests/qemuxml2argvdata/usb-redir.args
+++ b/tests/qemuxml2argvdata/usb-redir.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device ich9-usb-ehci1,id=usb,bus=pci.0,addr=0x4.0x7 \
-device ich9-usb-uhci1,masterbus=usb.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
-device ich9-usb-uhci2,masterbus=usb.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
index f1a0c939da..f8307b4539 100644
--- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device nec-usb-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2 \
-device usb-hub,id=hub0,bus=usb.0,port=1 \
-device usb-hub,id=hub1,bus=usb.0,port=2 \
diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata/usb1-usb2.args
index 1826a8eec4..79276979e9 100644
--- a/tests/qemuxml2argvdata/usb1-usb2.args
+++ b/tests/qemuxml2argvdata/usb1-usb2.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-device ich9-usb-ehci1,id=usb1,bus=pci.0,addr=0x4.0x7 \
-device ich9-usb-uhci1,masterbus=usb1.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/user-aliases-usb.args b/tests/qemuxml2argvdata/user-aliases-usb.args
index f6bbe7e803..411e3197a5 100644
--- a/tests/qemuxml2argvdata/user-aliases-usb.args
+++ b/tests/qemuxml2argvdata/user-aliases-usb.args
@@ -24,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-global PIIX4_PM.disable_s3=0 \
-global PIIX4_PM.disable_s4=0 \
+-boot strict=on \
-device ich9-usb-ehci1,id=ua-myUSB1,bus=pci.0,addr=0x4.0x7 \
-device ich9-usb-uhci1,masterbus=ua-myUSB1.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4 \
-device ich9-usb-uhci2,masterbus=ua-myUSB1.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvdata/user-aliases.args
index 81011b4b56..cb26a8d293 100644
--- a/tests/qemuxml2argvdata/user-aliases.args
+++ b/tests/qemuxml2argvdata/user-aliases.args
@@ -32,6 +32,7 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-global PIIX4_PM.disable_s3=0 \
-global PIIX4_PM.disable_s4=0 \
+-boot strict=on \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x8 \
-usb \
-device usb-ccid,id=ua-myCCID,bus=ua-SomeWeirdController.0,port=1 \
diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.args b/tests/qemuxml2argvdata/vcpu-placement-static.args
index 9d8f2a0686..220c3e104e 100644
--- a/tests/qemuxml2argvdata/vcpu-placement-static.args
+++ b/tests/qemuxml2argvdata/vcpu-placement-static.args
@@ -25,4 +25,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
index 32d4f513ee..8bf469d6e9 100644
--- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
+++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/video-none-device.args b/tests/qemuxml2argvdata/video-none-device.args
index e79a82afe5..edccd80eb7 100644
--- a/tests/qemuxml2argvdata/video-none-device.args
+++ b/tests/qemuxml2argvdata/video-none-device.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
index c3ddde59ce..06c90adf83 100644
--- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2argvdata/video-qxl-device.args
index 2300e37bd4..d92362d997 100644
--- a/tests/qemuxml2argvdata/video-qxl-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-device.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args b/tests/qemuxml2argvdata/video-qxl-heads.args
index c267091725..c7a31438e2 100644
--- a/tests/qemuxml2argvdata/video-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-qxl-heads.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args b/tests/qemuxml2argvdata/video-qxl-noheads.args
index 729ee3a92f..5ab6457c53 100644
--- a/tests/qemuxml2argvdata/video-qxl-noheads.args
+++ b/tests/qemuxml2argvdata/video-qxl-noheads.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args b/tests/qemuxml2argvdata/video-qxl-resolution.args
index 698aac2ba4..01abb18423 100644
--- a/tests/qemuxml2argvdata/video-qxl-resolution.args
+++ b/tests/qemuxml2argvdata/video-qxl-resolution.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
index 85f7a22f63..8fecc54d28 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemuxml2argvdata/video-qxl-sec-device.args
index 45f1545bcd..9860de5e13 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
index a7f93ab26d..3d06b7f209 100644
--- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/video-vga-device.args b/tests/qemuxml2argvdata/video-vga-device.args
index 09dc9f3b78..914ca225f6 100644
--- a/tests/qemuxml2argvdata/video-vga-device.args
+++ b/tests/qemuxml2argvdata/video-vga-device.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
index c267091725..c7a31438e2 100644
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
index cc2ddf3239..9cca9f2c98 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
@@ -21,6 +21,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-vnc 127.0.0.1:0 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
index 2f63a05fd9..dd03c0b007 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
index c3f4608d46..cfeddacdb0 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
@@ -21,6 +21,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
index 6f4c4b0a4b..8bcbf9351d 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-gpu-pci,id=video0,bus=pci.0,addr=0x2 \
-device virtio-gpu-pci,id=video1,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
index ea6976a314..184705ebad 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=spice \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
index b7844fffc6..0d070d5930 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args b/tests/qemuxml2argvdata/video-virtio-vga.args
index de68d22845..8db05c9a2a 100644
--- a/tests/qemuxml2argvdata/video-virtio-vga.args
+++ b/tests/qemuxml2argvdata/video-virtio-vga.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/var/lib/libvirt/images/QEMUGuest1,format=qcow2,if=none,id=drive-ide0-0-0,cache=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.args
index 2a10bcb8b5..3efbbca5ce 100644
--- a/tests/qemuxml2argvdata/virtio-input-passthrough.args
+++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.0,addr=0x3 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvdata/virtio-input.args
index a0e3292962..33066c51c6 100644
--- a/tests/qemuxml2argvdata/virtio-input.args
+++ b/tests/qemuxml2argvdata/virtio-input.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-mouse-pci,id=input0,bus=pci.0,addr=0x3 \
-device virtio-keyboard-pci,id=input1,bus=pci.0,addr=0xa \
diff --git a/tests/qemuxml2argvdata/virtio-lun.args b/tests/qemuxml2argvdata/virtio-lun.args
index 6c9aad5db2..bb77bd9a44 100644
--- a/tests/qemuxml2argvdata/virtio-lun.args
+++ b/tests/qemuxml2argvdata/virtio-lun.args
@@ -23,7 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
--boot menu=on \
+-boot menu=on,strict=on \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x6 \
-usb \
-drive file=/dev/sdfake,format=raw,if=none,id=drive-virtio-disk0 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args b/tests/qemuxml2argvdata/virtio-rng-ccw.args
index 2d463e20c4..76b98349a3 100644
--- a/tests/qemuxml2argvdata/virtio-rng-ccw.args
+++ b/tests/qemuxml2argvdata/virtio-rng-ccw.args
@@ -22,6 +22,7 @@ QEMU_AUDIO_DRV=none \
-mon chardev=charmonitor,id=monitor,mode=control \
-rtc base=utc \
-no-shutdown \
+-boot strict=on \
-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0001 \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
-device virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml2argvdata/virtio-rng-default.args
index 62a5fa649d..7ee903c1be 100644
--- a/tests/qemuxml2argvdata/virtio-rng-default.args
+++ b/tests/qemuxml2argvdata/virtio-rng-default.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-object rng-random,id=objrng0,filename=/dev/random \
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.args
index e129a3852d..d7c9adc782 100644
--- a/tests/qemuxml2argvdata/virtio-rng-egd.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-chardev socket,id=charrng0,host=1.2.3.4,port=1234 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxml2argvdata/virtio-rng-multiple.args
index 10ac617f10..84691c0b0e 100644
--- a/tests/qemuxml2argvdata/virtio-rng-multiple.args
+++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-object rng-random,id=objrng0,filename=/dev/random \
diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2argvdata/virtio-rng-random.args
index e9a2e7f1f5..c124ea2a74 100644
--- a/tests/qemuxml2argvdata/virtio-rng-random.args
+++ b/tests/qemuxml2argvdata/virtio-rng-random.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-object rng-random,id=objrng0,filename=/dev/urandom \
diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args
index a13981a812..67bb16846b 100644
--- a/tests/qemuxml2argvdata/vmcoreinfo.args
+++ b/tests/qemuxml2argvdata/vmcoreinfo.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/watchdog-device.args b/tests/qemuxml2argvdata/watchdog-device.args
index 078e68b89e..21e50d97af 100644
--- a/tests/qemuxml2argvdata/watchdog-device.args
+++ b/tests/qemuxml2argvdata/watchdog-device.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/watchdog-dump.args b/tests/qemuxml2argvdata/watchdog-dump.args
index 3537231ff2..fe89e3fd9a 100644
--- a/tests/qemuxml2argvdata/watchdog-dump.args
+++ b/tests/qemuxml2argvdata/watchdog-dump.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.args b/tests/qemuxml2argvdata/watchdog-injectnmi.args
index 39a709a78e..825e5f4ed3 100644
--- a/tests/qemuxml2argvdata/watchdog-injectnmi.args
+++ b/tests/qemuxml2argvdata/watchdog-injectnmi.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args
index 2b795bc057..adb243313d 100644
--- a/tests/qemuxml2argvdata/watchdog.args
+++ b/tests/qemuxml2argvdata/watchdog.args
@@ -23,6 +23,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-usb \
-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
index 76b46813de..c4bd5a02b6 100644
--- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
@@ -24,4 +24,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-no-acpi \
+-boot strict=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 74af93b08f..74a9f5a0ee 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1082,7 +1082,6 @@ mymain(void)
DO_TEST("boot-complex",
QEMU_CAPS_VIRTIO_BLK_SCSI);
DO_TEST("boot-strict",
- QEMU_CAPS_BOOT_STRICT,
QEMU_CAPS_VIRTIO_BLK_SCSI);
/* Simplest possible <audio>, all supported with ENV */
--
2.31.1
More information about the libvir-list
mailing list