Starting with libvirt-8.7.0 we'll support qemu-4.2 as minimum and thus we'll only use -blockdev now. Remove the old cruft. This series applies on top of the patches bumping minimum qemu version to qemu-4.2 I've posted earlier. The whole branch can be fetched at: git fetch https://gitlab.com/pipo.sk/libvirt.git blockdev-remove-2 Peter Krempa (80): qemu: Allways assume QEMU_CAPS_CHANGE_BACKING_FILE qemu: capabilities: Retire QEMU_CAPS_CHANGE_BACKING_FILE qemu: Always assume support for QEMU_CAPS_ACTIVE_COMMIT qemu: capabilities: Retire QEMU_CAPS_ACTIVE_COMMIT qemu: Always assume support for QEMU_CAPS_GLUSTER_DEBUG_LEVEL qemu: capabilities: Retire QEMU_CAPS_GLUSTER_DEBUG_LEVEL qemu: Always assume support for QEMU_CAPS_DRIVE_DISCARD and QEMU_CAPS_DRIVE_DETECT_ZEROES qemu: capabilities: Retire QEMU_CAPS_DRIVE_DISCARD and QEMU_CAPS_DRIVE_DETECT_ZEROES qemuxml2argvtest: Use DO_TEST_CAPS_LATEST for all 'user-aliases' tests qemuxml2xmltest: Modernize all test cases using QEMU_CAPS_QCOW2_LUKS qemu: Always assume support for QEMU_CAPS_QCOW2_LUKS qemu: capabilities: Retire QEMU_CAPS_QCOW2_LUKS qemu: capabilities: Unconditionally set QEMU_CAPS_BLOCKDEV/QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI tests: Force QEMU_CAPS_BLOCKDEV(_HOSTDEV_SCSI) in fake caps tests qemu: Refactor access to 'qomName' field of the qemu disk private data qemu: command: Always assume support for QEMU_CAPS_SCSI_DISK_DEVICE_ID qemu: capabilities: Retire capabilities used for -blockdev detection qemu: Remove code conditional on QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI qemu: capabilities: Retire QEMU_CAPS_BLOCKDEV_HOSTDEV_SCSI qemu: block: Remove legacy spellings for InetSocketAddress qemu: migration: Remove pre-blockdev code paths qemuMigrationSrcNBDStorageCopyBlockdev: Remove some arguments qemu: migration: Assume support for QEMU_CAPS_BLOCKDEV_DEL qemu: capabilities: Retire QEMU_CAPS_BLOCKDEV_DEL qemu: snapshot: Remove pre-blockdev code paths qemu: Remove unused code for pre-blockdev disk snapshot monitor interaction qemu: block: Remove pre-blockdev code paths qemu: migration_cookie: Remove pre-blockdev code paths qemu: validate: Remove impossible validation checks qemu: process: Remove pre-blockdev code paths qemu: blockjob: Remove legacy block job completion code qemu: Remove legacy block job event processing handler qemu: monitor: Remove infrastructure for BLOCK_JOB_* events qemuDomainSetBlockThreshold: Remove pre-blockdev node name detection qemu: block: Remove 'qemuBlockNodeNamesDetect' and related infrastructure qemu: blockjob: Remove pre-blockdev blockjob setup qemu: alias: Remove check for QEMU_CAPS_BLOCKDEV qemuDomainGetStatsBlock: Remove pre-blockdev code paths qemu: block: Remove unused qemuBlockGetNodeData qemu: monitor: Remove unused qemuMonitorQueryNamedBlockNodes and clean up qemu: driver: Remove pre-blockdev code paths from qemuDomainBlockCopyCommon qemu: monitor: Remove unused qemuMonitorDriveMirror qemu: driver: Remove pre-blockdev code paths from qemuDomainBlockCommit qemu: monitor: Remove unused arguments of qemuMonitorBlockCommit qemu: driver: Remove pre-blockdev code paths from qemuDomainBlockPullCommon qemu: monitor: Remove unused arguments of qemuMonitorBlockStream qemu: monitor: Remove unused qemuMonitorDiskNameLookup qemu: driver: Remove pre-blockdev code paths from qemuDomainBlockPivot qemu: monitor: Remove unused qemuMonitorDrivePivot qemu: command: Remove pre-blockdev floppy setup qemu: Remove pre-blockdev PFLASH setup qemuDomainBlockResize: Always refuse resize of empty/readonly disks qemuDomainBlocksStatsGather: Remove pre-blockdev code paths qemu: monitor: Remove unused qemuMonitorBlockStatsUpdateCapacity qemu: driver: Remove remaining QEMU_CAPS_BLOCKDEV capability checks qemu: hotplug: Remove pre-blockdev code path from qemuDomainChangeEjectableMedia qemu: monitor: Remove unused qemuMonitor(Eject|Change)Media qemuhotplugtest: Switch to -blockdev mode qemuDomainRemoveDiskDevice: Remove special casing for disks on 'sd' bus qemu: hotplug: Remove pre-blockdev code paths qemu: block: Remove unused qemuBlockStorageSourceChainDetachPrepareLegacy qemu: Remove 'driveAlias' argument of qemuBlockStorageSourceDetachPrepare qemu: block: Remove support for legacy disk hotplug/unplug qemu: monitor: Remove unused qemuMonitorAddDrive/qemuMonitorDriveDel qemu: command: Delegate qemuBuildDriveStr to SD cards only qemu: command: Generate -drive for SD cards via JSON props qemu: command: Remove unused qemuGetDriveSourceString qemu: domain: Assume QEMU_CAPS_BLOCKDEV for the domain private code qemuDomainSecretStorageSourcePrepare: Remove cabapbility check when preparing cookies qemuDomainDiskBlockJobIsSupported: Assume QEMU_CAPS_BLOCKDEV is supported qemuDomainDiskGetBackendAlias: Assume QEMU_CAPS_BLOCKDEV is supported qemuDomainValidateStorageSource: Remove QEMU_CAPS_BLOCKDEV validation qemuDomainValidateStorageSource: Remove 'maskBlockdev' argument qemuDomainDetermineDiskChain: Assume QEMU_CAPS_BLOCKDEV qemu: Retire QEMU_CAPS_BLOCKDEV qemu: Setup disk throttling for SD cards via monitor qemu: capabilities: Retire QEMU_CAPS_QUERY_NAMED_BLOCK_NODES qemu: Assume support and retire QEMU_CAPS_BLOCK_WRITE_THRESHOLD qemu: Assume and retire QEMU_CAPS_BLOCKDEV_BACKUP qemuDomainDetermineDiskChain: Remove 'report_broken' argument src/qemu/qemu_alias.c | 10 +- src/qemu/qemu_alias.h | 5 +- src/qemu/qemu_backup.c | 10 +- src/qemu/qemu_block.c | 461 +----------- src/qemu/qemu_block.h | 27 +- src/qemu/qemu_blockjob.c | 170 +---- src/qemu/qemu_capabilities.c | 67 +- src/qemu/qemu_capabilities.h | 30 +- src/qemu/qemu_checkpoint.c | 2 +- src/qemu/qemu_command.c | 655 ++--------------- src/qemu/qemu_command.h | 4 - src/qemu/qemu_domain.c | 195 ++--- src/qemu/qemu_domain.h | 14 +- src/qemu/qemu_driver.c | 564 ++++----------- src/qemu/qemu_hotplug.c | 118 +-- src/qemu/qemu_migration.c | 147 +--- src/qemu/qemu_migration_cookie.c | 19 +- src/qemu/qemu_monitor.c | 184 +---- src/qemu/qemu_monitor.h | 62 -- src/qemu/qemu_monitor_json.c | 447 +----------- src/qemu/qemu_monitor_json.h | 53 -- src/qemu/qemu_monitor_text.c | 82 --- src/qemu/qemu_monitor_text.h | 6 - src/qemu/qemu_process.c | 209 +----- src/qemu/qemu_snapshot.c | 125 +--- src/qemu/qemu_validate.c | 34 +- tests/domaincapsdata/qemu_4.2.0.ppc64.xml | 2 +- tests/qemublocktest.c | 4 +- .../caps_4.2.0.aarch64.xml | 15 - .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 11 - .../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 15 - .../caps_4.2.0.x86_64.xml | 15 - .../caps_5.0.0.aarch64.xml | 15 - .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 15 - .../caps_5.0.0.riscv64.xml | 15 - .../caps_5.0.0.x86_64.xml | 15 - .../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 15 - .../caps_5.1.0.x86_64.xml | 15 - .../caps_5.2.0.aarch64.xml | 15 - .../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 15 - .../caps_5.2.0.riscv64.xml | 15 - .../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 15 - .../caps_5.2.0.x86_64.xml | 15 - .../caps_6.0.0.aarch64.xml | 15 - .../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 15 - .../caps_6.0.0.x86_64.xml | 15 - .../caps_6.1.0.x86_64.xml | 15 - .../caps_6.2.0.aarch64.xml | 15 - .../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 15 - .../caps_6.2.0.x86_64.xml | 15 - .../caps_7.0.0.aarch64.xml | 15 - .../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 15 - .../caps_7.0.0.x86_64.xml | 15 - .../caps_7.1.0.x86_64.xml | 15 - tests/qemuhotplugtest.c | 76 +- .../qemuhotplug-base-ccw-live+ccw-virtio.xml | 2 +- ...with-2-ccw-virtio+ccw-virtio-1-reverse.xml | 4 +- ...otplug-base-ccw-live-with-2-ccw-virtio.xml | 2 +- ...-with-ccw-virtio+ccw-virtio-2-explicit.xml | 2 +- ...-ccw-live-with-ccw-virtio+ccw-virtio-2.xml | 2 +- .../qemuhotplug-base-live+cdrom-scsi.xml | 2 +- .../qemuhotplug-base-live+cdrom-usb.xml | 2 +- ...uhotplug-base-live+disk-scsi-multipath.xml | 2 +- ...+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml | 2 +- .../qemuhotplug-base-live+disk-scsi.xml | 2 +- .../qemuhotplug-base-live+disk-usb.xml | 2 +- .../qemuhotplug-base-live+disk-virtio.xml | 2 +- ...thout-scsi-controller-live+disk-scsi-2.xml | 2 +- ...monitorjson-nodename-basic-blockstats.json | 166 ----- ...onitorjson-nodename-basic-named-nodes.json | 268 ------- .../qemumonitorjson-nodename-basic.result | 16 - ...itorjson-nodename-blockjob-blockstats.json | 301 -------- ...torjson-nodename-blockjob-named-nodes.json | 682 ------------------ .../qemumonitorjson-nodename-blockjob.result | 26 - ...monitorjson-nodename-empty-blockstats.json | 2 - ...onitorjson-nodename-empty-named-nodes.json | 2 - .../qemumonitorjson-nodename-empty.result | 0 ...nitorjson-nodename-gluster-blockstats.json | 111 --- ...itorjson-nodename-gluster-named-nodes.json | 135 ---- .../qemumonitorjson-nodename-gluster.result | 11 - ...monitorjson-nodename-iscsi-blockstats.json | 113 --- ...onitorjson-nodename-iscsi-named-nodes.json | 114 --- .../qemumonitorjson-nodename-iscsi.result | 13 - ...umonitorjson-nodename-luks-blockstats.json | 58 -- ...monitorjson-nodename-luks-named-nodes.json | 109 --- .../qemumonitorjson-nodename-luks.result | 6 - ...mumonitorjson-nodename-old-blockstats.json | 160 ---- ...umonitorjson-nodename-old-named-nodes.json | 2 - .../qemumonitorjson-nodename-old.result | 0 ...itorjson-nodename-relative-blockstats.json | 329 --------- ...torjson-nodename-relative-named-nodes.json | 554 -------------- .../qemumonitorjson-nodename-relative.result | 33 - ...json-nodename-same-backing-blockstats.json | 221 ------ ...son-nodename-same-backing-named-nodes.json | 316 -------- ...mumonitorjson-nodename-same-backing.result | 23 - tests/qemumonitorjsontest.c | 105 +-- .../blockjob-mirror-in.xml | 1 + .../migration-in-params-in.xml | 1 + .../migration-out-nbd-out.xml | 1 + .../migration-out-nbd-tls-out.xml | 1 + .../migration-out-params-in.xml | 1 + tests/qemustatusxml2xmldata/upgrade-out.xml | 1 + .../qemustatusxml2xmldata/vcpus-multi-in.xml | 1 + .../aarch64-aavmf-virtio-mmio.args | 5 +- .../aarch64-cpu-passthrough.args | 5 +- .../aarch64-kvm-32-on-64.args | 5 +- .../aarch64-virt-2.6-virtio-pci-default.args | 5 +- .../qemuxml2argvdata/aarch64-virt-virtio.args | 5 +- .../aarch64-virtio-pci-default.args | 5 +- .../aarch64-virtio-pci-manual-addresses.args | 5 +- .../arm-vexpressa9-virtio.args | 5 +- tests/qemuxml2argvdata/arm-virt-virtio.args | 5 +- tests/qemuxml2argvdata/audio-default-sdl.args | 5 +- .../qemuxml2argvdata/audio-default-spice.args | 5 +- tests/qemuxml2argvdata/audio-default-vnc.args | 5 +- tests/qemuxml2argvdata/autoindex.args | 5 +- .../qemuxml2argvdata/balloon-device-auto.args | 5 +- .../balloon-device-deflate-off.args | 5 +- .../balloon-device-deflate.args | 5 +- .../balloon-device-period.args | 5 +- tests/qemuxml2argvdata/balloon-device.args | 5 +- tests/qemuxml2argvdata/blkiotune-device.args | 5 +- tests/qemuxml2argvdata/blkiotune.args | 5 +- tests/qemuxml2argvdata/boot-cdrom.args | 5 +- tests/qemuxml2argvdata/boot-complex.args | 35 +- tests/qemuxml2argvdata/boot-floppy-q35.args | 6 +- tests/qemuxml2argvdata/boot-floppy.args | 10 +- .../boot-menu-disable-drive.args | 5 +- tests/qemuxml2argvdata/boot-menu-disable.args | 5 +- .../boot-menu-enable-with-timeout.args | 5 +- tests/qemuxml2argvdata/boot-menu-enable.args | 5 +- tests/qemuxml2argvdata/boot-multi.args | 5 +- tests/qemuxml2argvdata/boot-network.args | 5 +- tests/qemuxml2argvdata/boot-order.args | 20 +- tests/qemuxml2argvdata/channel-guestfwd.args | 5 +- tests/qemuxml2argvdata/channel-spicevmc.args | 5 +- .../qemuxml2argvdata/channel-virtio-auto.args | 5 +- .../channel-virtio-autoadd.args | 5 +- .../channel-virtio-autoassign.args | 5 +- .../channel-virtio-default.args | 5 +- .../channel-virtio-state.args | 5 +- .../qemuxml2argvdata/channel-virtio-unix.args | 5 +- tests/qemuxml2argvdata/channel-virtio.args | 5 +- tests/qemuxml2argvdata/clock-catchup.args | 5 +- tests/qemuxml2argvdata/clock-france.args | 5 +- tests/qemuxml2argvdata/clock-hpet-off.args | 5 +- .../clock-localtime-basis-localtime.args | 5 +- tests/qemuxml2argvdata/clock-localtime.args | 5 +- tests/qemuxml2argvdata/clock-realtime.args | 5 +- tests/qemuxml2argvdata/clock-utc.args | 5 +- tests/qemuxml2argvdata/clock-variable.args | 5 +- .../qemuxml2argvdata/console-compat-auto.args | 5 +- .../console-compat-chardev.args | 5 +- tests/qemuxml2argvdata/console-compat.args | 5 +- .../qemuxml2argvdata/console-virtio-ccw.args | 5 +- .../qemuxml2argvdata/console-virtio-many.args | 5 +- tests/qemuxml2argvdata/console-virtio.args | 5 +- tests/qemuxml2argvdata/controller-order.args | 10 +- .../cpu-host-passthrough-features.args | 5 +- .../qemuxml2argvdata/cputune-zero-shares.args | 5 +- tests/qemuxml2argvdata/cputune.args | 5 +- tests/qemuxml2argvdata/disk-nvme.xml | 5 +- .../qemuxml2argvdata/encrypted-disk-usage.xml | 5 +- .../firmware-manual-efi-acpi-aarch64.args | 8 +- .../firmware-manual-efi-acpi-q35.args | 8 +- .../firmware-manual-efi-noacpi-aarch64.args | 8 +- .../firmware-manual-efi-secure.args | 8 +- .../qemuxml2argvdata/firmware-manual-efi.args | 8 +- .../qemuxml2argvdata/graphics-dbus-audio.args | 5 +- .../graphics-egl-headless.args | 5 +- .../graphics-sdl-fullscreen.args | 5 +- tests/qemuxml2argvdata/graphics-sdl.args | 5 +- .../hostdev-scsi-vhost-scsi-ccw.args | 5 +- .../hostdev-scsi-vhost-scsi-pci.args | 5 +- .../hostdev-vfio-multidomain.args | 5 +- tests/qemuxml2argvdata/hostdev-vfio.args | 5 +- .../qemuxml2argvdata/hugepages-memaccess.args | 5 +- .../hugepages-memaccess2.args | 5 +- tests/qemuxml2argvdata/hugepages-shared.args | 5 +- .../hvf-aarch64-virt-headless.args | 13 +- .../hvf-x86_64-q35-headless.args | 5 +- .../qemuxml2argvdata/input-usbmouse-addr.args | 5 +- tests/qemuxml2argvdata/input-usbmouse.args | 5 +- tests/qemuxml2argvdata/input-usbtablet.args | 5 +- tests/qemuxml2argvdata/input-virtio-ccw.args | 5 +- .../iothreads-disk-virtio-ccw.args | 10 +- tests/qemuxml2argvdata/iothreads-disk.args | 15 +- .../iothreads-ids-partial.args | 5 +- tests/qemuxml2argvdata/iothreads-ids.args | 5 +- tests/qemuxml2argvdata/iothreads.args | 5 +- tests/qemuxml2argvdata/kvm-pit-delay.args | 5 +- tests/qemuxml2argvdata/kvm-pit-discard.args | 5 +- .../machine-aeskeywrap-off-cap.args | 5 +- .../machine-aeskeywrap-off-caps.args | 5 +- .../machine-aeskeywrap-on-cap.args | 5 +- .../machine-aeskeywrap-on-caps.args | 5 +- tests/qemuxml2argvdata/machine-aliases1.args | 5 +- tests/qemuxml2argvdata/machine-aliases2.args | 5 +- tests/qemuxml2argvdata/machine-core-off.args | 5 +- tests/qemuxml2argvdata/machine-core-on.args | 5 +- .../machine-deakeywrap-off-cap.args | 5 +- .../machine-deakeywrap-off-caps.args | 5 +- .../machine-deakeywrap-on-cap.args | 5 +- .../machine-deakeywrap-on-caps.args | 5 +- .../machine-keywrap-none-caps.args | 5 +- .../machine-keywrap-none.args | 5 +- ...ine-loadparm-multiple-disks-nets-s390.args | 10 +- .../machine-loadparm-s390.args | 5 +- .../qemuxml2argvdata/machine-vmport-opt.args | 5 +- tests/qemuxml2argvdata/master-key.args | 5 +- .../memory-hotplug-dimm-addr.args | 5 +- .../qemuxml2argvdata/memory-hotplug-dimm.args | 5 +- tests/qemuxml2argvdata/memory-hotplug.args | 5 +- tests/qemuxml2argvdata/memtune-unlimited.args | 5 +- tests/qemuxml2argvdata/memtune.args | 5 +- tests/qemuxml2argvdata/migrate.args | 5 +- tests/qemuxml2argvdata/minimal.args | 5 +- tests/qemuxml2argvdata/misc-acpi.args | 5 +- tests/qemuxml2argvdata/misc-disable-s3.args | 5 +- .../misc-disable-suspends.args | 5 +- tests/qemuxml2argvdata/misc-enable-s4.args | 5 +- tests/qemuxml2argvdata/misc-uuid.args | 5 +- tests/qemuxml2argvdata/monitor-json.args | 5 +- .../multifunction-pci-device.args | 5 +- tests/qemuxml2argvdata/net-client.args | 5 +- tests/qemuxml2argvdata/net-eth-hostip.args | 5 +- tests/qemuxml2argvdata/net-eth-ifname.args | 5 +- tests/qemuxml2argvdata/net-eth-names.args | 5 +- .../net-eth-unmanaged-tap.args | 5 +- tests/qemuxml2argvdata/net-eth.args | 5 +- .../net-hostdev-bootorder.args | 5 +- .../net-hostdev-multidomain.args | 5 +- .../net-hostdev-vfio-multidomain.args | 5 +- tests/qemuxml2argvdata/net-hostdev-vfio.args | 5 +- tests/qemuxml2argvdata/net-hostdev.args | 5 +- tests/qemuxml2argvdata/net-mcast.args | 5 +- tests/qemuxml2argvdata/net-server.args | 5 +- tests/qemuxml2argvdata/net-udp.args | 5 +- tests/qemuxml2argvdata/net-user-addr.args | 5 +- tests/qemuxml2argvdata/net-user.args | 5 +- .../net-vhostuser-multiq.args | 5 +- tests/qemuxml2argvdata/net-virtio-device.args | 5 +- .../net-virtio-disable-offloads.args | 5 +- tests/qemuxml2argvdata/net-virtio-netdev.args | 5 +- .../net-virtio-rxtxqueuesize.args | 5 +- .../net-virtio-teaming-hostdev.args | 5 +- .../qemuxml2argvdata/net-virtio-teaming.args | 5 +- tests/qemuxml2argvdata/net-virtio.args | 5 +- tests/qemuxml2argvdata/nosharepages.args | 5 +- .../numad-auto-memory-vcpu-cpuset.args | 5 +- ...o-memory-vcpu-no-cpuset-and-placement.args | 5 +- .../numad-auto-vcpu-static-numatune.args | 5 +- .../numad-static-memory-auto-vcpu.args | 5 +- tests/qemuxml2argvdata/numad.args | 5 +- .../numatune-auto-nodeset-invalid.args | 5 +- tests/qemuxml2argvdata/numatune-memory.args | 5 +- .../parallel-parport-chardev.args | 5 +- .../parallel-tcp-chardev.args | 5 +- tests/qemuxml2argvdata/pci-autoadd-addr.args | 5 +- tests/qemuxml2argvdata/pci-autoadd-idx.args | 5 +- tests/qemuxml2argvdata/pci-autofill-addr.args | 5 +- .../pci-bridge-many-disks.args | 525 ++++++++------ tests/qemuxml2argvdata/pci-bridge.args | 5 +- tests/qemuxml2argvdata/pci-many.args | 145 ++-- tests/qemuxml2argvdata/pci-rom.args | 5 +- .../pci-serial-dev-chardev.args | 5 +- tests/qemuxml2argvdata/pcie-expander-bus.args | 5 +- tests/qemuxml2argvdata/pcie-root-port.args | 5 +- .../pcie-switch-downstream-port.args | 5 +- .../pcie-switch-upstream-port.args | 5 +- tests/qemuxml2argvdata/pcihole64-q35.args | 5 +- .../pseries-vio-user-assigned.args | 5 +- tests/qemuxml2argvdata/pseries-vio.args | 5 +- tests/qemuxml2argvdata/q35-pcie-autoadd.args | 5 +- tests/qemuxml2argvdata/q35-pcie.args | 5 +- tests/qemuxml2argvdata/q35-usb2-multi.args | 5 +- tests/qemuxml2argvdata/q35-usb2-reorder.args | 5 +- tests/qemuxml2argvdata/q35-usb2.args | 5 +- .../q35-virt-manager-basic.args | 5 +- tests/qemuxml2argvdata/q35-virtio-pci.args | 5 +- tests/qemuxml2argvdata/q35.args | 5 +- tests/qemuxml2argvdata/qemu-ns-alt.args | 5 +- .../qemu-ns-commandline-ns0.args | 5 +- .../qemu-ns-commandline-ns1.args | 5 +- .../qemuxml2argvdata/qemu-ns-commandline.args | 5 +- .../qemu-ns-domain-commandline-ns0.args | 5 +- .../qemu-ns-domain-commandline.args | 5 +- .../qemuxml2argvdata/qemu-ns-domain-ns0.args | 5 +- tests/qemuxml2argvdata/qemu-ns-no-env.args | 5 +- tests/qemuxml2argvdata/restore-v2-fd.args | 5 +- tests/qemuxml2argvdata/restore-v2.args | 5 +- tests/qemuxml2argvdata/riscv64-virt-pci.args | 5 +- tests/qemuxml2argvdata/riscv64-virt.args | 5 +- tests/qemuxml2argvdata/seclabel-dac-none.args | 5 +- .../seclabel-dynamic-baselabel.args | 5 +- .../seclabel-dynamic-labelskip.args | 5 +- .../seclabel-dynamic-override.args | 10 +- .../seclabel-dynamic-relabel.args | 5 +- tests/qemuxml2argvdata/seclabel-dynamic.args | 5 +- tests/qemuxml2argvdata/seclabel-none.args | 5 +- .../seclabel-static-labelskip.args | 5 +- .../seclabel-static-relabel.args | 5 +- tests/qemuxml2argvdata/seclabel-static.args | 5 +- .../serial-dev-chardev-iobase.args | 5 +- .../qemuxml2argvdata/serial-dev-chardev.args | 5 +- .../qemuxml2argvdata/serial-file-chardev.args | 5 +- tests/qemuxml2argvdata/serial-file-log.args | 5 +- .../qemuxml2argvdata/serial-many-chardev.args | 5 +- .../qemuxml2argvdata/serial-pty-chardev.args | 5 +- tests/qemuxml2argvdata/serial-spiceport.args | 5 +- .../qemuxml2argvdata/serial-tcp-chardev.args | 5 +- .../serial-tcp-telnet-chardev.args | 5 +- .../serial-tcp-tlsx509-chardev-notls.args | 5 +- .../serial-tcp-tlsx509-chardev-verify.args | 5 +- .../serial-tcp-tlsx509-chardev.args | 5 +- .../serial-tcp-tlsx509-secret-chardev.args | 5 +- .../qemuxml2argvdata/serial-udp-chardev.args | 5 +- tests/qemuxml2argvdata/serial-vc-chardev.args | 5 +- tests/qemuxml2argvdata/smbios-type-fwcfg.args | 5 +- tests/qemuxml2argvdata/smbios.args | 5 +- tests/qemuxml2argvdata/smp-dies.args | 5 +- tests/qemuxml2argvdata/smp.args | 5 +- tests/qemuxml2argvdata/sound-device.args | 5 +- tests/qemuxml2argvdata/sound.args | 5 +- tests/qemuxml2argvdata/sparc-minimal.args | 10 +- tests/qemuxml2argvdata/user-aliases-usb.args | 41 -- .../user-aliases-usb.x86_64-latest.args | 44 ++ tests/qemuxml2argvdata/user-aliases.args | 68 -- .../user-aliases.x86_64-latest.args | 74 ++ tests/qemuxml2argvdata/user-aliases.xml | 5 +- tests/qemuxml2argvdata/user-aliases2.args | 1 - .../user-aliases2.x86_64-latest.args | 39 + .../video-device-pciaddr-default.args | 5 +- tests/qemuxml2argvdata/video-none-device.args | 5 +- .../video-qxl-device-vgamem.args | 5 +- tests/qemuxml2argvdata/video-qxl-device.args | 5 +- tests/qemuxml2argvdata/video-qxl-heads.args | 5 +- tests/qemuxml2argvdata/video-qxl-noheads.args | 5 +- .../video-qxl-resolution.args | 5 +- .../video-qxl-sec-device-vgamem.args | 5 +- .../video-qxl-sec-device.args | 5 +- .../video-vga-device-vgamem.args | 5 +- tests/qemuxml2argvdata/video-vga-device.args | 5 +- .../qemuxml2argvdata/video-vga-qxl-heads.args | 5 +- .../video-virtio-gpu-ccw.args | 5 +- .../video-virtio-gpu-device.args | 5 +- .../video-virtio-gpu-sdl-gl.args | 5 +- .../video-virtio-gpu-spice-gl.args | 5 +- .../video-virtio-gpu-virgl.args | 5 +- tests/qemuxml2argvdata/video-virtio-vga.args | 5 +- tests/qemuxml2argvdata/virtio-rng-ccw.args | 5 +- tests/qemuxml2argvdata/vmcoreinfo.args | 5 +- tests/qemuxml2argvtest.c | 14 +- ...k-nvme.xml => disk-nvme.x86_64-latest.xml} | 0 ...=> encrypted-disk-usage.x86_64-latest.xml} | 0 ...k.xml => encrypted-disk.x86_64-latest.xml} | 5 +- ...ses.xml => user-aliases.x86_64-latest.xml} | 0 tests/qemuxml2xmltest.c | 15 +- 358 files changed, 1924 insertions(+), 8440 deletions(-) delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-blockstats.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-basic-named-nodes.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-basic.result delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-blockstats.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob-named-nodes.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-blockjob.result delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-blockstats.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty-named-nodes.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-empty.result delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-blockstats.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster-named-nodes.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-gluster.result delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-blockstats.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi-named-nodes.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-iscsi.result delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-blockstats.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks-named-nodes.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-luks.result delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old-blockstats.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old-named-nodes.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-old.result delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-blockstats.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-relative-named-nodes.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-relative.result delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-blockstats.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing-named-nodes.json delete mode 100644 tests/qemumonitorjsondata/qemumonitorjson-nodename-same-backing.result delete mode 100644 tests/qemuxml2argvdata/user-aliases-usb.args create mode 100644 tests/qemuxml2argvdata/user-aliases-usb.x86_64-latest.args delete mode 100644 tests/qemuxml2argvdata/user-aliases.args create mode 100644 tests/qemuxml2argvdata/user-aliases.x86_64-latest.args delete mode 120000 tests/qemuxml2argvdata/user-aliases2.args create mode 100644 tests/qemuxml2argvdata/user-aliases2.x86_64-latest.args rename tests/qemuxml2xmloutdata/{disk-nvme.xml => disk-nvme.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{encrypted-disk-usage.xml => encrypted-disk-usage.x86_64-latest.xml} (100%) rename tests/qemuxml2xmloutdata/{encrypted-disk.xml => encrypted-disk.x86_64-latest.xml} (89%) rename tests/qemuxml2xmloutdata/{user-aliases.xml => user-aliases.x86_64-latest.xml} (100%) -- 2.36.1
