This series originally started as an attempt to remove pointless copying of capabilitiy objects in the qemuxml2argvtest which actually took ~40% of the runtime of the test. Obviously few snags and places for improvements were noticed along the way. Peter Krempa (21): qemuProcessPrepareQEMUCaps: Don't clear QEMU_CAPS_CHARDEV_FD_PASS_COMMANDLINE qemuDomainNeedsFDC: Simplify and improve checking if a machine needs FDC qemuxml2argvtest: Remove redundant floppy controller tests testutilsqemu: Remove unused non-x86 fake machine types tests: qemuxml2argvdata: Remove use of 'pc-1.0' and 'pc-1.2' machine types tests: qemuxml2argvdata: Remove specific q35 machine types from fake-caps tests qemuxml2xmltest: Replace 'interface-server' by 'net-server' test case qemuxml2(argv|xml)test: Enable 'controller-usb-order' for qemuxml2argv and convert it to latest caps qemuxml2(argv|xml)test: Unify usage of DO_TEST_CAPS_LATEST tests: qemuxml2argvdata: Purge versioned i440fx machine types from fake-caps tests qemuhotplugtestdomains: Remove unnecessary use of versioned pc machine types securityselinuxlabeldata: Purge unneeded versioned machine type testutilsqemu: Remove unused fake-caps x86 machine types qemuxml2argvdata: Use proper arch and emulator for x86 real capability tests qemuxml2argvdata: Use proper arch and emulator for aarch64 real capability tests qemuxml2argvtest: Don't insert capabilities into cache twice qemuxml2(xml|argv)test: Test real state of things with 'x86-kvm-32-on-64' qemuxml2argvtest: Enable qemuxml2argv version of 'blkdeviotune' test qemuxml2argvtest: Convert 'missing-machine' to DO_TEST_CAPS_LATEST qemuTestCapsCacheInsert: Extract code for popluating fake machine types qemuTestCapsCacheInsert: Rewrite caps cache insertion src/qemu/qemu_domain.c | 17 +- src/qemu/qemu_process.c | 9 +- ...g-console-compat-2-live+console-virtio.xml | 2 +- .../qemuhotplug-console-compat-2-live.xml | 2 +- tests/qemusecuritytest.c | 3 +- .../audio-alsa-best.x86_64-4.1.0.args | 2 +- .../audio-alsa-best.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-alsa-best.xml | 4 +- .../audio-alsa-full.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-alsa-full.xml | 4 +- .../audio-alsa-minimal.x86_64-4.1.0.args | 2 +- .../audio-alsa-minimal.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-alsa-minimal.xml | 4 +- .../audio-coreaudio-best.x86_64-4.1.0.args | 2 +- .../audio-coreaudio-best.x86_64-latest.args | 2 +- .../qemuxml2argvdata/audio-coreaudio-best.xml | 4 +- .../audio-coreaudio-full.x86_64-latest.args | 2 +- .../qemuxml2argvdata/audio-coreaudio-full.xml | 4 +- .../audio-coreaudio-minimal.x86_64-4.1.0.args | 2 +- ...audio-coreaudio-minimal.x86_64-latest.args | 2 +- .../audio-coreaudio-minimal.xml | 4 +- ...audio-default-nographics.x86_64-4.1.0.args | 2 +- ...udio-default-nographics.x86_64-latest.args | 2 +- .../audio-default-nographics.xml | 4 +- tests/qemuxml2argvdata/audio-default-sdl.args | 2 +- .../audio-default-sdl.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-default-sdl.xml | 4 +- .../qemuxml2argvdata/audio-default-spice.args | 2 +- .../audio-default-spice.x86_64-latest.args | 2 +- .../qemuxml2argvdata/audio-default-spice.xml | 4 +- tests/qemuxml2argvdata/audio-default-vnc.args | 2 +- .../audio-default-vnc.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-default-vnc.xml | 4 +- .../audio-file-best.x86_64-4.1.0.args | 2 +- .../audio-file-best.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-file-best.xml | 4 +- .../audio-file-full.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-file-full.xml | 4 +- .../audio-file-minimal.x86_64-4.1.0.args | 2 +- .../audio-file-minimal.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-file-minimal.xml | 4 +- .../audio-jack-full.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-jack-full.xml | 4 +- .../audio-jack-minimal.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-jack-minimal.xml | 4 +- .../audio-many-backends.x86_64-latest.args | 2 +- .../qemuxml2argvdata/audio-many-backends.xml | 4 +- .../audio-none-best.x86_64-4.1.0.args | 2 +- .../audio-none-best.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-none-best.xml | 4 +- .../audio-none-full.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-none-full.xml | 4 +- .../audio-none-minimal.x86_64-4.1.0.args | 2 +- .../audio-none-minimal.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-none-minimal.xml | 4 +- .../audio-oss-best.x86_64-4.1.0.args | 2 +- .../audio-oss-best.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-oss-best.xml | 4 +- .../audio-oss-full.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-oss-full.xml | 4 +- .../audio-oss-minimal.x86_64-4.1.0.args | 2 +- .../audio-oss-minimal.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-oss-minimal.xml | 4 +- .../audio-pulseaudio-best.x86_64-4.1.0.args | 2 +- .../audio-pulseaudio-best.x86_64-latest.args | 2 +- .../audio-pulseaudio-best.xml | 4 +- .../audio-pulseaudio-full.x86_64-latest.args | 2 +- .../audio-pulseaudio-full.xml | 4 +- ...audio-pulseaudio-minimal.x86_64-4.1.0.args | 2 +- ...udio-pulseaudio-minimal.x86_64-latest.args | 2 +- .../audio-pulseaudio-minimal.xml | 4 +- .../audio-sdl-best.x86_64-4.1.0.args | 2 +- .../audio-sdl-best.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-sdl-best.xml | 4 +- .../audio-sdl-full.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-sdl-full.xml | 4 +- .../audio-sdl-minimal.x86_64-4.1.0.args | 2 +- .../audio-sdl-minimal.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-sdl-minimal.xml | 4 +- .../audio-spice-best.x86_64-4.1.0.args | 2 +- .../audio-spice-best.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-spice-best.xml | 4 +- .../audio-spice-full.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/audio-spice-full.xml | 4 +- .../audio-spice-minimal.x86_64-4.1.0.args | 2 +- .../audio-spice-minimal.x86_64-latest.args | 2 +- .../qemuxml2argvdata/audio-spice-minimal.xml | 4 +- tests/qemuxml2argvdata/bios-nvram-secure.args | 2 +- tests/qemuxml2argvdata/bios-nvram-secure.xml | 2 +- .../blkdeviotune-group-num.x86_64-4.1.0.args | 2 +- .../blkdeviotune-group-num.x86_64-latest.args | 2 +- .../blkdeviotune-group-num.xml | 4 +- .../blkdeviotune-max-length.x86_64-4.1.0.args | 2 +- ...blkdeviotune-max-length.x86_64-latest.args | 2 +- .../blkdeviotune-max-length.xml | 4 +- .../blkdeviotune-max.x86_64-4.1.0.args | 2 +- .../blkdeviotune-max.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/blkdeviotune-max.xml | 4 +- .../blkdeviotune.x86_64-latest.args | 40 ++++ tests/qemuxml2argvdata/blkdeviotune.xml | 4 +- tests/qemuxml2argvdata/boot-floppy-q35.args | 2 +- tests/qemuxml2argvdata/boot-floppy-q35.xml | 2 +- .../qemuxml2argvdata/console-compat-auto.args | 2 +- .../console-compat-auto.x86_64-latest.args | 2 +- .../qemuxml2argvdata/console-compat-auto.xml | 4 +- .../console-compat-chardev.args | 2 +- .../console-compat-chardev.x86_64-latest.args | 2 +- .../console-compat-chardev.xml | 4 +- tests/qemuxml2argvdata/console-compat.args | 2 +- .../console-compat.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/console-compat.xml | 4 +- .../controller-usb-order.x86_64-latest.args | 38 ++++ .../controller-virtio-scsi.x86_64-latest.args | 2 +- .../controller-virtio-scsi.xml | 4 +- .../disk-address-conflict.xml | 4 +- .../disk-aio.x86_64-2.12.0.args | 2 +- .../disk-aio.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-aio.xml | 4 +- .../disk-arm-virtio-sd.aarch64-4.0.0.args | 3 +- .../disk-arm-virtio-sd.aarch64-latest.args | 3 +- tests/qemuxml2argvdata/disk-arm-virtio-sd.xml | 5 +- .../disk-attaching-partition-nosupport.xml | 4 +- .../disk-backing-chains-index.xml | 4 +- ...-backing-chains-noindex.x86_64-2.12.0.args | 2 +- ...-backing-chains-noindex.x86_64-latest.args | 2 +- .../disk-backing-chains-noindex.xml | 4 +- .../disk-blockio.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-blockio.xml | 4 +- .../disk-boot-cdrom.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-boot-cdrom.xml | 4 +- .../disk-boot-disk.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-boot-disk.xml | 4 +- .../disk-cdrom-bus-other.x86_64-latest.args | 2 +- .../qemuxml2argvdata/disk-cdrom-bus-other.xml | 4 +- ...m-empty-network-invalid.x86_64-latest.args | 2 +- .../disk-cdrom-empty-network-invalid.xml | 4 +- .../disk-cdrom.x86_64-2.12.0.args | 2 +- .../disk-cdrom.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-cdrom.xml | 4 +- .../disk-device-lun-type-invalid.xml | 4 +- .../disk-error-policy.x86_64-2.12.0.args | 2 +- .../disk-error-policy.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-error-policy.xml | 4 +- .../disk-fdc-incompatible-address.xml | 4 +- .../disk-floppy-q35-2_11.x86_64-latest.args | 42 ---- .../qemuxml2argvdata/disk-floppy-q35-2_11.xml | 38 ---- .../disk-floppy-q35-2_9.x86_64-2.12.0.args | 36 ---- ...rgs => disk-floppy-q35.x86_64-2.12.0.args} | 2 +- ...rgs => disk-floppy-q35.x86_64-latest.args} | 2 +- ...floppy-q35-2_9.xml => disk-floppy-q35.xml} | 2 +- .../disk-floppy-tray.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-floppy-tray.xml | 4 +- .../disk-floppy.x86_64-2.12.0.args | 2 +- .../disk-floppy.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-floppy.xml | 4 +- tests/qemuxml2argvdata/disk-fmt-cow.xml | 4 +- tests/qemuxml2argvdata/disk-fmt-dir.xml | 4 +- tests/qemuxml2argvdata/disk-fmt-iso.xml | 4 +- .../disk-fmt-qcow.x86_64-4.1.0.args | 2 +- .../disk-fmt-qcow.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-fmt-qcow.xml | 4 +- .../disk-geometry.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-geometry.xml | 4 +- .../disk-hostdev-scsi-address-conflict.xml | 4 +- .../disk-ide-incompatible-address.xml | 4 +- .../disk-ide-split.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-ide-split.xml | 4 +- .../disk-ide-wwn.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-ide-wwn.xml | 4 +- .../disk-metadata-cache.x86_64-latest.args | 2 +- .../qemuxml2argvdata/disk-metadata-cache.xml | 4 +- .../disk-missing-target-invalid.xml | 4 +- .../disk-network-gluster.x86_64-2.12.0.args | 2 +- .../disk-network-gluster.x86_64-latest.args | 2 +- .../qemuxml2argvdata/disk-network-gluster.xml | 4 +- ...-network-iscsi-auth-secrettype-invalid.xml | 4 +- ...sk-network-iscsi-auth-wrong-secrettype.xml | 4 +- .../disk-network-iscsi.x86_64-2.12.0.args | 2 +- .../disk-network-iscsi.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-network-iscsi.xml | 4 +- .../disk-network-nbd.x86_64-2.12.0.args | 2 +- .../disk-network-nbd.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-network-nbd.xml | 4 +- tests/qemuxml2argvdata/disk-network-nfs.xml | 2 +- ...sk-network-rbd-no-colon.x86_64-latest.args | 2 +- .../disk-network-rbd-no-colon.xml | 4 +- .../disk-network-rbd.x86_64-2.12.0.args | 2 +- .../disk-network-rbd.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-network-rbd.xml | 4 +- .../disk-network-sheepdog.x86_64-2.12.0.args | 2 +- .../disk-network-sheepdog.x86_64-6.0.0.args | 2 +- .../disk-network-sheepdog.xml | 4 +- .../disk-network-source-auth-both.xml | 4 +- ...isk-network-source-auth.x86_64-2.12.0.args | 2 +- ...isk-network-source-auth.x86_64-latest.args | 2 +- .../disk-network-source-auth.xml | 4 +- ...isk-network-tlsx509-nbd.x86_64-2.12.0.args | 1 - .../disk-network-tlsx509-nbd.xml | 2 +- ...sk-network-tlsx509-vxhs.x86_64-2.12.0.args | 1 - .../disk-network-tlsx509-vxhs.xml | 2 +- .../disk-no-boot.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-no-boot.xml | 4 +- .../disk-nvme.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-nvme.xml | 4 +- .../disk-order.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-order.xml | 4 +- .../disk-readonly-disk.x86_64-2.12.0.args | 2 +- .../disk-readonly-disk.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-readonly-disk.xml | 4 +- .../disk-rotation.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-rotation.xml | 4 +- tests/qemuxml2argvdata/disk-same-targets.xml | 4 +- .../disk-sata-device.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-sata-device.xml | 4 +- .../disk-sata-incompatible-address.xml | 4 +- .../disk-scsi-device-auto.x86_64-latest.args | 2 +- .../disk-scsi-device-auto.xml | 4 +- .../disk-scsi-disk-split.x86_64-latest.args | 2 +- .../qemuxml2argvdata/disk-scsi-disk-split.xml | 4 +- .../disk-scsi-disk-vpd-build-error.xml | 4 +- .../disk-scsi-disk-vpd.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-scsi-disk-vpd.xml | 4 +- .../disk-scsi-disk-wwn.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-scsi-disk-wwn.xml | 4 +- .../disk-scsi-incompatible-address.xml | 4 +- ...sk-scsi-lun-passthrough.x86_64-latest.args | 2 +- .../disk-scsi-lun-passthrough.xml | 4 +- .../disk-scsi.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-scsi.xml | 4 +- .../disk-serial.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-serial.xml | 4 +- tests/qemuxml2argvdata/disk-shared-qcow.xml | 4 +- .../disk-shared.x86_64-2.12.0.args | 2 +- .../disk-shared.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-shared.xml | 4 +- .../disk-slices.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-slices.xml | 4 +- .../disk-snapshot.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-snapshot.xml | 4 +- .../disk-source-pool-mode.x86_64-4.1.0.args | 2 +- .../disk-source-pool-mode.x86_64-latest.args | 2 +- .../disk-source-pool-mode.xml | 4 +- .../disk-source-pool.x86_64-4.1.0.args | 2 +- .../disk-source-pool.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-source-pool.xml | 4 +- .../disk-transient.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-transient.xml | 4 +- ...sk-usb-device-removable.x86_64-latest.args | 2 +- .../disk-usb-device-removable.xml | 4 +- .../disk-usb-device.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-usb-device.xml | 4 +- tests/qemuxml2argvdata/disk-usb-pci.xml | 4 +- tests/qemuxml2argvdata/disk-vhostuser.xml | 2 +- .../disk-virtio-queues.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-virtio-queues.xml | 4 +- ...irtio-scsi-reservations.x86_64-2.12.0.args | 2 +- ...virtio-scsi-reservations.x86_64-5.2.0.args | 2 +- ...irtio-scsi-reservations.x86_64-latest.args | 2 +- .../disk-virtio-scsi-reservations.xml | 4 +- .../disk-virtio.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/disk-virtio.xml | 4 +- .../encrypted-disk-usage.x86_64-4.1.0.args | 2 +- .../encrypted-disk-usage.x86_64-latest.args | 2 +- .../qemuxml2argvdata/encrypted-disk-usage.xml | 4 +- .../encrypted-disk.x86_64-4.1.0.args | 2 +- .../encrypted-disk.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/encrypted-disk.xml | 4 +- .../eoi-disabled.x86_64-4.0.0.args | 4 +- .../eoi-disabled.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/eoi-disabled.xml | 4 +- .../eoi-enabled.x86_64-4.0.0.args | 4 +- .../eoi-enabled.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/eoi-enabled.xml | 4 +- .../fd-memory-no-numa-topology.args | 2 +- .../fd-memory-no-numa-topology.xml | 2 +- .../fd-memory-numa-topology.args | 2 +- .../fd-memory-numa-topology.xml | 2 +- .../fd-memory-numa-topology2.args | 2 +- .../fd-memory-numa-topology2.xml | 2 +- .../fd-memory-numa-topology3.args | 2 +- .../fd-memory-numa-topology3.xml | 2 +- .../fips-enabled.x86_64-5.1.0.args | 2 +- .../fips-enabled.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/fips-enabled.xml | 4 +- .../floppy-drive-fat.x86_64-2.12.0.args | 2 +- .../floppy-drive-fat.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/floppy-drive-fat.xml | 4 +- .../qemuxml2argvdata/fs9p.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/fs9p.xml | 4 +- ...egl-headless-rendernode.x86_64-latest.args | 2 +- .../graphics-egl-headless-rendernode.xml | 4 +- .../graphics-egl-headless.args | 2 +- .../graphics-egl-headless.x86_64-latest.args | 2 +- .../graphics-egl-headless.xml | 4 +- .../graphics-sdl-egl-headless.xml | 4 +- ...s-spice-agent-file-xfer.x86_64-latest.args | 2 +- .../graphics-spice-agent-file-xfer.xml | 4 +- ...aphics-spice-agentmouse.x86_64-latest.args | 2 +- .../graphics-spice-agentmouse.xml | 4 +- ...s-spice-auto-socket-cfg.x86_64-latest.args | 2 +- .../graphics-spice-auto-socket-cfg.xml | 4 +- ...phics-spice-auto-socket.x86_64-latest.args | 2 +- .../graphics-spice-auto-socket.xml | 4 +- ...phics-spice-compression.x86_64-latest.args | 2 +- .../graphics-spice-compression.xml | 4 +- ...hics-spice-egl-headless.x86_64-latest.args | 2 +- .../graphics-spice-egl-headless.xml | 4 +- ...pice-gl-auto-rendernode.x86_64-latest.args | 2 +- .../graphics-spice-gl-auto-rendernode.xml | 4 +- .../graphics-spice-invalid-egl-headless.xml | 4 +- .../graphics-spice-no-args.x86_64-latest.args | 2 +- .../graphics-spice-no-args.xml | 4 +- .../graphics-spice-qxl-vga.x86_64-latest.args | 2 +- .../graphics-spice-qxl-vga.xml | 4 +- .../graphics-spice-sasl.x86_64-latest.args | 2 +- .../qemuxml2argvdata/graphics-spice-sasl.xml | 4 +- .../graphics-spice-socket.x86_64-latest.args | 2 +- .../graphics-spice-socket.xml | 4 +- .../graphics-spice-timeout.x86_64-latest.args | 2 +- .../graphics-spice-timeout.xml | 4 +- ...raphics-spice-usb-redir.x86_64-latest.args | 2 +- .../graphics-spice-usb-redir.xml | 4 +- .../graphics-spice.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/graphics-spice.xml | 4 +- ...ics-vnc-auto-socket-cfg.x86_64-2.11.0.args | 2 +- ...ics-vnc-auto-socket-cfg.x86_64-latest.args | 2 +- .../graphics-vnc-auto-socket-cfg.xml | 4 +- ...raphics-vnc-auto-socket.x86_64-2.11.0.args | 2 +- ...raphics-vnc-auto-socket.x86_64-latest.args | 2 +- .../graphics-vnc-auto-socket.xml | 4 +- ...aphics-vnc-egl-headless.x86_64-2.11.0.args | 2 +- ...aphics-vnc-egl-headless.x86_64-latest.args | 2 +- .../graphics-vnc-egl-headless.xml | 4 +- ...hics-vnc-no-listen-attr.x86_64-2.11.0.args | 2 +- ...hics-vnc-no-listen-attr.x86_64-latest.args | 2 +- .../graphics-vnc-no-listen-attr.xml | 4 +- .../graphics-vnc-none.x86_64-2.11.0.args | 2 +- .../graphics-vnc-none.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-none.xml | 4 +- .../graphics-vnc-policy.x86_64-2.11.0.args | 2 +- .../graphics-vnc-policy.x86_64-latest.args | 2 +- .../qemuxml2argvdata/graphics-vnc-policy.xml | 4 +- .../graphics-vnc-power.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-power.xml | 4 +- ...remove-generated-socket.x86_64-2.11.0.args | 2 +- ...remove-generated-socket.x86_64-latest.args | 2 +- .../graphics-vnc-remove-generated-socket.xml | 4 +- .../graphics-vnc-sasl.x86_64-2.11.0.args | 2 +- .../graphics-vnc-sasl.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-sasl.xml | 4 +- ...-vnc-socket-new-cmdline.x86_64-2.11.0.args | 2 +- ...-vnc-socket-new-cmdline.x86_64-latest.args | 2 +- .../graphics-vnc-socket-new-cmdline.xml | 4 +- .../graphics-vnc-socket.x86_64-2.11.0.args | 2 +- .../graphics-vnc-socket.x86_64-latest.args | 2 +- .../qemuxml2argvdata/graphics-vnc-socket.xml | 4 +- .../graphics-vnc-tls-secret.x86_64-5.2.0.args | 2 +- ...graphics-vnc-tls-secret.x86_64-latest.args | 2 +- .../graphics-vnc-tls-secret.xml | 4 +- .../graphics-vnc-tls.x86_64-2.11.0.args | 2 +- .../graphics-vnc-tls.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/graphics-vnc-tls.xml | 4 +- .../graphics-vnc-websocket.x86_64-2.11.0.args | 2 +- .../graphics-vnc-websocket.x86_64-latest.args | 2 +- .../graphics-vnc-websocket.xml | 4 +- .../graphics-vnc.x86_64-2.11.0.args | 2 +- .../graphics-vnc.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/graphics-vnc.xml | 4 +- ...tdev-mdev-display-ramfb.x86_64-latest.args | 2 +- .../hostdev-mdev-display-ramfb.xml | 4 +- ...play-spice-egl-headless.x86_64-latest.args | 2 +- ...ostdev-mdev-display-spice-egl-headless.xml | 4 +- ...ev-display-spice-opengl.x86_64-latest.args | 2 +- .../hostdev-mdev-display-spice-opengl.xml | 4 +- ...isplay-vnc-egl-headless.x86_64-latest.args | 2 +- .../hostdev-mdev-display-vnc-egl-headless.xml | 4 +- ...ostdev-mdev-display-vnc.x86_64-latest.args | 2 +- .../hostdev-mdev-display-vnc.xml | 4 +- .../hostdev-scsi-lsi.x86_64-4.1.0.args | 2 +- .../hostdev-scsi-lsi.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hostdev-scsi-lsi.xml | 4 +- .../hostdev-scsi-vhost-scsi-pci-boot-fail.xml | 4 +- .../hostdev-scsi-vhost-scsi-pcie.args | 2 +- .../hostdev-scsi-vhost-scsi-pcie.xml | 2 +- ...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 2 +- ...ostdev-scsi-virtio-scsi.x86_64-latest.args | 2 +- .../hostdev-scsi-virtio-scsi.xml | 4 +- .../hostdevs-drive-address-conflict.xml | 4 +- .../hugepages-memaccess3.x86_64-latest.args | 2 +- .../qemuxml2argvdata/hugepages-memaccess3.xml | 2 +- .../hugepages-numa-default-dimm.args | 2 +- .../hugepages-numa-default-dimm.xml | 2 +- .../hugepages-numa-default.args | 2 +- .../hugepages-numa-default.xml | 2 +- .../hugepages-nvdimm.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hugepages-nvdimm.xml | 4 +- .../hyperv-off.x86_64-4.0.0.args | 2 +- .../hyperv-off.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hyperv-off.xml | 4 +- .../hyperv-panic.x86_64-4.0.0.args | 4 +- .../hyperv-panic.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hyperv-panic.xml | 4 +- .../hyperv-passthrough.x86_64-6.1.0.args | 2 +- .../hyperv-passthrough.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hyperv-passthrough.xml | 4 +- .../hyperv-stimer-direct.x86_64-latest.args | 2 +- .../qemuxml2argvdata/hyperv-stimer-direct.xml | 4 +- .../qemuxml2argvdata/hyperv.x86_64-4.0.0.args | 4 +- .../hyperv.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/hyperv.xml | 4 +- .../input-linux.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/input-linux.xml | 4 +- tests/qemuxml2argvdata/interface-server.xml | 131 ------------ ...othreads-virtio-scsi-pci.x86_64-5.2.0.args | 2 +- ...threads-virtio-scsi-pci.x86_64-latest.args | 2 +- .../iothreads-virtio-scsi-pci.xml | 4 +- .../kvmclock+eoi-disabled.x86_64-4.0.0.args | 4 +- .../kvmclock+eoi-disabled.x86_64-latest.args | 2 +- .../kvmclock+eoi-disabled.xml | 4 +- ...v-missing-platform-info.x86_64-2.12.0.args | 2 +- ...nch-security-sev-missing-platform-info.xml | 2 +- .../luks-disks.x86_64-4.1.0.args | 1 + tests/qemuxml2argvdata/luks-disks.xml | 5 +- .../memfd-memory-default-hugepage.xml | 5 +- tests/qemuxml2argvdata/memfd-memory-numa.xml | 5 +- ...y-hotplug-nvdimm-access.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-access.xml | 4 +- ...ory-hotplug-nvdimm-align.x86_64-5.2.0.args | 2 +- ...ry-hotplug-nvdimm-align.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-align.xml | 4 +- ...ory-hotplug-nvdimm-label.x86_64-5.2.0.args | 2 +- ...ry-hotplug-nvdimm-label.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-label.xml | 4 +- ...mory-hotplug-nvdimm-pmem.x86_64-5.2.0.args | 2 +- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-pmem.xml | 4 +- ...-hotplug-nvdimm-readonly.x86_64-5.2.0.args | 2 +- ...hotplug-nvdimm-readonly.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm-readonly.xml | 4 +- .../memory-hotplug-nvdimm.x86_64-latest.args | 2 +- .../memory-hotplug-nvdimm.xml | 4 +- ...mory-hotplug-virtio-mem.x86_64-latest.args | 2 +- .../memory-hotplug-virtio-mem.xml | 2 +- ...mory-hotplug-virtio-pmem.x86_64-5.2.0.args | 2 +- ...ory-hotplug-virtio-pmem.x86_64-latest.args | 2 +- .../memory-hotplug-virtio-pmem.xml | 2 +- .../misc-no-reboot.x86_64-5.2.0.args | 2 +- .../misc-no-reboot.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/misc-no-reboot.xml | 4 +- tests/qemuxml2argvdata/missing-machine.err | 1 - .../missing-machine.x86_64-latest.err | 1 + tests/qemuxml2argvdata/missing-machine.xml | 2 +- .../mlock-off.x86_64-3.0.0.args | 2 +- .../mlock-off.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/mlock-off.xml | 4 +- .../mlock-on.x86_64-3.0.0.args | 2 +- .../mlock-on.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/mlock-on.xml | 4 +- .../name-escape.x86_64-2.11.0.args | 2 +- .../name-escape.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/name-escape.xml | 4 +- tests/qemuxml2argvdata/net-user.args | 2 +- .../net-user.x86_64-4.0.0.args | 2 +- tests/qemuxml2argvdata/net-user.xml | 4 +- .../net-vdpa.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/net-vdpa.xml | 4 +- tests/qemuxml2argvdata/net-vhostuser.args | 2 +- .../net-vhostuser.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/net-vhostuser.xml | 4 +- .../qemuxml2argvdata/pages-dimm-discard.args | 2 +- tests/qemuxml2argvdata/pages-dimm-discard.xml | 2 +- .../panic-double.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/panic-double.xml | 4 +- .../panic-no-address.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/panic-no-address.xml | 4 +- .../qemuxml2argvdata/panic.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/panic.xml | 4 +- .../parallel-parport-chardev.args | 2 +- ...arallel-parport-chardev.x86_64-latest.args | 2 +- .../parallel-parport-chardev.xml | 4 +- .../parallel-tcp-chardev.args | 2 +- .../parallel-tcp-chardev.x86_64-latest.args | 2 +- .../qemuxml2argvdata/parallel-tcp-chardev.xml | 4 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-addr.xml | 2 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +- tests/qemuxml2argvdata/pci-autoadd-idx.xml | 2 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +- tests/qemuxml2argvdata/pci-autofill-addr.xml | 2 +- .../pci-bridge-duplicate-index.xml | 2 +- .../pci-bridge-many-disks.args | 2 +- .../pci-bridge-many-disks.xml | 2 +- .../pci-bridge-negative-index-invalid.xml | 2 +- tests/qemuxml2argvdata/pci-bridge.args | 2 +- tests/qemuxml2argvdata/pci-bridge.xml | 2 +- .../pci-expander-bus-bad-bus.xml | 2 +- .../pci-expander-bus-bad-node.xml | 2 +- tests/qemuxml2argvdata/pci-expander-bus.args | 2 +- tests/qemuxml2argvdata/pci-expander-bus.xml | 2 +- tests/qemuxml2argvdata/pci-many.args | 2 +- tests/qemuxml2argvdata/pci-many.xml | 2 +- tests/qemuxml2argvdata/pci-root-address.xml | 2 +- .../pci-root-nonzero-index.xml | 2 +- .../pci-serial-dev-chardev.args | 2 +- .../pci-serial-dev-chardev.x86_64-latest.args | 2 +- .../pci-serial-dev-chardev.xml | 4 +- .../pcie-expander-bus-bad-machine.xml | 2 +- tests/qemuxml2argvdata/pcihole64-gib.xml | 2 +- tests/qemuxml2argvdata/pcihole64-none.xml | 2 +- tests/qemuxml2argvdata/pcihole64.args | 2 +- tests/qemuxml2argvdata/pcihole64.xml | 2 +- .../pv-spinlock-disabled.x86_64-4.0.0.args | 4 +- .../pv-spinlock-disabled.x86_64-latest.args | 2 +- .../qemuxml2argvdata/pv-spinlock-disabled.xml | 4 +- .../pv-spinlock-enabled.x86_64-4.0.0.args | 4 +- .../pv-spinlock-enabled.x86_64-latest.args | 2 +- .../qemuxml2argvdata/pv-spinlock-enabled.xml | 4 +- .../q35-pm-disable-fallback.args | 2 +- .../q35-pm-disable-fallback.xml | 2 +- tests/qemuxml2argvdata/q35-pm-disable.args | 2 +- tests/qemuxml2argvdata/q35-pm-disable.xml | 2 +- .../q35-virt-manager-basic.args | 2 +- .../q35-virt-manager-basic.xml | 2 +- .../qemu-ns.x86_64-4.0.0.args | 2 +- .../qemu-ns.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/qemu-ns.xml | 4 +- .../seclabel-dynamic-none-relabel.xml | 2 +- .../serial-dev-chardev-iobase.args | 2 +- ...rial-dev-chardev-iobase.x86_64-latest.args | 2 +- .../serial-dev-chardev-iobase.xml | 4 +- .../qemuxml2argvdata/serial-dev-chardev.args | 2 +- .../serial-dev-chardev.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/serial-dev-chardev.xml | 4 +- .../qemuxml2argvdata/serial-file-chardev.args | 2 +- .../serial-file-chardev.x86_64-latest.args | 2 +- .../qemuxml2argvdata/serial-file-chardev.xml | 4 +- tests/qemuxml2argvdata/serial-file-log.args | 2 +- .../serial-file-log.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/serial-file-log.xml | 4 +- .../qemuxml2argvdata/serial-many-chardev.args | 2 +- .../serial-many-chardev.x86_64-latest.args | 2 +- .../qemuxml2argvdata/serial-many-chardev.xml | 4 +- .../qemuxml2argvdata/serial-pty-chardev.args | 2 +- .../serial-pty-chardev.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/serial-pty-chardev.xml | 4 +- .../serial-spiceport-nospice.args | 2 +- ...erial-spiceport-nospice.x86_64-latest.args | 2 +- .../serial-spiceport-nospice.xml | 4 +- tests/qemuxml2argvdata/serial-spiceport.args | 2 +- .../serial-spiceport.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/serial-spiceport.xml | 4 +- .../qemuxml2argvdata/serial-tcp-chardev.args | 2 +- .../serial-tcp-chardev.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/serial-tcp-chardev.xml | 4 +- .../serial-tcp-telnet-chardev.args | 2 +- ...rial-tcp-telnet-chardev.x86_64-latest.args | 2 +- .../serial-tcp-telnet-chardev.xml | 4 +- .../serial-tcp-tlsx509-chardev-notls.args | 2 +- ...p-tlsx509-chardev-notls.x86_64-latest.args | 2 +- .../serial-tcp-tlsx509-chardev-notls.xml | 4 +- .../serial-tcp-tlsx509-chardev-verify.args | 2 +- ...-tlsx509-chardev-verify.x86_64-latest.args | 2 +- .../serial-tcp-tlsx509-chardev-verify.xml | 4 +- .../serial-tcp-tlsx509-chardev.args | 2 +- ...ial-tcp-tlsx509-chardev.x86_64-latest.args | 2 +- .../serial-tcp-tlsx509-chardev.xml | 4 +- .../serial-tcp-tlsx509-secret-chardev.args | 2 +- ...-tlsx509-secret-chardev.x86_64-latest.args | 2 +- .../serial-tcp-tlsx509-secret-chardev.xml | 4 +- .../qemuxml2argvdata/serial-udp-chardev.args | 2 +- .../serial-udp-chardev.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/serial-udp-chardev.xml | 4 +- .../qemuxml2argvdata/serial-unix-chardev.args | 2 +- .../serial-unix-chardev.x86_64-latest.args | 2 +- .../qemuxml2argvdata/serial-unix-chardev.xml | 4 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +- .../serial-vc-chardev.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/serial-vc-chardev.xml | 4 +- tests/qemuxml2argvdata/user-aliases-usb.args | 2 +- tests/qemuxml2argvdata/user-aliases-usb.xml | 2 +- tests/qemuxml2argvdata/user-aliases.args | 2 +- tests/qemuxml2argvdata/user-aliases.xml | 2 +- tests/qemuxml2argvdata/user-aliases2.xml | 2 +- .../vcpu-placement-static.args | 2 +- .../vcpu-placement-static.xml | 2 +- ...host-user-gpu-secondary.x86_64-latest.args | 2 +- .../vhost-user-gpu-secondary.xml | 4 +- .../vhost-user-vga.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/vhost-user-vga.xml | 4 +- tests/qemuxml2argvdata/vhost-vsock.xml | 5 +- ...eo-bochs-display-device.x86_64-latest.args | 2 +- .../video-bochs-display-device.xml | 4 +- ...o-qxl-sec-device-vram64.x86_64-latest.args | 2 +- .../video-qxl-sec-device-vram64.xml | 4 +- ...video-ramfb-display-device-pci-address.xml | 4 +- ...eo-ramfb-display-device.x86_64-latest.args | 2 +- .../video-ramfb-display-device.xml | 4 +- .../watchdog-device.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/watchdog-device.xml | 4 +- .../watchdog-dump.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/watchdog-dump.xml | 4 +- .../watchdog-injectnmi.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/watchdog-injectnmi.xml | 4 +- .../watchdog.x86_64-latest.args | 2 +- tests/qemuxml2argvdata/watchdog.xml | 4 +- ...gs => x86-kvm-32-on-64.x86_64-latest.args} | 14 +- tests/qemuxml2argvtest.c | 39 ++-- ...audio-default-nographics.x86_64-latest.xml | 4 +- .../audio-default-sdl.x86_64-latest.xml | 4 +- .../audio-default-spice.x86_64-latest.xml | 4 +- .../audio-default-vnc.x86_64-latest.xml | 4 +- .../blkdeviotune.x86_64-latest.xml | 4 +- .../console-compat-auto.xml | 4 +- tests/qemuxml2xmloutdata/console-compat.xml | 4 +- ...=> controller-usb-order.x86_64-latest.xml} | 3 + .../controller-virtio-scsi.xml | 4 +- tests/qemuxml2xmloutdata/disk-aio.xml | 4 +- .../disk-arm-virtio-sd.aarch64-latest.xml | 5 +- .../disk-backing-chains-index-active.xml | 4 +- .../disk-backing-chains-index-inactive.xml | 4 +- .../disk-backing-chains-noindex.xml | 4 +- tests/qemuxml2xmloutdata/disk-boot-cdrom.xml | 4 +- tests/qemuxml2xmloutdata/disk-boot-disk.xml | 4 +- .../disk-cdrom-bus-other.xml | 4 +- ...om-empty-network-invalid.x86_64-latest.xml | 4 +- tests/qemuxml2xmloutdata/disk-cdrom.xml | 4 +- .../qemuxml2xmloutdata/disk-error-policy.xml | 4 +- tests/qemuxml2xmloutdata/disk-floppy.xml | 4 +- tests/qemuxml2xmloutdata/disk-fmt-qcow.xml | 4 +- .../disk-metadata-cache.x86_64-latest.xml | 4 +- .../disk-network-gluster.xml | 4 +- .../qemuxml2xmloutdata/disk-network-iscsi.xml | 4 +- tests/qemuxml2xmloutdata/disk-network-nbd.xml | 4 +- ...isk-network-nfs-inactive.x86_64-latest.xml | 2 +- .../disk-network-nfs.x86_64-latest.xml | 2 +- tests/qemuxml2xmloutdata/disk-network-rbd.xml | 4 +- .../disk-network-sheepdog.xml | 4 +- .../disk-network-source-auth.xml | 4 +- .../disk-network-tlsx509-nbd.xml | 2 +- .../disk-network-tlsx509-vxhs.xml | 2 +- .../disk-rotation.x86_64-latest.xml | 4 +- .../disk-scsi-device-auto.xml | 4 +- .../qemuxml2xmloutdata/disk-scsi-disk-vpd.xml | 4 +- .../disk-scsi.x86_64-latest.xml | 4 +- tests/qemuxml2xmloutdata/disk-serial.xml | 4 +- .../disk-slices.x86_64-latest.xml | 4 +- .../disk-source-pool-mode.xml | 4 +- tests/qemuxml2xmloutdata/disk-source-pool.xml | 4 +- .../disk-transient.x86_64-latest.xml | 4 +- tests/qemuxml2xmloutdata/disk-usb-device.xml | 4 +- .../disk-vhostuser.x86_64-latest.xml | 2 +- tests/qemuxml2xmloutdata/disk-virtio.xml | 4 +- tests/qemuxml2xmloutdata/encrypted-disk.xml | 4 +- tests/qemuxml2xmloutdata/eoi-disabled.xml | 4 +- tests/qemuxml2xmloutdata/eoi-enabled.xml | 4 +- tests/qemuxml2xmloutdata/floppy-drive-fat.xml | 4 +- .../graphics-egl-headless-rendernode.xml | 4 +- ...cs-spice-auto-socket-cfg.x86_64-latest.xml | 4 +- ...aphics-spice-auto-socket.x86_64-latest.xml | 4 +- ...aphics-spice-compression.x86_64-latest.xml | 4 +- ...phics-spice-egl-headless.x86_64-latest.xml | 4 +- .../graphics-spice-qxl-vga.x86_64-latest.xml | 4 +- .../graphics-spice-socket.x86_64-latest.xml | 4 +- .../graphics-spice-timeout.x86_64-latest.xml | 4 +- .../graphics-spice.x86_64-latest.xml | 4 +- .../graphics-vnc-auto-socket-cfg.xml | 4 +- .../graphics-vnc-auto-socket.xml | 4 +- .../graphics-vnc-egl-headless.xml | 4 +- .../graphics-vnc-no-listen-attr.xml | 4 +- ...ics-vnc-remove-generated-socket-active.xml | 4 +- ...s-vnc-remove-generated-socket-inactive.xml | 4 +- .../qemuxml2xmloutdata/graphics-vnc-sasl.xml | 4 +- .../graphics-vnc-socket.xml | 4 +- tests/qemuxml2xmloutdata/graphics-vnc-tls.xml | 4 +- .../graphics-vnc-websocket.xml | 4 +- tests/qemuxml2xmloutdata/graphics-vnc.xml | 4 +- ...stdev-mdev-display-ramfb.x86_64-latest.xml | 4 +- tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml | 4 +- .../hostdev-scsi-vhost-scsi-pcie.xml | 2 +- .../hostdev-scsi-virtio-scsi.xml | 4 +- tests/qemuxml2xmloutdata/hyperv-off.xml | 4 +- tests/qemuxml2xmloutdata/hyperv-panic.xml | 4 +- .../qemuxml2xmloutdata/hyperv-passthrough.xml | 4 +- .../hyperv-stimer-direct.xml | 4 +- tests/qemuxml2xmloutdata/hyperv.xml | 4 +- tests/qemuxml2xmloutdata/interface-server.xml | 138 ------------ .../iothreads-virtio-scsi-pci.xml | 4 +- ...ml => luks-disks-source.x86_64-latest.xml} | 5 +- ...disks.xml => luks-disks.x86_64-latest.xml} | 0 ...memory-default-hugepage.x86_64-latest.xml} | 0 ...ml => memfd-memory-numa.x86_64-latest.xml} | 0 tests/qemuxml2xmloutdata/misc-no-reboot.xml | 4 +- tests/qemuxml2xmloutdata/net-server.xml | 43 ++++ tests/qemuxml2xmloutdata/net-user.xml | 4 +- tests/qemuxml2xmloutdata/net-vdpa.xml | 4 +- tests/qemuxml2xmloutdata/net-vhostuser.xml | 4 +- tests/qemuxml2xmloutdata/panic-double.xml | 4 +- tests/qemuxml2xmloutdata/panic-no-address.xml | 4 +- tests/qemuxml2xmloutdata/panic.xml | 4 +- tests/qemuxml2xmloutdata/pci-autoadd-addr.xml | 2 +- tests/qemuxml2xmloutdata/pci-autoadd-idx.xml | 2 +- .../qemuxml2xmloutdata/pci-autofill-addr.xml | 2 +- .../pci-bridge-many-disks.xml | 2 +- tests/qemuxml2xmloutdata/pci-bridge.xml | 2 +- tests/qemuxml2xmloutdata/pci-expander-bus.xml | 2 +- tests/qemuxml2xmloutdata/pci-many.xml | 2 +- .../pci-serial-dev-chardev.xml | 4 +- tests/qemuxml2xmloutdata/pcihole64-gib.xml | 2 +- tests/qemuxml2xmloutdata/pcihole64-none.xml | 2 +- tests/qemuxml2xmloutdata/pcihole64.xml | 2 +- .../pv-spinlock-disabled.xml | 4 +- .../pv-spinlock-enabled.xml | 4 +- .../q35-virt-manager-basic.xml | 2 +- .../qemu-ns.x86_64-latest.xml | 4 +- ...seclabel-dynamic-none-relabel-inactive.xml | 2 +- .../serial-spiceport-nospice.xml | 4 +- tests/qemuxml2xmloutdata/serial-spiceport.xml | 4 +- .../serial-tcp-tlsx509-chardev.xml | 4 +- ...l => tseg-explicit-size.x86_64-latest.xml} | 29 ++- ...xml => vhost-vsock-auto.x86_64-latest.xml} | 5 +- ...sock.xml => vhost-vsock.x86_64-latest.xml} | 0 tests/qemuxml2xmloutdata/watchdog.xml | 4 +- .../x86-kvm-32-on-64.x86_64-latest.xml | 27 +++ tests/qemuxml2xmltest.c | 39 +--- tests/securityselinuxlabeldata/chardev.xml | 2 +- tests/securityselinuxlabeldata/disks.xml | 2 +- tests/securityselinuxlabeldata/kernel.xml | 2 +- tests/securityselinuxlabeldata/nfs.xml | 2 +- tests/testutilsqemu.c | 198 +++++++++++------- tests/vircapstest.c | 6 - 730 files changed, 1362 insertions(+), 1575 deletions(-) create mode 100644 tests/qemuxml2argvdata/blkdeviotune.x86_64-latest.args create mode 100644 tests/qemuxml2argvdata/controller-usb-order.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_11.xml delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args rename tests/qemuxml2argvdata/{disk-floppy-q35-2_11.x86_64-2.12.0.args => disk-floppy-q35.x86_64-2.12.0.args} (96%) rename tests/qemuxml2argvdata/{disk-floppy-q35-2_9.x86_64-latest.args => disk-floppy-q35.x86_64-latest.args} (96%) rename tests/qemuxml2argvdata/{disk-floppy-q35-2_9.xml => disk-floppy-q35.xml} (95%) delete mode 100644 tests/qemuxml2argvdata/interface-server.xml delete mode 100644 tests/qemuxml2argvdata/missing-machine.err create mode 100644 tests/qemuxml2argvdata/missing-machine.x86_64-latest.err rename tests/qemuxml2argvdata/{x86-kvm-32-on-64.args => x86-kvm-32-on-64.x86_64-latest.args} (53%) rename tests/qemuxml2xmloutdata/{controller-usb-order.xml => controller-usb-order.x86_64-latest.xml} (93%) delete mode 100644 tests/qemuxml2xmloutdata/interface-server.xml rename tests/qemuxml2xmloutdata/{luks-disks-source.xml => luks-disks-source.x86_64-latest.xml} (95%) rename tests/qemuxml2xmloutdata/{luks-disks.xml => luks-disks.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{memfd-memory-default-hugepage.xml => memfd-memory-default-hugepage.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{memfd-memory-numa.xml => memfd-memory-numa.x86_64-latest.xml} (100%) create mode 100644 tests/qemuxml2xmloutdata/net-server.xml rename tests/qemuxml2xmloutdata/{tseg-explicit-size.xml => tseg-explicit-size.x86_64-latest.xml} (61%) rename tests/qemuxml2xmloutdata/{vhost-vsock-auto.xml => vhost-vsock-auto.x86_64-latest.xml} (88%) rename tests/qemuxml2xmloutdata/{vhost-vsock.xml => vhost-vsock.x86_64-latest.xml} (100%) create mode 100644 tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-latest.xml -- 2.31.1