6:44 a.m.
In August Debian 10 officially reaches EOL, thus we can bump minimum
qemu version to 4.2 which is being limited by Ubuntu and RHEL/Centos 8.
QEMU-4.2 allows us to remove a big bunch of old code though. Few
examples which this series (and the next iterations of it) will deal
with:
- old auidiodev config via ENV variables
- old-style VIRTIO tranitional setup (possibly)
- most of legacy block device setup (upcoming series)
This series is lacking the removal of Debian 10 from our CI infra
though, I'll post that separately once I get to it.
The patches can also be fetched at:
git fetch https://gitlab.com/pipo.sk/libvirt.git debian-10-remove-part1
as some of the pure-removal patches here will be truncated to prevent
spamming the list.
Peter Krempa (20):
qemuxml2(argv|xml)test: Remove 'qemu-4.1' variant of
'x86-kvm-32-on-64'
tests: qemuxml2argv: Remove pre-blockdev versions of disk-related
tests
qemuxml2argvtest: Drop 'qemu-4.1' variants of all audio tests
qemuxml2argvtest: Remove 'qemu-3.1' versions of
virtio-(non-)transitional tests
qemuxml2argvtest: Remove pre-qemu-4.2 versions of 'cpu-host-model'
test
qemuxml2argvtest: Remove 'qemu-4.0' version of aarch64-features-sve
case
qemuxml2argvtest: Remove 'qemu-4.0' versions of 'cpu-host-model-cmt'
and 'cpu-tsc-frequency'
tests: qemucapabilities: Remove qemu-3.1 test data
tests: domaincaps: Remove test data for qemu-3.1
qemucapabilitiestest: Remove test data for qemu-4.0
domaincapstest: Remove test data for qemu-4.0
qemucapabilitiestest: Remove test data for qemu-4.1
domaincapstest: Remove test data for qemu-4.1
qemu: Formally deprecate support for qemu < 4.2
qemu: command: Always assume QEMU_CAPS_AUDIODEV
qemu: command: Drop the code for configuring audio devices via
environment variables
qemu: command: Drop qemuBuildAudioCommandLine thin wrapper
qemu: validate: Remove unreachable checks for QEMU_CAPS_AUDIODEV
qemuxml2(argv|xml)test: Remove use of QEMU_CAPS_AUDIODEV in fake-caps
tests
qemu: capabilities: Retire QEMU_CAPS_AUDIODEV
docs/drvqemu.rst | 2 +-
src/qemu/qemu_capabilities.c | 7 +-
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 221 +-
src/qemu/qemu_validate.c | 86 -
.../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 211 -
.../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 230 -
tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 138 -
tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 211 -
.../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 211 -
.../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 230 -
.../qemu_4.0.0-virt.aarch64.xml | 179 -
tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 173 -
tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 139 -
tests/domaincapsdata/qemu_4.0.0.s390x.xml | 236 -
tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 211 -
.../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 217 -
.../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 233 -
tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 217 -
.../caps_3.1.0.ppc64.replies | 23732 ---------------
.../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1072 -
.../caps_3.1.0.x86_64.replies | 24428 ---------------
.../caps_3.1.0.x86_64.xml | 1387 -
.../caps_4.0.0.aarch64.replies | 20893 -------------
.../caps_4.0.0.aarch64.xml | 363 -
.../caps_4.0.0.ppc64.replies | 24461 ---------------
.../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1091 -
.../caps_4.0.0.riscv32.replies | 18154 -----------
.../caps_4.0.0.riscv32.xml | 157 -
.../caps_4.0.0.riscv64.replies | 18154 -----------
.../caps_4.0.0.riscv64.xml | 157 -
.../caps_4.0.0.s390x.replies | 21721 -------------
.../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2891 --
.../caps_4.0.0.x86_64.replies | 25001 ---------------
.../caps_4.0.0.x86_64.xml | 1398 -
.../caps_4.1.0.x86_64.replies | 25198 ----------------
.../caps_4.1.0.x86_64.xml | 1971 --
.../caps_4.2.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
.../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
.../caps_4.2.0.x86_64.xml | 1 -
.../caps_5.0.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
.../caps_5.0.0.riscv64.xml | 1 -
.../caps_5.0.0.x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 -
.../caps_5.1.0.x86_64.xml | 1 -
.../caps_5.2.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
.../caps_5.2.0.riscv64.xml | 1 -
.../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
.../caps_5.2.0.x86_64.xml | 1 -
.../caps_6.0.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
.../caps_6.0.0.x86_64.xml | 1 -
.../caps_6.1.0.x86_64.xml | 1 -
.../caps_6.2.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 -
.../caps_6.2.0.x86_64.xml | 1 -
.../caps_7.0.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 -
.../caps_7.0.0.x86_64.xml | 1 -
.../caps_7.1.0.x86_64.xml | 1 -
.../aarch64-aavmf-virtio-mmio.args | 2 +-
.../aarch64-cpu-passthrough.args | 2 +-
.../aarch64-features-sve.aarch64-4.0.0.err | 1 -
tests/qemuxml2argvdata/aarch64-gic-host.args | 2 +-
.../aarch64-gic-none-tcg.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-v2.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-v3.args | 2 +-
.../aarch64-kvm-32-on-64.args | 2 +-
.../qemuxml2argvdata/aarch64-pci-serial.args | 2 +-
.../aarch64-traditional-pci.args | 2 +-
.../aarch64-usb-controller-nec-xhci.args | 2 +-
.../aarch64-usb-controller-qemu-xhci.args | 2 +-
.../aarch64-video-default.args | 4 +-
.../aarch64-video-virtio-gpu-pci.args | 2 +-
.../aarch64-virt-2.6-virtio-pci-default.args | 2 +-
.../aarch64-virt-default-nic.args | 2 +-
.../qemuxml2argvdata/aarch64-virt-virtio.args | 2 +-
.../aarch64-virtio-pci-default.args | 2 +-
.../aarch64-virtio-pci-manual-addresses.args | 2 +-
tests/qemuxml2argvdata/acpi-table.args | 2 +-
.../arm-vexpressa9-basic.args | 2 +-
.../arm-vexpressa9-nodevs.args | 2 +-
.../arm-vexpressa9-virtio.args | 2 +-
tests/qemuxml2argvdata/arm-virt-virtio.args | 2 +-
.../audio-alsa-best.x86_64-4.1.0.args | 46 -
.../audio-alsa-full.x86_64-4.1.0.err | 1 -
.../audio-alsa-minimal.x86_64-4.1.0.args | 33 -
.../audio-coreaudio-best.x86_64-4.1.0.args | 46 -
.../audio-coreaudio-full.x86_64-4.1.0.err | 1 -
.../audio-coreaudio-minimal.x86_64-4.1.0.args | 33 -
...audio-default-nographics.x86_64-4.1.0.args | 33 -
tests/qemuxml2argvdata/audio-default-sdl.args | 2 +-
.../qemuxml2argvdata/audio-default-spice.args | 2 +-
tests/qemuxml2argvdata/audio-default-vnc.args | 4 +-
.../audio-file-best.x86_64-4.1.0.args | 45 -
.../audio-file-full.x86_64-4.1.0.err | 1 -
.../audio-file-minimal.x86_64-4.1.0.args | 33 -
.../audio-jack-full.x86_64-4.1.0.err | 1 -
.../audio-jack-minimal.x86_64-4.1.0.err | 1 -
.../audio-many-backends.x86_64-4.1.0.err | 1 -
.../audio-none-best.x86_64-4.1.0.args | 44 -
.../audio-none-full.x86_64-4.1.0.err | 1 -
.../audio-none-minimal.x86_64-4.1.0.args | 33 -
.../audio-oss-best.x86_64-4.1.0.args | 49 -
.../audio-oss-full.x86_64-4.1.0.err | 1 -
.../audio-oss-minimal.x86_64-4.1.0.args | 33 -
.../audio-pulseaudio-best.x86_64-4.1.0.args | 48 -
.../audio-pulseaudio-full.x86_64-4.1.0.err | 1 -
...audio-pulseaudio-minimal.x86_64-4.1.0.args | 33 -
.../audio-sdl-best.x86_64-4.1.0.args | 46 -
.../audio-sdl-full.x86_64-4.1.0.err | 1 -
.../audio-sdl-minimal.x86_64-4.1.0.args | 33 -
.../audio-spice-best.x86_64-4.1.0.args | 45 -
.../audio-spice-full.x86_64-4.1.0.err | 1 -
.../audio-spice-minimal.x86_64-4.1.0.args | 34 -
tests/qemuxml2argvdata/autoindex.args | 2 +-
.../qemuxml2argvdata/balloon-ccw-deflate.args | 2 +-
.../qemuxml2argvdata/balloon-device-auto.args | 2 +-
.../balloon-device-deflate-off.args | 2 +-
.../balloon-device-deflate.args | 2 +-
.../balloon-device-period.args | 2 +-
tests/qemuxml2argvdata/balloon-device.args | 2 +-
.../balloon-mmio-deflate.args | 2 +-
.../blkdeviotune-group-num.x86_64-4.1.0.args | 37 -
.../blkdeviotune-max-length.x86_64-4.1.0.args | 37 -
.../blkdeviotune-max.x86_64-4.1.0.args | 37 -
tests/qemuxml2argvdata/blkiotune-device.args | 2 +-
tests/qemuxml2argvdata/blkiotune.args | 2 +-
tests/qemuxml2argvdata/boot-cdrom.args | 2 +-
tests/qemuxml2argvdata/boot-complex.args | 2 +-
tests/qemuxml2argvdata/boot-floppy-q35.args | 2 +-
tests/qemuxml2argvdata/boot-floppy.args | 2 +-
.../boot-menu-disable-drive.args | 2 +-
tests/qemuxml2argvdata/boot-menu-disable.args | 2 +-
.../boot-menu-enable-with-timeout.args | 2 +-
tests/qemuxml2argvdata/boot-menu-enable.args | 2 +-
tests/qemuxml2argvdata/boot-multi.args | 2 +-
tests/qemuxml2argvdata/boot-network.args | 2 +-
tests/qemuxml2argvdata/boot-order.args | 2 +-
tests/qemuxml2argvdata/channel-guestfwd.args | 2 +-
tests/qemuxml2argvdata/channel-spicevmc.args | 2 +-
.../qemuxml2argvdata/channel-virtio-auto.args | 2 +-
.../channel-virtio-autoadd.args | 2 +-
.../channel-virtio-autoassign.args | 2 +-
.../channel-virtio-default.args | 2 +-
.../channel-virtio-state.args | 2 +-
.../qemuxml2argvdata/channel-virtio-unix.args | 2 +-
tests/qemuxml2argvdata/channel-virtio.args | 2 +-
tests/qemuxml2argvdata/chardev-reconnect.args | 2 +-
tests/qemuxml2argvdata/clock-catchup.args | 2 +-
tests/qemuxml2argvdata/clock-france.args | 2 +-
tests/qemuxml2argvdata/clock-hpet-off.args | 2 +-
.../clock-localtime-basis-localtime.args | 2 +-
tests/qemuxml2argvdata/clock-localtime.args | 2 +-
tests/qemuxml2argvdata/clock-realtime.args | 2 +-
.../clock-timer-hyperv-rtc.args | 2 +-
tests/qemuxml2argvdata/clock-utc.args | 2 +-
tests/qemuxml2argvdata/clock-variable.args | 2 +-
.../qemuxml2argvdata/console-compat-auto.args | 2 +-
.../console-compat-chardev.args | 2 +-
tests/qemuxml2argvdata/console-compat.args | 2 +-
.../qemuxml2argvdata/console-virtio-ccw.args | 2 +-
.../qemuxml2argvdata/console-virtio-many.args | 2 +-
tests/qemuxml2argvdata/console-virtio.args | 2 +-
tests/qemuxml2argvdata/controller-order.args | 4 +-
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-disable.args | 2 +-
.../qemuxml2argvdata/cpu-cache-disable2.args | 2 +-
.../qemuxml2argvdata/cpu-cache-disable3.args | 2 +-
.../cpu-cache-emulate-l3.args | 2 +-
.../cpu-cache-passthrough.args | 2 +-
.../cpu-cache-passthrough2.args | 2 +-
.../cpu-check-default-none.args | 2 +-
.../cpu-check-default-none2.args | 2 +-
.../cpu-check-default-partial.args | 2 +-
.../cpu-check-default-partial2.args | 2 +-
tests/qemuxml2argvdata/cpu-check-none.args | 2 +-
tests/qemuxml2argvdata/cpu-exact1.args | 2 +-
.../cpu-exact2-nofallback.args | 2 +-
tests/qemuxml2argvdata/cpu-exact2.args | 2 +-
tests/qemuxml2argvdata/cpu-fallback.args | 2 +-
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +-
.../qemuxml2argvdata/cpu-host-model-cmt.args | 2 +-
.../cpu-host-model-cmt.x86_64-4.0.0.args | 33 -
.../cpu-host-model-fallback.args | 2 +-
.../cpu-host-model-vendor.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.args | 2 +-
.../cpu-host-model.x86_64-3.1.0.args | 36 -
.../cpu-host-model.x86_64-4.0.0.args | 36 -
.../cpu-host-model.x86_64-4.1.0.args | 36 -
.../cpu-host-passthrough-features.args | 2 +-
.../cpu-host-passthrough.args | 2 +-
.../qemuxml2argvdata/cpu-hotplug-startup.args | 2 +-
tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum1.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum2.args | 2 +-
.../cpu-no-removed-features.args | 2 +-
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +-
.../qemuxml2argvdata/cpu-numa-memshared.args | 2 +-
.../cpu-numa-no-memory-element.args | 2 +-
tests/qemuxml2argvdata/cpu-numa1.args | 2 +-
tests/qemuxml2argvdata/cpu-numa2.args | 2 +-
tests/qemuxml2argvdata/cpu-s390-features.args | 2 +-
tests/qemuxml2argvdata/cpu-s390-zEC12.args | 2 +-
tests/qemuxml2argvdata/cpu-strict1.args | 2 +-
tests/qemuxml2argvdata/cpu-topology1.args | 2 +-
tests/qemuxml2argvdata/cpu-topology2.args | 2 +-
tests/qemuxml2argvdata/cpu-topology3.args | 2 +-
tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +-
.../cpu-tsc-frequency.x86_64-4.0.0.args | 33 -
tests/qemuxml2argvdata/cputune-numatune.args | 2 +-
.../qemuxml2argvdata/cputune-zero-shares.args | 2 +-
tests/qemuxml2argvdata/cputune.args | 2 +-
.../default-kvm-host-arch.args | 2 +-
.../default-qemu-host-arch.args | 2 +-
.../disk-aio.x86_64-4.1.0.args | 36 -
.../disk-arm-virtio-sd.aarch64-4.0.0.args | 38 -
...isk-backing-chains-index.x86_64-4.1.0.args | 45 -
...k-backing-chains-noindex.x86_64-4.1.0.args | 1 -
.../disk-cache.x86_64-3.1.0.args | 42 -
.../disk-cache.x86_64-4.1.0.args | 42 -
.../disk-cdrom-network.x86_64-4.1.0.args | 39 -
.../disk-cdrom-tray.x86_64-4.1.0.args | 38 -
.../disk-cdrom.x86_64-4.1.0.args | 39 -
.../disk-copy_on_read.x86_64-4.1.0.args | 39 -
.../disk-detect-zeroes.x86_64-4.1.0.args | 37 -
.../disk-discard.x86_64-4.1.0.args | 36 -
.../disk-error-policy-s390x.s390x-4.0.0.args | 35 -
.../disk-error-policy.x86_64-4.1.0.args | 37 -
.../disk-floppy-q35.x86_64-4.1.0.args | 36 -
.../disk-floppy.x86_64-4.1.0.args | 37 -
.../disk-fmt-qcow.x86_64-4.1.0.args | 35 -
.../disk-network-gluster.x86_64-4.1.0.args | 37 -
.../disk-network-iscsi.x86_64-4.1.0.args | 49 -
.../disk-network-nbd.x86_64-4.1.0.args | 41 -
...disk-network-rbd-no-colon.x86_64-4.1.0.err | 1 -
.../disk-network-rbd.x86_64-4.1.0.args | 44 -
.../disk-network-sheepdog.x86_64-4.1.0.args | 35 -
...disk-network-source-auth.x86_64-4.1.0.args | 40 -
...disk-network-tlsx509-nbd.x86_64-4.1.0.args | 35 -
...isk-network-tlsx509-vxhs.x86_64-4.1.0.args | 41 -
.../disk-readonly-disk.x86_64-4.1.0.args | 36 -
.../disk-shared.x86_64-3.1.0.args | 41 -
.../disk-shared.x86_64-4.1.0.args | 41 -
.../disk-source-pool-mode.x86_64-4.1.0.args | 40 -
.../disk-source-pool.x86_64-4.1.0.args | 42 -
.../disk-transient.x86_64-4.1.0.err | 1 -
...virtio-scsi-reservations.x86_64-4.1.0.args | 39 -
.../encrypted-disk-usage.x86_64-4.1.0.args | 35 -
.../encrypted-disk.x86_64-4.1.0.args | 35 -
.../fd-memory-no-numa-topology.args | 2 +-
.../fd-memory-numa-topology.args | 2 +-
.../fd-memory-numa-topology2.args | 2 +-
.../fd-memory-numa-topology3.args | 2 +-
.../firmware-manual-bios.args | 2 +-
.../firmware-manual-efi-acpi-aarch64.args | 2 +-
.../firmware-manual-efi-acpi-q35.args | 2 +-
.../firmware-manual-efi-noacpi-aarch64.args | 2 +-
...l-efi-nvram-network-iscsi.x86_64-4.1.0.err | 1 -
.../firmware-manual-efi-secure.args | 2 +-
.../qemuxml2argvdata/firmware-manual-efi.args | 2 +-
.../firmware-manual-noefi-acpi-q35.args | 2 +-
.../firmware-manual-noefi-noacpi-aarch64.args | 2 +-
.../firmware-manual-noefi-noacpi-q35.args | 2 +-
.../floppy-drive-fat.x86_64-4.1.0.args | 35 -
.../hostdev-mdev-precreated.args | 2 +-
.../hostdev-pci-address-unassigned.args | 2 +-
.../hostdev-pci-multifunction.args | 2 +-
.../hostdev-scsi-lsi.x86_64-4.1.0.args | 49 -
.../hostdev-scsi-vhost-scsi-ccw.args | 2 +-
.../hostdev-scsi-vhost-scsi-pci.args | 2 +-
.../hostdev-scsi-vhost-scsi-pcie.args | 2 +-
...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 51 -
.../hostdev-subsys-mdev-vfio-ccw.args | 2 +-
.../hostdev-vfio-multidomain.args | 2 +-
.../hostdev-vfio-zpci-autogenerate-fids.args | 2 +-
.../hostdev-vfio-zpci-autogenerate-uids.args | 2 +-
.../hostdev-vfio-zpci-autogenerate.args | 2 +-
.../hostdev-vfio-zpci-boundaries.args | 2 +-
.../hostdev-vfio-zpci-ccw-memballoon.args | 2 +-
.../hostdev-vfio-zpci-multidomain-many.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio.args | 2 +-
tests/qemuxml2argvdata/hotplug-base.args | 2 +-
.../hugepages-default-2M.args | 2 +-
.../hugepages-default-system-size.args | 2 +-
tests/qemuxml2argvdata/hugepages-default.args | 2 +-
.../qemuxml2argvdata/hugepages-memaccess.args | 2 +-
.../hugepages-memaccess2.args | 2 +-
tests/qemuxml2argvdata/hugepages-nodeset.args | 2 +-
.../hugepages-numa-default-2M.args | 2 +-
.../hugepages-numa-default-dimm.args | 2 +-
.../hugepages-numa-default.args | 2 +-
.../hugepages-numa-nodeset-part.args | 2 +-
.../hugepages-numa-nodeset.args | 2 +-
tests/qemuxml2argvdata/hugepages-shared.args | 2 +-
.../hvf-aarch64-virt-headless.args | 2 +-
.../hvf-x86_64-q35-headless.args | 2 +-
.../qemuxml2argvdata/input-usbmouse-addr.args | 2 +-
tests/qemuxml2argvdata/input-usbmouse.args | 2 +-
tests/qemuxml2argvdata/input-usbtablet.args | 2 +-
tests/qemuxml2argvdata/input-virtio-ccw.args | 2 +-
.../iothreads-disk-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/iothreads-disk.args | 2 +-
.../iothreads-ids-partial.args | 2 +-
tests/qemuxml2argvdata/iothreads-ids.args | 2 +-
tests/qemuxml2argvdata/iothreads.args | 2 +-
tests/qemuxml2argvdata/kvm-features-off.args | 2 +-
tests/qemuxml2argvdata/kvm-features.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +-
tests/qemuxml2argvdata/kvmclock.args | 2 +-
.../luks-disks-source.x86_64-4.1.0.args | 48 -
.../luks-disks.x86_64-4.1.0.args | 39 -
.../mach-virt-console-virtio.args | 2 +-
.../mach-virt-serial-native.args | 2 +-
.../mach-virt-serial-pci.args | 2 +-
.../mach-virt-serial-usb.args | 2 +-
.../machine-aeskeywrap-off-cap.args | 2 +-
.../machine-aeskeywrap-off-caps.args | 2 +-
.../machine-aeskeywrap-on-cap.args | 2 +-
.../machine-aeskeywrap-on-caps.args | 2 +-
tests/qemuxml2argvdata/machine-aliases1.args | 2 +-
tests/qemuxml2argvdata/machine-aliases2.args | 2 +-
tests/qemuxml2argvdata/machine-core-off.args | 2 +-
tests/qemuxml2argvdata/machine-core-on.args | 2 +-
.../machine-deakeywrap-off-cap.args | 2 +-
.../machine-deakeywrap-off-caps.args | 2 +-
.../machine-deakeywrap-on-cap.args | 2 +-
.../machine-deakeywrap-on-caps.args | 2 +-
.../machine-keywrap-none-caps.args | 2 +-
.../machine-keywrap-none.args | 2 +-
...ine-loadparm-multiple-disks-nets-s390.args | 2 +-
.../machine-loadparm-net-s390.args | 2 +-
.../machine-loadparm-s390.args | 2 +-
.../qemuxml2argvdata/machine-vmport-opt.args | 2 +-
tests/qemuxml2argvdata/master-key.args | 2 +-
.../memory-hotplug-dimm-addr.args | 2 +-
.../qemuxml2argvdata/memory-hotplug-dimm.args | 2 +-
...emory-hotplug-nvdimm-ppc64-abi-update.args | 2 +-
.../memory-hotplug-nvdimm-ppc64.args | 2 +-
...emory-hotplug-ppc64-nonuma-abi-update.args | 2 +-
.../memory-hotplug-ppc64-nonuma.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug.args | 2 +-
tests/qemuxml2argvdata/memtune-unlimited.args | 2 +-
tests/qemuxml2argvdata/memtune.args | 2 +-
.../migrate-numa-unaligned.args | 2 +-
tests/qemuxml2argvdata/migrate.args | 2 +-
tests/qemuxml2argvdata/minimal.args | 2 +-
tests/qemuxml2argvdata/misc-acpi.args | 2 +-
tests/qemuxml2argvdata/misc-disable-s3.args | 2 +-
.../misc-disable-suspends.args | 2 +-
tests/qemuxml2argvdata/misc-enable-s4.args | 2 +-
tests/qemuxml2argvdata/misc-uuid.args | 2 +-
tests/qemuxml2argvdata/monitor-json.args | 2 +-
.../multifunction-pci-device.args | 2 +-
tests/qemuxml2argvdata/net-client.args | 2 +-
tests/qemuxml2argvdata/net-eth-hostip.args | 2 +-
tests/qemuxml2argvdata/net-eth-ifname.args | 2 +-
tests/qemuxml2argvdata/net-eth-names.args | 2 +-
.../net-eth-unmanaged-tap.args | 2 +-
tests/qemuxml2argvdata/net-eth.args | 2 +-
.../net-hostdev-bootorder.args | 2 +-
.../net-hostdev-multidomain.args | 2 +-
.../net-hostdev-vfio-multidomain.args | 2 +-
tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +-
tests/qemuxml2argvdata/net-hostdev.args | 2 +-
tests/qemuxml2argvdata/net-many-models.args | 2 +-
tests/qemuxml2argvdata/net-mcast.args | 2 +-
tests/qemuxml2argvdata/net-server.args | 2 +-
tests/qemuxml2argvdata/net-udp.args | 2 +-
tests/qemuxml2argvdata/net-user-addr.args | 2 +-
tests/qemuxml2argvdata/net-user.args | 2 +-
.../net-vhostuser-multiq.args | 2 +-
tests/qemuxml2argvdata/net-vhostuser.args | 2 +-
tests/qemuxml2argvdata/net-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/net-virtio-device.args | 2 +-
.../net-virtio-disable-offloads.args | 2 +-
tests/qemuxml2argvdata/net-virtio-netdev.args | 2 +-
.../net-virtio-rxtxqueuesize.args | 2 +-
.../net-virtio-teaming-hostdev.args | 2 +-
.../qemuxml2argvdata/net-virtio-teaming.args | 2 +-
tests/qemuxml2argvdata/net-virtio.args | 2 +-
tests/qemuxml2argvdata/nosharepages.args | 2 +-
.../numad-auto-memory-vcpu-cpuset.args | 2 +-
...o-memory-vcpu-no-cpuset-and-placement.args | 2 +-
.../numad-auto-vcpu-static-numatune.args | 2 +-
.../numad-static-memory-auto-vcpu.args | 2 +-
tests/qemuxml2argvdata/numad.args | 2 +-
.../numatune-auto-nodeset-invalid.args | 2 +-
.../numatune-auto-prefer.args | 2 +-
.../qemuxml2argvdata/numatune-distances.args | 2 +-
.../numatune-memnode-no-memory.args | 2 +-
tests/qemuxml2argvdata/numatune-memnode.args | 2 +-
tests/qemuxml2argvdata/numatune-memory.args | 2 +-
tests/qemuxml2argvdata/numatune-no-vcpu.args | 2 +-
.../qemuxml2argvdata/pages-dimm-discard.args | 2 +-
.../pages-discard-hugepages.args | 2 +-
tests/qemuxml2argvdata/pages-discard.args | 2 +-
.../parallel-parport-chardev.args | 2 +-
.../parallel-tcp-chardev.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +-
tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +-
.../pci-bridge-many-disks.args | 2 +-
tests/qemuxml2argvdata/pci-bridge.args | 4 +-
tests/qemuxml2argvdata/pci-expander-bus.args | 2 +-
tests/qemuxml2argvdata/pci-many.args | 2 +-
tests/qemuxml2argvdata/pci-rom-disabled.args | 2 +-
tests/qemuxml2argvdata/pci-rom.args | 2 +-
.../pci-serial-dev-chardev.args | 2 +-
tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +-
.../pcie-root-port-model-generic.args | 2 +-
.../pcie-root-port-model-ioh3420.args | 2 +-
tests/qemuxml2argvdata/pcie-root-port.args | 2 +-
tests/qemuxml2argvdata/pcie-root.args | 2 +-
.../pcie-switch-downstream-port.args | 2 +-
.../pcie-switch-upstream-port.args | 2 +-
tests/qemuxml2argvdata/pcihole64-q35.args | 2 +-
tests/qemuxml2argvdata/pcihole64.args | 2 +-
tests/qemuxml2argvdata/pmu-feature-off.args | 2 +-
tests/qemuxml2argvdata/pmu-feature.args | 2 +-
tests/qemuxml2argvdata/ppc-dtb.args | 2 +-
.../ppc64-usb-controller-legacy.args | 2 +-
.../ppc64-usb-controller-qemu-xhci.args | 2 +-
.../ppc64-usb-controller.args | 2 +-
tests/qemuxml2argvdata/ppce500-serial.args | 2 +-
tests/qemuxml2argvdata/pseries-basic.args | 2 +-
.../pseries-console-virtio.args | 2 +-
.../qemuxml2argvdata/pseries-cpu-compat.args | 2 +-
tests/qemuxml2argvdata/pseries-cpu-exact.args | 2 +-
tests/qemuxml2argvdata/pseries-cpu-le.args | 2 +-
tests/qemuxml2argvdata/pseries-features.args | 2 +-
.../qemuxml2argvdata/pseries-hostdevs-1.args | 2 +-
.../qemuxml2argvdata/pseries-hostdevs-2.args | 2 +-
.../qemuxml2argvdata/pseries-hostdevs-3.args | 2 +-
.../pseries-many-buses-1.args | 2 +-
.../pseries-many-buses-2.args | 2 +-
.../pseries-many-devices.args | 2 +-
tests/qemuxml2argvdata/pseries-nvram.args | 2 +-
.../pseries-panic-missing.args | 2 +-
.../pseries-panic-no-address.args | 2 +-
.../pseries-phb-default-missing.args | 2 +-
.../pseries-phb-numa-node.args | 2 +-
.../qemuxml2argvdata/pseries-phb-simple.args | 2 +-
.../pseries-serial-native.args | 2 +-
.../qemuxml2argvdata/pseries-serial-pci.args | 2 +-
.../qemuxml2argvdata/pseries-serial-usb.args | 2 +-
.../qemuxml2argvdata/pseries-usb-default.args | 2 +-
tests/qemuxml2argvdata/pseries-usb-kbd.args | 2 +-
tests/qemuxml2argvdata/pseries-usb-multi.args | 2 +-
.../pseries-vio-user-assigned.args | 2 +-
tests/qemuxml2argvdata/pseries-vio.args | 2 +-
.../q35-default-devices-only.args | 2 +-
tests/qemuxml2argvdata/q35-multifunction.args | 2 +-
.../q35-pci-force-address.args | 4 +-
tests/qemuxml2argvdata/q35-pcie-autoadd.args | 2 +-
tests/qemuxml2argvdata/q35-pcie.args | 2 +-
.../q35-pm-disable-fallback.args | 2 +-
tests/qemuxml2argvdata/q35-pm-disable.args | 2 +-
tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +-
tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +-
tests/qemuxml2argvdata/q35-usb2.args | 2 +-
.../q35-virt-manager-basic.args | 4 +-
tests/qemuxml2argvdata/q35-virtio-pci.args | 2 +-
tests/qemuxml2argvdata/q35.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +-
.../qemu-ns-commandline-ns0.args | 2 +-
.../qemu-ns-commandline-ns1.args | 2 +-
.../qemuxml2argvdata/qemu-ns-commandline.args | 2 +-
.../qemu-ns-domain-commandline-ns0.args | 2 +-
.../qemu-ns-domain-commandline.args | 2 +-
.../qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-no-env.args | 2 +-
.../reboot-timeout-disabled.args | 2 +-
.../reboot-timeout-enabled.args | 2 +-
tests/qemuxml2argvdata/restore-v2-fd.args | 2 +-
tests/qemuxml2argvdata/restore-v2.args | 2 +-
tests/qemuxml2argvdata/riscv64-virt-pci.args | 2 +-
tests/qemuxml2argvdata/riscv64-virt.args | 2 +-
.../qemuxml2argvdata/s390-panic-missing.args | 2 +-
.../s390-panic-no-address.args | 2 +-
tests/qemuxml2argvdata/s390-serial-2.args | 2 +-
.../qemuxml2argvdata/s390-serial-console.args | 2 +-
tests/qemuxml2argvdata/s390-serial.args | 2 +-
tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +-
.../seclabel-dynamic-baselabel.args | 2 +-
.../seclabel-dynamic-labelskip.args | 2 +-
.../seclabel-dynamic-override.args | 2 +-
.../seclabel-dynamic-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +-
tests/qemuxml2argvdata/seclabel-none.args | 2 +-
.../seclabel-static-labelskip.args | 2 +-
.../seclabel-static-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-static.args | 2 +-
.../serial-dev-chardev-iobase.args | 2 +-
.../qemuxml2argvdata/serial-dev-chardev.args | 2 +-
.../qemuxml2argvdata/serial-file-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-file-log.args | 2 +-
.../qemuxml2argvdata/serial-many-chardev.args | 2 +-
.../qemuxml2argvdata/serial-pty-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-spiceport.args | 2 +-
.../qemuxml2argvdata/serial-tcp-chardev.args | 2 +-
.../serial-tcp-telnet-chardev.args | 2 +-
.../serial-tcp-tlsx509-chardev-notls.args | 2 +-
.../serial-tcp-tlsx509-chardev-verify.args | 2 +-
.../serial-tcp-tlsx509-chardev.args | 2 +-
.../serial-tcp-tlsx509-secret-chardev.args | 2 +-
.../qemuxml2argvdata/serial-udp-chardev.args | 2 +-
.../qemuxml2argvdata/serial-unix-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +-
.../shmem-plain-doorbell.args | 2 +-
tests/qemuxml2argvdata/shmem.args | 2 +-
.../smartcard-controller.args | 2 +-
.../smartcard-host-certificates-database.args | 2 +-
.../smartcard-host-certificates.args | 2 +-
tests/qemuxml2argvdata/smartcard-host.args | 2 +-
.../smartcard-passthrough-spicevmc.args | 2 +-
.../smartcard-passthrough-tcp.args | 2 +-
tests/qemuxml2argvdata/smbios-type-fwcfg.args | 2 +-
tests/qemuxml2argvdata/smbios.args | 2 +-
tests/qemuxml2argvdata/smp-dies.args | 2 +-
tests/qemuxml2argvdata/smp.args | 2 +-
tests/qemuxml2argvdata/sound-device.args | 26 +-
tests/qemuxml2argvdata/sound.args | 8 +-
tests/qemuxml2argvdata/sparc-minimal.args | 2 +-
.../usb-controller-default-q35.args | 2 +-
.../usb-controller-explicit-q35.args | 2 +-
.../usb-controller-qemu-xhci.args | 2 +-
.../qemuxml2argvdata/usb-controller-xhci.args | 2 +-
tests/qemuxml2argvdata/usb-controller.args | 2 +-
.../usb-hub-autoadd-deluxe.args | 2 +-
tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +-
tests/qemuxml2argvdata/usb-hub.args | 2 +-
.../qemuxml2argvdata/usb-ich9-autoassign.args | 2 +-
.../qemuxml2argvdata/usb-ich9-companion.args | 2 +-
.../qemuxml2argvdata/usb-ich9-ehci-addr.args | 2 +-
.../qemuxml2argvdata/usb-long-port-path.args | 2 +-
tests/qemuxml2argvdata/usb-none.args | 2 +-
.../usb-piix3-controller.args | 2 +-
.../qemuxml2argvdata/usb-port-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb-port-missing.args | 2 +-
tests/qemuxml2argvdata/usb-ports.args | 2 +-
tests/qemuxml2argvdata/usb-redir-boot.args | 2 +-
.../usb-redir-filter-version.args | 2 +-
tests/qemuxml2argvdata/usb-redir-filter.args | 2 +-
tests/qemuxml2argvdata/usb-redir.args | 2 +-
.../qemuxml2argvdata/usb-xhci-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb1-usb2.args | 2 +-
tests/qemuxml2argvdata/user-aliases-usb.args | 2 +-
tests/qemuxml2argvdata/user-aliases.args | 6 +-
.../vcpu-placement-static.args | 2 +-
.../video-device-pciaddr-default.args | 4 +-
tests/qemuxml2argvdata/video-none-device.args | 4 +-
.../video-qxl-device-vgamem.args | 2 +-
tests/qemuxml2argvdata/video-qxl-device.args | 2 +-
tests/qemuxml2argvdata/video-qxl-heads.args | 2 +-
tests/qemuxml2argvdata/video-qxl-noheads.args | 2 +-
.../video-qxl-resolution.args | 2 +-
.../video-qxl-sec-device-vgamem.args | 2 +-
.../video-qxl-sec-device.args | 2 +-
.../video-vga-device-vgamem.args | 2 +-
tests/qemuxml2argvdata/video-vga-device.args | 2 +-
.../qemuxml2argvdata/video-vga-qxl-heads.args | 2 +-
.../video-virtio-gpu-ccw.args | 4 +-
.../video-virtio-gpu-device.args | 2 +-
.../video-virtio-gpu-secondary.args | 2 +-
.../video-virtio-gpu-spice-gl.args | 2 +-
.../video-virtio-gpu-virgl.args | 2 +-
tests/qemuxml2argvdata/video-virtio-vga.args | 2 +-
.../virtio-input-passthrough.args | 2 +-
tests/qemuxml2argvdata/virtio-input.args | 2 +-
.../virtio-non-transitional.x86_64-3.1.0.args | 53 -
tests/qemuxml2argvdata/virtio-rng-ccw.args | 2 +-
.../qemuxml2argvdata/virtio-rng-default.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-egd.args | 2 +-
.../qemuxml2argvdata/virtio-rng-multiple.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-random.args | 2 +-
.../virtio-transitional.x86_64-3.1.0.args | 46 -
tests/qemuxml2argvdata/vmcoreinfo.args | 2 +-
.../x86-kvm-32-on-64.x86_64-4.1.0.args | 31 -
tests/qemuxml2argvtest.c | 93 +-
.../x86-kvm-32-on-64.x86_64-4.1.0.xml | 24 -
tests/qemuxml2xmltest.c | 21 +-
590 files changed, 495 insertions(+), 218552 deletions(-)
delete mode 100644 tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.1.0.ppc64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.1.0.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0.aarch64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0.ppc64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0.s390x.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.1.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
delete mode 100644 tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args
delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-source-pool.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-transient.x86_64-4.1.0.err
delete mode 100644
tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/encrypted-disk.x86_64-4.1.0.args
delete mode 100644
tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/luks-disks-source.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/luks-disks.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-4.1.0.xml
--
2.36.1
6:44 a.m.
New subject: [PATCH 01/20] qemuxml2(argv|xml)test: Remove 'qemu-4.1' variant of 'x86-kvm-32-on-64'
Upcoming patches will bump minimum qemu version to 4.2. In this case we
the 'latest' case is suffuicient as with qemu-4.2 we already behave as
upstream ('qemu64' cpu is used instead of 'qemu32').
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../x86-kvm-32-on-64.x86_64-4.1.0.args | 31 -------------------
tests/qemuxml2argvtest.c | 1 -
.../x86-kvm-32-on-64.x86_64-4.1.0.xml | 24 --------------
tests/qemuxml2xmltest.c | 1 -
4 files changed, 57 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-4.1.0.xml
diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-4.1.0.args
b/tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-4.1.0.args
deleted file mode 100644
index 8e9012e7a8..0000000000
--- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-4.1.0.args
+++ /dev/null
@@ -1,31 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-kvm \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-kvm/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-kvm/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-kvm/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=kvm,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-kvm/master-key.aes \
--machine pc-i440fx-4.1,usb=off,dump-guest-core=off \
--accel kvm \
--cpu qemu32 \
--m 4096 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 5b40a0d7f5..78b89ee91a 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1074,7 +1074,6 @@ mymain(void)
QEMU_CAPS_MACHINE_VMPORT_OPT);
DO_TEST_NOCAPS("default-kvm-host-arch");
DO_TEST_NOCAPS("default-qemu-host-arch");
- DO_TEST_CAPS_VER("x86-kvm-32-on-64", "4.1.0");
DO_TEST_CAPS_LATEST("x86-kvm-32-on-64");
DO_TEST_NOCAPS("boot-cdrom");
DO_TEST_NOCAPS("boot-network");
diff --git a/tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-4.1.0.xml
b/tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-4.1.0.xml
deleted file mode 100644
index 934ec8ef07..0000000000
--- a/tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-4.1.0.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<domain type='kvm'>
- <name>kvm</name>
- <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
- <memory unit='KiB'>4194304</memory>
- <currentMemory unit='KiB'>4194304</currentMemory>
- <vcpu placement='static'>1</vcpu>
- <os>
- <type arch='i686' machine='pc-i440fx-4.1'>hvm</type>
- <boot dev='hd'/>
- </os>
- <clock offset='utc'/>
- <on_poweroff>destroy</on_poweroff>
- <on_reboot>restart</on_reboot>
- <on_crash>destroy</on_crash>
- <devices>
- <emulator>/usr/bin/qemu-system-x86_64</emulator>
- <controller type='usb' index='0' model='none'/>
- <controller type='pci' index='0' model='pci-root'/>
- <input type='mouse' bus='ps2'/>
- <input type='keyboard' bus='ps2'/>
- <audio id='1' type='none'/>
- <memballoon model='none'/>
- </devices>
-</domain>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 58929b68c1..4eabefada0 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1331,7 +1331,6 @@ mymain(void)
DO_TEST("riscv64-virt-pci",
QEMU_CAPS_OBJECT_GPEX);
- DO_TEST_CAPS_VER("x86-kvm-32-on-64", "4.1.0");
DO_TEST_CAPS_LATEST("x86-kvm-32-on-64");
DO_TEST_CAPS_LATEST("virtio-transitional");
--
2.36.1
6:03 p.m.
New subject: [PATCH 01/20] qemuxml2(argv|xml)test: Remove 'qemu-4.1' variant of 'x86-kvm-32-on-64'
On a Friday in 2022, Peter Krempa wrote:
Upcoming patches will bump minimum qemu version to 4.2. In this case
we
the 'latest' case is suffuicient as with qemu-4.2 we already behave as
*sufficient
upstream ('qemu64' cpu is used instead of 'qemu32').
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../x86-kvm-32-on-64.x86_64-4.1.0.args | 31 -------------------
tests/qemuxml2argvtest.c | 1 -
.../x86-kvm-32-on-64.x86_64-4.1.0.xml | 24 --------------
tests/qemuxml2xmltest.c | 1 -
4 files changed, 57 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-4.1.0.xml
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:44 a.m.
New subject: [PATCH 02/20] tests: qemuxml2argv: Remove pre-blockdev versions of disk-related tests
Upcoming patches will bump minimum supported qemu version to 4.2 which
will use '-blockdev' with qemu so we can drop all the old test cases for
pre-blockdev configs.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../blkdeviotune-group-num.x86_64-4.1.0.args | 37 --------------
.../blkdeviotune-max-length.x86_64-4.1.0.args | 37 --------------
.../blkdeviotune-max.x86_64-4.1.0.args | 37 --------------
.../disk-aio.x86_64-4.1.0.args | 36 -------------
.../disk-arm-virtio-sd.aarch64-4.0.0.args | 38 --------------
...isk-backing-chains-index.x86_64-4.1.0.args | 45 ----------------
...k-backing-chains-noindex.x86_64-4.1.0.args | 1 -
.../disk-cache.x86_64-3.1.0.args | 42 ---------------
.../disk-cache.x86_64-4.1.0.args | 42 ---------------
.../disk-cdrom-network.x86_64-4.1.0.args | 39 --------------
.../disk-cdrom-tray.x86_64-4.1.0.args | 38 --------------
.../disk-cdrom.x86_64-4.1.0.args | 39 --------------
.../disk-copy_on_read.x86_64-4.1.0.args | 39 --------------
.../disk-detect-zeroes.x86_64-4.1.0.args | 37 --------------
.../disk-discard.x86_64-4.1.0.args | 36 -------------
.../disk-error-policy-s390x.s390x-4.0.0.args | 35 -------------
.../disk-error-policy.x86_64-4.1.0.args | 37 --------------
.../disk-floppy-q35.x86_64-4.1.0.args | 36 -------------
.../disk-floppy.x86_64-4.1.0.args | 37 --------------
.../disk-fmt-qcow.x86_64-4.1.0.args | 35 -------------
.../disk-network-gluster.x86_64-4.1.0.args | 37 --------------
.../disk-network-iscsi.x86_64-4.1.0.args | 49 ------------------
.../disk-network-nbd.x86_64-4.1.0.args | 41 ---------------
...disk-network-rbd-no-colon.x86_64-4.1.0.err | 1 -
.../disk-network-rbd.x86_64-4.1.0.args | 44 ----------------
.../disk-network-sheepdog.x86_64-4.1.0.args | 35 -------------
...disk-network-source-auth.x86_64-4.1.0.args | 40 ---------------
...disk-network-tlsx509-nbd.x86_64-4.1.0.args | 35 -------------
...isk-network-tlsx509-vxhs.x86_64-4.1.0.args | 41 ---------------
.../disk-readonly-disk.x86_64-4.1.0.args | 36 -------------
.../disk-shared.x86_64-3.1.0.args | 41 ---------------
.../disk-shared.x86_64-4.1.0.args | 41 ---------------
.../disk-source-pool-mode.x86_64-4.1.0.args | 40 ---------------
.../disk-source-pool.x86_64-4.1.0.args | 42 ---------------
.../disk-transient.x86_64-4.1.0.err | 1 -
...virtio-scsi-reservations.x86_64-4.1.0.args | 39 --------------
.../encrypted-disk-usage.x86_64-4.1.0.args | 35 -------------
.../encrypted-disk.x86_64-4.1.0.args | 35 -------------
...l-efi-nvram-network-iscsi.x86_64-4.1.0.err | 1 -
.../floppy-drive-fat.x86_64-4.1.0.args | 35 -------------
.../hostdev-scsi-lsi.x86_64-4.1.0.args | 49 ------------------
...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 51 -------------------
.../luks-disks-source.x86_64-4.1.0.args | 48 -----------------
.../luks-disks.x86_64-4.1.0.args | 39 --------------
tests/qemuxml2argvtest.c | 45 ----------------
45 files changed, 1624 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args
delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-source-pool.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-transient.x86_64-4.1.0.err
delete mode 100644
tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/encrypted-disk.x86_64-4.1.0.args
delete mode 100644
tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/luks-disks-source.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/luks-disks.x86_64-4.1.0.args
Truncated all the file deletions.
[...]
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 78b89ee91a..b801bd43d8 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1202,7 +1202,6 @@ mymain(void)
QEMU_CAPS_VIRTIO_SCSI);
DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-template");
DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-iscsi");
- DO_TEST_CAPS_VER_PARSE_ERROR("firmware-manual-efi-nvram-network-iscsi",
"4.1.0");
DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-nbd");
DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-file");
@@ -1335,18 +1334,12 @@ mymain(void)
DO_TEST_PARSE_ERROR("non-x86_64-timer-error", QEMU_CAPS_CCW);
- /* qemu-4.1 was the last qemu version which we didn't use -blockdev with */
- DO_TEST_CAPS_VER("disk-cdrom", "4.1.0");
DO_TEST_CAPS_LATEST("disk-cdrom");
DO_TEST_CAPS_LATEST("disk-cdrom-empty-network-invalid");
DO_TEST_CAPS_LATEST("disk-cdrom-bus-other");
- DO_TEST_CAPS_VER("disk-cdrom-network", "4.1.0");
DO_TEST_CAPS_LATEST("disk-cdrom-network");
- DO_TEST_CAPS_VER("disk-cdrom-tray", "4.1.0");
DO_TEST_CAPS_LATEST("disk-cdrom-tray");
- DO_TEST_CAPS_VER("disk-floppy", "4.1.0");
DO_TEST_CAPS_LATEST("disk-floppy");
- DO_TEST_CAPS_VER("disk-floppy-q35", "4.1.0");
DO_TEST_CAPS_LATEST("disk-floppy-q35");
DO_TEST_CAPS_ARCH_LATEST_FAILURE("disk-floppy-pseries",
"ppc64");
DO_TEST_CAPS_LATEST("disk-floppy-tray");
@@ -1358,57 +1351,38 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-virtio-queues");
DO_TEST_CAPS_LATEST("disk-boot-disk");
DO_TEST_CAPS_LATEST("disk-boot-cdrom");
- DO_TEST_CAPS_VER("floppy-drive-fat", "4.1.0");
DO_TEST_CAPS_LATEST("floppy-drive-fat");
- DO_TEST_CAPS_VER("disk-readonly-disk", "4.1.0");
DO_TEST_CAPS_LATEST("disk-readonly-disk");
- DO_TEST_CAPS_VER("disk-fmt-qcow", "4.1.0");
DO_TEST_CAPS_LATEST("disk-fmt-qcow");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-cow");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-dir");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-fmt-iso");
- DO_TEST_CAPS_VER("disk-shared", "3.1.0");
- DO_TEST_CAPS_VER("disk-shared", "4.1.0");
DO_TEST_CAPS_LATEST("disk-shared");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-shared-qcow");
- DO_TEST_CAPS_VER("disk-error-policy", "4.1.0");
DO_TEST_CAPS_LATEST("disk-error-policy");
- DO_TEST_CAPS_ARCH_VER("disk-error-policy-s390x", "s390x",
"4.0.0");
DO_TEST_CAPS_ARCH_LATEST("disk-error-policy-s390x", "s390x");
- DO_TEST_CAPS_VER("disk-cache", "3.1.0");
- DO_TEST_CAPS_VER("disk-cache", "4.1.0");
DO_TEST_CAPS_LATEST("disk-cache");
DO_TEST_CAPS_LATEST("disk-metadata-cache");
- DO_TEST_CAPS_ARCH_VER_PARSE_ERROR("disk-transient", "x86_64",
"4.1.0");
DO_TEST_CAPS_LATEST("disk-transient");
- DO_TEST_CAPS_VER("disk-network-nbd", "4.1.0");
DO_TEST_CAPS_LATEST("disk-network-nbd");
- DO_TEST_CAPS_VER("disk-network-iscsi", "4.1.0");
DO_TEST_CAPS_LATEST("disk-network-iscsi");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-secrettype-invalid");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-iscsi-auth-wrong-secrettype");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-network-source-auth-both");
- DO_TEST_CAPS_VER("disk-network-gluster", "4.1.0");
DO_TEST_CAPS_LATEST("disk-network-gluster");
- DO_TEST_CAPS_VER("disk-network-rbd", "4.1.0");
DO_TEST_CAPS_LATEST("disk-network-rbd");
DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-rbd-encryption",
"6.0.0");
DO_TEST_CAPS_LATEST("disk-network-rbd-encryption");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-encryption-wrong");
- DO_TEST_CAPS_VER_FAILURE("disk-network-rbd-no-colon", "4.1.0");
DO_TEST_CAPS_LATEST("disk-network-rbd-no-colon");
- DO_TEST_CAPS_VER("disk-network-sheepdog", "4.1.0");
/* qemu-6.0 is the last qemu version supporting sheepdog */
DO_TEST_CAPS_VER("disk-network-sheepdog", "6.0.0");
- DO_TEST_CAPS_VER("disk-network-source-auth", "4.1.0");
DO_TEST_CAPS_LATEST("disk-network-source-auth");
DO_TEST_CAPS_LATEST("disk-network-nfs");
driver.config->vxhsTLS = 1;
driver.config->nbdTLSx509secretUUID =
g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea");
driver.config->vxhsTLSx509secretUUID =
g_strdup("6fd3f62d-9fe7-4a4e-a869-7acd6376d8ea");
- DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "4.1.0");
DO_TEST_CAPS_VER("disk-network-tlsx509-nbd", "5.2.0");
- DO_TEST_CAPS_VER("disk-network-tlsx509-vxhs", "4.1.0");
DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd");
DO_TEST_CAPS_VER_PARSE_ERROR("disk-network-tlsx509-nbd-hostname",
"6.2.0");
DO_TEST_CAPS_LATEST("disk-network-tlsx509-nbd-hostname");
@@ -1434,19 +1408,13 @@ mymain(void)
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-disk-vpd-build-error");
DO_TEST_CAPS_LATEST("controller-virtio-scsi");
DO_TEST_CAPS_LATEST("disk-sata-device");
- DO_TEST_CAPS_VER("disk-aio", "4.1.0");
DO_TEST_CAPS_LATEST("disk-aio");
DO_TEST_CAPS_LATEST("disk-aio-io_uring");
- DO_TEST_CAPS_VER("disk-source-pool", "4.1.0");
DO_TEST_CAPS_LATEST("disk-source-pool");
- DO_TEST_CAPS_VER("disk-source-pool-mode", "4.1.0");
DO_TEST_CAPS_LATEST("disk-source-pool-mode");
DO_TEST_CAPS_LATEST("disk-ioeventfd");
- DO_TEST_CAPS_VER("disk-copy_on_read", "4.1.0");
DO_TEST_CAPS_LATEST("disk-copy_on_read");
- DO_TEST_CAPS_VER("disk-discard", "4.1.0");
DO_TEST_CAPS_LATEST("disk-discard");
- DO_TEST_CAPS_VER("disk-detect-zeroes", "4.1.0");
DO_TEST_CAPS_LATEST("disk-detect-zeroes");
DO_TEST_CAPS_LATEST("disk-snapshot");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-same-targets");
@@ -1462,24 +1430,17 @@ mymain(void)
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-ide-incompatible-address");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-sata-incompatible-address");
DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-scsi-incompatible-address");
- DO_TEST_CAPS_VER("disk-backing-chains-index", "4.1.0");
DO_TEST_CAPS_LATEST("disk-backing-chains-index");
- DO_TEST_CAPS_VER("disk-backing-chains-noindex", "4.1.0");
DO_TEST_CAPS_LATEST("disk-backing-chains-noindex");
DO_TEST_CAPS_LATEST("disk-slices");
DO_TEST_CAPS_LATEST("disk-rotation");
- DO_TEST_CAPS_ARCH_VER("disk-arm-virtio-sd", "aarch64",
"4.0.0");
DO_TEST_CAPS_ARCH_LATEST("disk-arm-virtio-sd", "aarch64");
- DO_TEST_CAPS_VER("encrypted-disk", "4.1.0");
DO_TEST_CAPS_LATEST("encrypted-disk");
- DO_TEST_CAPS_VER("encrypted-disk-usage", "4.1.0");
DO_TEST_CAPS_LATEST("encrypted-disk-usage");
- DO_TEST_CAPS_VER("luks-disks", "4.1.0");
DO_TEST_CAPS_LATEST("luks-disks");
- DO_TEST_CAPS_VER("luks-disks-source", "4.1.0");
DO_TEST_CAPS_LATEST("luks-disks-source");
DO_TEST_CAPS_VER("luks-disks-source-qcow2", "5.2.0");
DO_TEST_CAPS_LATEST("luks-disks-source-qcow2");
@@ -1491,7 +1452,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("disk-geometry");
DO_TEST_CAPS_LATEST("disk-blockio");
- DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "4.1.0");
DO_TEST_CAPS_VER("disk-virtio-scsi-reservations", "5.2.0");
DO_TEST_CAPS_LATEST("disk-virtio-scsi-reservations");
@@ -2179,11 +2139,8 @@ mymain(void)
DO_TEST_NOCAPS("numad-auto-memory-vcpu-no-cpuset-and-placement");
DO_TEST_NOCAPS("numad-static-memory-auto-vcpu");
DO_TEST_CAPS_LATEST("blkdeviotune");
- DO_TEST_CAPS_VER("blkdeviotune-max", "4.1.0");
DO_TEST_CAPS_LATEST("blkdeviotune-max");
- DO_TEST_CAPS_VER("blkdeviotune-group-num", "4.1.0");
DO_TEST_CAPS_LATEST("blkdeviotune-group-num");
- DO_TEST_CAPS_VER("blkdeviotune-max-length", "4.1.0");
DO_TEST_CAPS_LATEST("blkdeviotune-max-length");
DO_TEST("multifunction-pci-device",
@@ -2834,9 +2791,7 @@ mymain(void)
QEMU_CAPS_DEVICE_PXB_PCIE);
DO_TEST_CAPS_ARCH_LATEST("pcie-expander-bus-aarch64",
"aarch64");
- DO_TEST_CAPS_VER("hostdev-scsi-lsi", "4.1.0");
DO_TEST_CAPS_LATEST("hostdev-scsi-lsi");
- DO_TEST_CAPS_VER("hostdev-scsi-virtio-scsi", "4.1.0");
DO_TEST_CAPS_LATEST("hostdev-scsi-virtio-scsi");
DO_TEST("hostdev-scsi-vhost-scsi-ccw",
--
2.36.1
6:04 p.m.
New subject: [PATCH 02/20] tests: qemuxml2argv: Remove pre-blockdev versions of disk-related tests
On a Friday in 2022, Peter Krempa wrote:
Upcoming patches will bump minimum supported qemu version to 4.2
which
will use '-blockdev' with qemu so we can drop all the old test cases for
pre-blockdev configs.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../blkdeviotune-group-num.x86_64-4.1.0.args | 37 --------------
.../blkdeviotune-max-length.x86_64-4.1.0.args | 37 --------------
.../blkdeviotune-max.x86_64-4.1.0.args | 37 --------------
.../disk-aio.x86_64-4.1.0.args | 36 -------------
.../disk-arm-virtio-sd.aarch64-4.0.0.args | 38 --------------
...isk-backing-chains-index.x86_64-4.1.0.args | 45 ----------------
...k-backing-chains-noindex.x86_64-4.1.0.args | 1 -
.../disk-cache.x86_64-3.1.0.args | 42 ---------------
.../disk-cache.x86_64-4.1.0.args | 42 ---------------
.../disk-cdrom-network.x86_64-4.1.0.args | 39 --------------
.../disk-cdrom-tray.x86_64-4.1.0.args | 38 --------------
.../disk-cdrom.x86_64-4.1.0.args | 39 --------------
.../disk-copy_on_read.x86_64-4.1.0.args | 39 --------------
.../disk-detect-zeroes.x86_64-4.1.0.args | 37 --------------
.../disk-discard.x86_64-4.1.0.args | 36 -------------
.../disk-error-policy-s390x.s390x-4.0.0.args | 35 -------------
.../disk-error-policy.x86_64-4.1.0.args | 37 --------------
.../disk-floppy-q35.x86_64-4.1.0.args | 36 -------------
.../disk-floppy.x86_64-4.1.0.args | 37 --------------
.../disk-fmt-qcow.x86_64-4.1.0.args | 35 -------------
.../disk-network-gluster.x86_64-4.1.0.args | 37 --------------
.../disk-network-iscsi.x86_64-4.1.0.args | 49 ------------------
.../disk-network-nbd.x86_64-4.1.0.args | 41 ---------------
...disk-network-rbd-no-colon.x86_64-4.1.0.err | 1 -
.../disk-network-rbd.x86_64-4.1.0.args | 44 ----------------
.../disk-network-sheepdog.x86_64-4.1.0.args | 35 -------------
...disk-network-source-auth.x86_64-4.1.0.args | 40 ---------------
...disk-network-tlsx509-nbd.x86_64-4.1.0.args | 35 -------------
...isk-network-tlsx509-vxhs.x86_64-4.1.0.args | 41 ---------------
.../disk-readonly-disk.x86_64-4.1.0.args | 36 -------------
.../disk-shared.x86_64-3.1.0.args | 41 ---------------
.../disk-shared.x86_64-4.1.0.args | 41 ---------------
.../disk-source-pool-mode.x86_64-4.1.0.args | 40 ---------------
.../disk-source-pool.x86_64-4.1.0.args | 42 ---------------
.../disk-transient.x86_64-4.1.0.err | 1 -
...virtio-scsi-reservations.x86_64-4.1.0.args | 39 --------------
.../encrypted-disk-usage.x86_64-4.1.0.args | 35 -------------
.../encrypted-disk.x86_64-4.1.0.args | 35 -------------
...l-efi-nvram-network-iscsi.x86_64-4.1.0.err | 1 -
.../floppy-drive-fat.x86_64-4.1.0.args | 35 -------------
.../hostdev-scsi-lsi.x86_64-4.1.0.args | 49 ------------------
...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 51 -------------------
.../luks-disks-source.x86_64-4.1.0.args | 48 -----------------
.../luks-disks.x86_64-4.1.0.args | 39 --------------
tests/qemuxml2argvtest.c | 45 ----------------
45 files changed, 1624 deletions(-)
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:44 a.m.
New subject: [PATCH 03/20] qemuxml2argvtest: Drop 'qemu-4.1' variants of all audio tests
Minimum qemu version will be bumped to qemu-4.2 so we no longer need to
care about configuring audiodevs via the environment variables.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../audio-alsa-best.x86_64-4.1.0.args | 46 -----------------
.../audio-alsa-full.x86_64-4.1.0.err | 1 -
.../audio-alsa-minimal.x86_64-4.1.0.args | 33 -------------
.../audio-coreaudio-best.x86_64-4.1.0.args | 46 -----------------
.../audio-coreaudio-full.x86_64-4.1.0.err | 1 -
.../audio-coreaudio-minimal.x86_64-4.1.0.args | 33 -------------
...audio-default-nographics.x86_64-4.1.0.args | 33 -------------
.../audio-file-best.x86_64-4.1.0.args | 45 -----------------
.../audio-file-full.x86_64-4.1.0.err | 1 -
.../audio-file-minimal.x86_64-4.1.0.args | 33 -------------
.../audio-jack-full.x86_64-4.1.0.err | 1 -
.../audio-jack-minimal.x86_64-4.1.0.err | 1 -
.../audio-many-backends.x86_64-4.1.0.err | 1 -
.../audio-none-best.x86_64-4.1.0.args | 44 -----------------
.../audio-none-full.x86_64-4.1.0.err | 1 -
.../audio-none-minimal.x86_64-4.1.0.args | 33 -------------
.../audio-oss-best.x86_64-4.1.0.args | 49 -------------------
.../audio-oss-full.x86_64-4.1.0.err | 1 -
.../audio-oss-minimal.x86_64-4.1.0.args | 33 -------------
.../audio-pulseaudio-best.x86_64-4.1.0.args | 48 ------------------
.../audio-pulseaudio-full.x86_64-4.1.0.err | 1 -
...audio-pulseaudio-minimal.x86_64-4.1.0.args | 33 -------------
.../audio-sdl-best.x86_64-4.1.0.args | 46 -----------------
.../audio-sdl-full.x86_64-4.1.0.err | 1 -
.../audio-sdl-minimal.x86_64-4.1.0.args | 33 -------------
.../audio-spice-best.x86_64-4.1.0.args | 45 -----------------
.../audio-spice-full.x86_64-4.1.0.err | 1 -
.../audio-spice-minimal.x86_64-4.1.0.args | 34 -------------
tests/qemuxml2argvtest.c | 35 -------------
29 files changed, 713 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args
File deletions are truncated from the mail posting.
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index b801bd43d8..8d76472c0c 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1094,17 +1094,6 @@ mymain(void)
DO_TEST("boot-complex",
QEMU_CAPS_VIRTIO_BLK_SCSI);
- /* Simplest possible <audio>, all supported with ENV */
- DO_TEST_CAPS_VER("audio-none-minimal", "4.1.0");
- DO_TEST_CAPS_VER("audio-alsa-minimal", "4.1.0");
- DO_TEST_CAPS_VER("audio-coreaudio-minimal", "4.1.0");
- DO_TEST_CAPS_VER_PARSE_ERROR("audio-jack-minimal", "4.1.0");
- DO_TEST_CAPS_VER("audio-oss-minimal", "4.1.0");
- DO_TEST_CAPS_VER("audio-pulseaudio-minimal", "4.1.0");
- DO_TEST_CAPS_VER("audio-sdl-minimal", "4.1.0");
- DO_TEST_CAPS_VER("audio-spice-minimal", "4.1.0");
- DO_TEST_CAPS_VER("audio-file-minimal", "4.1.0");
-
DO_TEST_CAPS_LATEST("audio-none-minimal");
DO_TEST_CAPS_LATEST("audio-alsa-minimal");
DO_TEST_CAPS_LATEST("audio-coreaudio-minimal");
@@ -1115,16 +1104,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("audio-spice-minimal");
DO_TEST_CAPS_LATEST("audio-file-minimal");
- /* Best <audio> still compat with old ENV */
- DO_TEST_CAPS_VER("audio-none-best", "4.1.0");
- DO_TEST_CAPS_VER("audio-alsa-best", "4.1.0");
- DO_TEST_CAPS_VER("audio-coreaudio-best", "4.1.0");
- DO_TEST_CAPS_VER("audio-oss-best", "4.1.0");
- DO_TEST_CAPS_VER("audio-pulseaudio-best", "4.1.0");
- DO_TEST_CAPS_VER("audio-sdl-best", "4.1.0");
- DO_TEST_CAPS_VER("audio-spice-best", "4.1.0");
- DO_TEST_CAPS_VER("audio-file-best", "4.1.0");
-
DO_TEST_CAPS_LATEST("audio-none-best");
DO_TEST_CAPS_LATEST("audio-alsa-best");
DO_TEST_CAPS_LATEST("audio-coreaudio-best");
@@ -1134,17 +1113,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("audio-spice-best");
DO_TEST_CAPS_LATEST("audio-file-best");
- /* Full <audio> only compat with new QEMU -audiodev args */
- DO_TEST_CAPS_VER_PARSE_ERROR("audio-none-full", "4.1.0");
- DO_TEST_CAPS_VER_PARSE_ERROR("audio-alsa-full", "4.1.0");
- DO_TEST_CAPS_VER_PARSE_ERROR("audio-coreaudio-full", "4.1.0");
- DO_TEST_CAPS_VER_PARSE_ERROR("audio-jack-full", "4.1.0");
- DO_TEST_CAPS_VER_PARSE_ERROR("audio-oss-full", "4.1.0");
- DO_TEST_CAPS_VER_PARSE_ERROR("audio-pulseaudio-full", "4.1.0");
- DO_TEST_CAPS_VER_PARSE_ERROR("audio-sdl-full", "4.1.0");
- DO_TEST_CAPS_VER_PARSE_ERROR("audio-spice-full", "4.1.0");
- DO_TEST_CAPS_VER_PARSE_ERROR("audio-file-full", "4.1.0");
-
DO_TEST_CAPS_LATEST("audio-none-full");
DO_TEST_CAPS_LATEST("audio-alsa-full");
DO_TEST_CAPS_LATEST("audio-coreaudio-full");
@@ -1155,8 +1123,6 @@ mymain(void)
DO_TEST_CAPS_LATEST("audio-spice-full");
DO_TEST_CAPS_LATEST("audio-file-full");
- /* Multiple backends not supported with ENV */
- DO_TEST_CAPS_VER_PARSE_ERROR("audio-many-backends", "4.1.0");
DO_TEST_CAPS_LATEST("audio-many-backends");
/* Validate auto-creation of <audio> for legacy compat */
@@ -1179,7 +1145,6 @@ mymain(void)
g_setenv("QEMU_AUDIO_DRV", "alsa", TRUE);
driver.config->nogfxAllowHostAudio = true;
- DO_TEST_CAPS_VER("audio-default-nographics", "4.1.0");
DO_TEST_CAPS_LATEST("audio-default-nographics");
driver.config->nogfxAllowHostAudio = false;
g_unsetenv("QEMU_AUDIO_DRV");
--
2.36.1
6:44 a.m.
New subject: [PATCH 04/20] qemuxml2argvtest: Remove 'qemu-3.1' versions of virtio-(non-)transitional tests
Starting from qemu-4.0 a new device model name is used instead of the
'disable_*' props. Since we are going to bump to qemu-4.2 as minimum
this test can be removed.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../virtio-non-transitional.x86_64-3.1.0.args | 53 -------------------
.../virtio-transitional.x86_64-3.1.0.args | 46 ----------------
tests/qemuxml2argvtest.c | 3 --
3 files changed, 102 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
deleted file mode 100644
index 2d0e568bb0..0000000000
--- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
+++ /dev/null
@@ -1,53 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-q35-3.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
--device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
--device pcie-root-port,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
--device pcie-root-port,port=11,chassis=4,id=pci.4,bus=pcie.0,addr=0x1.0x3 \
--device pcie-root-port,port=12,chassis=5,id=pci.5,bus=pcie.0,addr=0x1.0x4 \
--device pcie-root-port,port=13,chassis=6,id=pci.6,bus=pcie.0,addr=0x1.0x5 \
--device pcie-root-port,port=14,chassis=7,id=pci.7,bus=pcie.0,addr=0x1.0x6 \
--device pcie-root-port,port=15,chassis=8,id=pci.8,bus=pcie.0,addr=0x1.0x7 \
--device pcie-root-port,port=16,chassis=9,id=pci.9,bus=pcie.0,multifunction=on,addr=0x2 \
--device pcie-root-port,port=17,chassis=10,id=pci.10,bus=pcie.0,addr=0x2.0x1 \
--device virtio-scsi-pci,disable-legacy=on,disable-modern=off,id=scsi0,bus=pci.4,addr=0x0
\
--device
virtio-serial-pci,disable-legacy=on,disable-modern=off,id=virtio-serial0,bus=pci.3,addr=0x0
\
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-pci,disable-legacy=on,disable-modern=off,scsi=off,bus=pci.5,addr=0x0,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1
\
--fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/fs1 \
--device
virtio-9p-pci,disable-legacy=on,disable-modern=off,id=fs0,fsdev=fsdev-fs0,mount_tag=fs1,bus=pci.1,addr=0x0
\
--netdev user,id=hostnet0 \
--device
virtio-net-pci,disable-legacy=on,disable-modern=off,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.2,addr=0x0
\
--device
vhost-scsi-pci,disable-legacy=on,disable-modern=off,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.6,addr=0x0
\
--device
virtio-balloon-pci,disable-legacy=on,disable-modern=off,id=balloon0,bus=pci.7,addr=0x0 \
--object rng-random,id=objrng0,filename=/dev/urandom \
--device
virtio-rng-pci,disable-legacy=on,disable-modern=off,rng=objrng0,id=rng0,bus=pci.8,addr=0x0
\
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--device
vhost-vsock-pci,disable-legacy=on,disable-modern=off,id=vsock0,guest-cid=4,vhostfd=6789,bus=pci.9,addr=0x0
\
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
deleted file mode 100644
index 83bb5d137d..0000000000
--- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
+++ /dev/null
@@ -1,46 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-q35-3.1,usb=off,dump-guest-core=off \
--accel tcg \
--m 214 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device pcie-root-port,port=8,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=9,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x1 \
--device virtio-scsi-pci,disable-legacy=off,disable-modern=off,id=scsi0,bus=pci.2,addr=0x4
\
--device
virtio-serial-pci,disable-legacy=off,disable-modern=off,id=virtio-serial0,bus=pci.2,addr=0x3
\
--drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-virtio-disk0 \
--device
virtio-blk-pci,disable-legacy=off,disable-modern=off,scsi=off,bus=pci.2,addr=0x5,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1
\
--fsdev local,security_model=passthrough,id=fsdev-fs0,path=/export/fs1 \
--device
virtio-9p-pci,disable-legacy=off,disable-modern=off,id=fs0,fsdev=fsdev-fs0,mount_tag=fs1,bus=pci.2,addr=0x1
\
--netdev user,id=hostnet0 \
--device
virtio-net-pci,disable-legacy=off,disable-modern=off,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.2,addr=0x2
\
--device
vhost-scsi-pci,disable-legacy=off,disable-modern=off,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.2,addr=0x6
\
--device
virtio-balloon-pci,disable-legacy=off,disable-modern=off,id=balloon0,bus=pci.2,addr=0x7 \
--object rng-random,id=objrng0,filename=/dev/urandom \
--device
virtio-rng-pci,disable-legacy=off,disable-modern=off,rng=objrng0,id=rng0,bus=pci.2,addr=0x8
\
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--device
vhost-vsock-pci,disable-legacy=off,disable-modern=off,id=vsock0,guest-cid=4,vhostfd=6789,bus=pci.2,addr=0x9
\
--msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 8d76472c0c..d65a18f8d4 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -3310,9 +3310,6 @@ mymain(void)
DO_TEST("riscv64-virt-pci",
QEMU_CAPS_OBJECT_GPEX);
- /* Older version checks disable-legacy usage */
- DO_TEST_CAPS_VER("virtio-transitional", "3.1.0");
- DO_TEST_CAPS_VER("virtio-non-transitional", "3.1.0");
DO_TEST_CAPS_LATEST("virtio-transitional");
DO_TEST_CAPS_LATEST("virtio-non-transitional");
DO_TEST_CAPS_LATEST_PARSE_ERROR("virtio-transitional-not-supported");
--
2.36.1
6:44 a.m.
New subject: [PATCH 05/20] qemuxml2argvtest: Remove pre-qemu-4.2 versions of 'cpu-host-model' test
Minimum qemu will be bumped to 4.2 so remove the older test cases.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../cpu-host-model.x86_64-3.1.0.args | 36 -------------------
.../cpu-host-model.x86_64-4.0.0.args | 36 -------------------
.../cpu-host-model.x86_64-4.1.0.args | 36 -------------------
tests/qemuxml2argvtest.c | 3 --
4 files changed, 111 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args
deleted file mode 100644
index f7e48be757..0000000000
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-q35-3.1,usb=off,dump-guest-core=off \
--accel kvm \
--cpu
Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,xsaves=on,pdpe1gb=on
\
--m 214 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
--device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
--device pcie-root-port,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
--device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args
deleted file mode 100644
index 4c7fcf8a31..0000000000
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-q35-4.0,usb=off,dump-guest-core=off \
--accel kvm \
--cpu
Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,ssbd=on,xsaves=on,pdpe1gb=on
\
--m 214 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
--device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
--device pcie-root-port,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
--device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args
b/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args
deleted file mode 100644
index 8e126568d0..0000000000
--- a/tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args
+++ /dev/null
@@ -1,36 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-q35-4.1,usb=off,dump-guest-core=off \
--accel kvm \
--cpu
Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,md-clear=on,stibp=on,arch-capabilities=on,ssbd=on,xsaves=on,pdpe1gb=on,skip-l1dfl-vmentry=on
\
--m 214 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--rtc base=utc \
--no-shutdown \
--no-acpi \
--boot strict=on \
--device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
--device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
--device pcie-root-port,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
--device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \
--device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index d65a18f8d4..3d5ded60d7 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2009,9 +2009,6 @@ mymain(void)
/* host-model cpu expansion depends on the cpu reported by qemu and thus
* we invoke it for all real capability dumps we have */
- DO_TEST_CAPS_VER("cpu-host-model", "3.1.0");
- DO_TEST_CAPS_VER("cpu-host-model", "4.0.0");
- DO_TEST_CAPS_VER("cpu-host-model", "4.1.0");
DO_TEST_CAPS_VER("cpu-host-model", "4.2.0");
DO_TEST_CAPS_VER("cpu-host-model", "5.0.0");
DO_TEST_CAPS_VER("cpu-host-model", "5.1.0");
--
2.36.1
6:44 a.m.
New subject: [PATCH 06/20] qemuxml2argvtest: Remove 'qemu-4.0' version of aarch64-features-sve case
Minimum qemu will be bumped to 4.2 so this test no longer makes sense.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err | 1 -
tests/qemuxml2argvtest.c | 2 --
2 files changed, 3 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err
diff --git a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err
b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err
deleted file mode 100644
index 471b22708a..0000000000
--- a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err
+++ /dev/null
@@ -1 +0,0 @@
-internal error: CPU features not supported by hypervisor for aarch64 architecture
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 3d5ded60d7..e850d607a8 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2946,8 +2946,6 @@ mymain(void)
QEMU_CAPS_DEVICE_PCI_BRIDGE,
QEMU_CAPS_DEVICE_PCI_SERIAL);
- /* QEMU 4.0.0 didn't have support for aarch64 CPU features */
- DO_TEST_CAPS_ARCH_VER_FAILURE("aarch64-features-sve", "aarch64",
"4.0.0");
/* aarch64 doesn't support the same CPU features as x86 */
DO_TEST_CAPS_ARCH_LATEST_FAILURE("aarch64-features-wrong",
"aarch64");
/* Can't enable vector lengths when SVE is overall disabled */
--
2.36.1
6:44 a.m.
New subject: [PATCH 07/20] qemuxml2argvtest: Remove 'qemu-4.0' versions of 'cpu-host-model-cmt' and 'cpu-tsc-frequency'
Minimum qemu version is going to be bumped to qemu-4.2. Upgrading the
version of these tests don't make sense as the host cpu in the real
capabilities doesn't support the features the tests are attempting to
test.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../cpu-host-model-cmt.x86_64-4.0.0.args | 33 -------------------
.../cpu-tsc-frequency.x86_64-4.0.0.args | 33 -------------------
tests/qemuxml2argvtest.c | 2 --
3 files changed, 68 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
b/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
deleted file mode 100644
index 0de09e1d88..0000000000
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
--accel tcg \
--cpu
Opteron_G3,acpi=on,ss=on,pclmulqdq=on,monitor=on,ssse3=on,sse4.1=on,sse4.2=on,movbe=on,aes=on,xsave=on,hypervisor=on,arat=on,fsgsbase=on,bmi1=on,smep=on,bmi2=on,erms=on,mpx=on,adx=on,smap=on,pcommit=on,clflushopt=on,clwb=on,pku=on,la57=on,xsaveopt=on,xgetbv1=on,mmxext=on,pdpe1gb=on,3dnowext=on,3dnow=on,cr8legacy=on,npt=on,misalignsse=off
\
--m 214 \
--overcommit mem-lock=off \
--smp 6,sockets=6,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--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 \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
deleted file mode 100644
index ba1606704f..0000000000
--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
+++ /dev/null
@@ -1,33 +0,0 @@
-LC_ALL=C \
-PATH=/bin \
-HOME=/tmp/lib/domain--1-QEMUGuest1 \
-USER=test \
-LOGNAME=test \
-XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
-/usr/bin/qemu-system-x86_64 \
--name guest=QEMUGuest1,debug-threads=on \
--S \
--object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes
\
--machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
--accel kvm \
--cpu
Skylake-Client-IBRS,ss=on,vmx=on,hypervisor=on,tsc-adjust=on,clflushopt=on,umip=on,ssbd=on,xsaves=on,pdpe1gb=on,invtsc=on,tsc-frequency=4567890000
\
--m 214 \
--overcommit mem-lock=off \
--smp 1,sockets=1,cores=1,threads=1 \
--uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
--display none \
--no-user-config \
--nodefaults \
--chardev socket,id=charmonitor,fd=1729,server=on,wait=off \
--mon chardev=charmonitor,id=monitor,mode=control \
--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 \
--sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
--msg timestamp=on
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index e850d607a8..4897d2f87b 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2044,8 +2044,6 @@ mymain(void)
DO_TEST("cpu-tsc-frequency", QEMU_CAPS_KVM);
qemuTestSetHostCPU(&driver, driver.hostarch, NULL);
- DO_TEST_CAPS_VER("cpu-host-model-cmt", "4.0.0");
- DO_TEST_CAPS_VER("cpu-tsc-frequency", "4.0.0");
DO_TEST_CAPS_LATEST("cpu-translation");
DO_TEST_NOCAPS("memtune");
--
2.36.1
6:06 p.m.
New subject: [PATCH 07/20] qemuxml2argvtest: Remove 'qemu-4.0' versions of 'cpu-host-model-cmt' and 'cpu-tsc-frequency'
On a Friday in 2022, Peter Krempa wrote:
Minimum qemu version is going to be bumped to qemu-4.2. Upgrading the
version of these tests don't make sense as the host cpu in the real
*doesn't
capabilities doesn't support the features the tests are attempting
to
test.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../cpu-host-model-cmt.x86_64-4.0.0.args | 33 -------------------
.../cpu-tsc-frequency.x86_64-4.0.0.args | 33 -------------------
tests/qemuxml2argvtest.c | 2 --
3 files changed, 68 deletions(-)
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
6:44 a.m.
New subject: [PATCH 08/20] tests: qemucapabilities: Remove qemu-3.1 test data
Upcoming patches will raise the minimum required qemu version to 4.2.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../caps_3.1.0.ppc64.replies | 23732 ---------------
.../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1072 -
.../caps_3.1.0.x86_64.replies | 24428 ----------------
.../caps_3.1.0.x86_64.xml | 1387 -
4 files changed, 50619 deletions(-)
delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
Truncated for mail posting.
6:44 a.m.
New subject: [PATCH 09/20] tests: domaincaps: Remove test data for qemu-3.1
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 211 ----------------
.../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 230 ------------------
tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 138 -----------
tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 211 ----------------
4 files changed, 790 deletions(-)
delete mode 100644 tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.1.0.ppc64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.1.0.x86_64.xml
Truncated.
6:44 a.m.
New subject: [PATCH 10/20] qemucapabilitiestest: Remove test data for qemu-4.0
qemu-4.0 will no longer be supported, remove the test data.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../caps_4.0.0.aarch64.replies | 20893 -------------
.../caps_4.0.0.aarch64.xml | 363 -
.../caps_4.0.0.ppc64.replies | 24461 ---------------
.../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1091 -
.../caps_4.0.0.riscv32.replies | 18154 -----------
.../caps_4.0.0.riscv32.xml | 157 -
.../caps_4.0.0.riscv64.replies | 18154 -----------
.../caps_4.0.0.riscv64.xml | 157 -
.../caps_4.0.0.s390x.replies | 21721 --------------
.../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2891 --
.../caps_4.0.0.x86_64.replies | 25001 ----------------
.../caps_4.0.0.x86_64.xml | 1398 -
12 files changed, 134441 deletions(-)
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
Trucated.
6:44 a.m.
New subject: [PATCH 11/20] domaincapstest: Remove test data for qemu-4.0
qemu-4.0 will no longer be supported.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 211 ----------------
.../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 230 -----------------
.../qemu_4.0.0-virt.aarch64.xml | 179 -------------
tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 173 -------------
tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 139 -----------
tests/domaincapsdata/qemu_4.0.0.s390x.xml | 236 ------------------
tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 211 ----------------
7 files changed, 1379 deletions(-)
delete mode 100644 tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0.aarch64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0.ppc64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0.s390x.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0.x86_64.xml
Truncated.
6:44 a.m.
New subject: [PATCH 12/20] qemucapabilitiestest: Remove test data for qemu-4.1
qemu-4.1 will not be supported any more.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../caps_4.1.0.x86_64.replies | 25198 ----------------
.../caps_4.1.0.x86_64.xml | 1971 --
2 files changed, 27169 deletions(-)
delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
Truncated.
6:44 a.m.
New subject: [PATCH 13/20] domaincapstest: Remove test data for qemu-4.1
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
.../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 217 ----------------
.../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 233 ------------------
tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 217 ----------------
3 files changed, 667 deletions(-)
delete mode 100644 tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.1.0.x86_64.xml
Truncated.
6:44 a.m.
New subject: [PATCH 14/20] qemu: Formally deprecate support for qemu < 4.2
Per [1] the Debian 10 reaches EOL in August of 2022. This allows us to
bump the minimum supported qemu version to qemu-4.2 which will also
allow us to do significant cleanups.
This commit bumps the minimum qemu verison and updates the corresponding
docs.
[1]: https://wiki.debian.org/DebianReleases
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
docs/drvqemu.rst | 2 +-
src/qemu/qemu_capabilities.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/docs/drvqemu.rst b/docs/drvqemu.rst
index c9f2432268..5fb98fafd2 100644
--- a/docs/drvqemu.rst
+++ b/docs/drvqemu.rst
@@ -5,7 +5,7 @@
QEMU/KVM/HVF hypervisor driver
==============================
-The libvirt KVM/QEMU driver can manage any QEMU emulator from version 3.1.0 or
+The libvirt KVM/QEMU driver can manage any QEMU emulator from version 4.2.0 or
later.
It supports multiple QEMU accelerators: software
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index fa8ffd19ca..c02fef6acd 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -5364,8 +5364,8 @@ virQEMUCapsProbeQMPSchemaCapabilities(virQEMUCaps *qemuCaps,
return 0;
}
-#define QEMU_MIN_MAJOR 3
-#define QEMU_MIN_MINOR 1
+#define QEMU_MIN_MAJOR 4
+#define QEMU_MIN_MINOR 2
#define QEMU_MIN_MICRO 0
virDomainVirtType
--
2.36.1
6:44 a.m.
New subject: [PATCH 15/20] qemu: command: Always assume QEMU_CAPS_AUDIODEV
Generate only new version of the '-audiodev' commandline. The leftover
old code and validation will be removed in subsequent patches.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 29 +++++++------------
.../aarch64-aavmf-virtio-mmio.args | 2 +-
.../aarch64-cpu-passthrough.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-host.args | 2 +-
.../aarch64-gic-none-tcg.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-v2.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-v3.args | 2 +-
.../aarch64-kvm-32-on-64.args | 2 +-
.../qemuxml2argvdata/aarch64-pci-serial.args | 2 +-
.../aarch64-traditional-pci.args | 2 +-
.../aarch64-usb-controller-nec-xhci.args | 2 +-
.../aarch64-usb-controller-qemu-xhci.args | 2 +-
.../aarch64-video-default.args | 4 +--
.../aarch64-video-virtio-gpu-pci.args | 2 +-
.../aarch64-virt-2.6-virtio-pci-default.args | 2 +-
.../aarch64-virt-default-nic.args | 2 +-
.../qemuxml2argvdata/aarch64-virt-virtio.args | 2 +-
.../aarch64-virtio-pci-default.args | 2 +-
.../aarch64-virtio-pci-manual-addresses.args | 2 +-
tests/qemuxml2argvdata/acpi-table.args | 2 +-
.../arm-vexpressa9-basic.args | 2 +-
.../arm-vexpressa9-nodevs.args | 2 +-
.../arm-vexpressa9-virtio.args | 2 +-
tests/qemuxml2argvdata/arm-virt-virtio.args | 2 +-
tests/qemuxml2argvdata/audio-default-sdl.args | 2 +-
.../qemuxml2argvdata/audio-default-spice.args | 2 +-
tests/qemuxml2argvdata/audio-default-vnc.args | 4 +--
tests/qemuxml2argvdata/autoindex.args | 2 +-
.../qemuxml2argvdata/balloon-ccw-deflate.args | 2 +-
.../qemuxml2argvdata/balloon-device-auto.args | 2 +-
.../balloon-device-deflate-off.args | 2 +-
.../balloon-device-deflate.args | 2 +-
.../balloon-device-period.args | 2 +-
tests/qemuxml2argvdata/balloon-device.args | 2 +-
.../balloon-mmio-deflate.args | 2 +-
tests/qemuxml2argvdata/blkiotune-device.args | 2 +-
tests/qemuxml2argvdata/blkiotune.args | 2 +-
tests/qemuxml2argvdata/boot-cdrom.args | 2 +-
tests/qemuxml2argvdata/boot-complex.args | 2 +-
tests/qemuxml2argvdata/boot-floppy-q35.args | 2 +-
tests/qemuxml2argvdata/boot-floppy.args | 2 +-
.../boot-menu-disable-drive.args | 2 +-
tests/qemuxml2argvdata/boot-menu-disable.args | 2 +-
.../boot-menu-enable-with-timeout.args | 2 +-
tests/qemuxml2argvdata/boot-menu-enable.args | 2 +-
tests/qemuxml2argvdata/boot-multi.args | 2 +-
tests/qemuxml2argvdata/boot-network.args | 2 +-
tests/qemuxml2argvdata/boot-order.args | 2 +-
tests/qemuxml2argvdata/channel-guestfwd.args | 2 +-
tests/qemuxml2argvdata/channel-spicevmc.args | 2 +-
.../qemuxml2argvdata/channel-virtio-auto.args | 2 +-
.../channel-virtio-autoadd.args | 2 +-
.../channel-virtio-autoassign.args | 2 +-
.../channel-virtio-default.args | 2 +-
.../channel-virtio-state.args | 2 +-
.../qemuxml2argvdata/channel-virtio-unix.args | 2 +-
tests/qemuxml2argvdata/channel-virtio.args | 2 +-
tests/qemuxml2argvdata/chardev-reconnect.args | 2 +-
tests/qemuxml2argvdata/clock-catchup.args | 2 +-
tests/qemuxml2argvdata/clock-france.args | 2 +-
tests/qemuxml2argvdata/clock-hpet-off.args | 2 +-
.../clock-localtime-basis-localtime.args | 2 +-
tests/qemuxml2argvdata/clock-localtime.args | 2 +-
tests/qemuxml2argvdata/clock-realtime.args | 2 +-
.../clock-timer-hyperv-rtc.args | 2 +-
tests/qemuxml2argvdata/clock-utc.args | 2 +-
tests/qemuxml2argvdata/clock-variable.args | 2 +-
.../qemuxml2argvdata/console-compat-auto.args | 2 +-
.../console-compat-chardev.args | 2 +-
tests/qemuxml2argvdata/console-compat.args | 2 +-
.../qemuxml2argvdata/console-virtio-ccw.args | 2 +-
.../qemuxml2argvdata/console-virtio-many.args | 2 +-
tests/qemuxml2argvdata/console-virtio.args | 2 +-
tests/qemuxml2argvdata/controller-order.args | 4 +--
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-disable.args | 2 +-
.../qemuxml2argvdata/cpu-cache-disable2.args | 2 +-
.../qemuxml2argvdata/cpu-cache-disable3.args | 2 +-
.../cpu-cache-emulate-l3.args | 2 +-
.../cpu-cache-passthrough.args | 2 +-
.../cpu-cache-passthrough2.args | 2 +-
.../cpu-check-default-none.args | 2 +-
.../cpu-check-default-none2.args | 2 +-
.../cpu-check-default-partial.args | 2 +-
.../cpu-check-default-partial2.args | 2 +-
tests/qemuxml2argvdata/cpu-check-none.args | 2 +-
tests/qemuxml2argvdata/cpu-exact1.args | 2 +-
.../cpu-exact2-nofallback.args | 2 +-
tests/qemuxml2argvdata/cpu-exact2.args | 2 +-
tests/qemuxml2argvdata/cpu-fallback.args | 2 +-
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +-
.../qemuxml2argvdata/cpu-host-model-cmt.args | 2 +-
.../cpu-host-model-fallback.args | 2 +-
.../cpu-host-model-vendor.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.args | 2 +-
.../cpu-host-passthrough-features.args | 2 +-
.../cpu-host-passthrough.args | 2 +-
.../qemuxml2argvdata/cpu-hotplug-startup.args | 2 +-
tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum1.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum2.args | 2 +-
.../cpu-no-removed-features.args | 2 +-
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +-
.../qemuxml2argvdata/cpu-numa-memshared.args | 2 +-
.../cpu-numa-no-memory-element.args | 2 +-
tests/qemuxml2argvdata/cpu-numa1.args | 2 +-
tests/qemuxml2argvdata/cpu-numa2.args | 2 +-
tests/qemuxml2argvdata/cpu-s390-features.args | 2 +-
tests/qemuxml2argvdata/cpu-s390-zEC12.args | 2 +-
tests/qemuxml2argvdata/cpu-strict1.args | 2 +-
tests/qemuxml2argvdata/cpu-topology1.args | 2 +-
tests/qemuxml2argvdata/cpu-topology2.args | 2 +-
tests/qemuxml2argvdata/cpu-topology3.args | 2 +-
tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +-
tests/qemuxml2argvdata/cputune-numatune.args | 2 +-
.../qemuxml2argvdata/cputune-zero-shares.args | 2 +-
tests/qemuxml2argvdata/cputune.args | 2 +-
.../default-kvm-host-arch.args | 2 +-
.../default-qemu-host-arch.args | 2 +-
.../fd-memory-no-numa-topology.args | 2 +-
.../fd-memory-numa-topology.args | 2 +-
.../fd-memory-numa-topology2.args | 2 +-
.../fd-memory-numa-topology3.args | 2 +-
.../firmware-manual-bios.args | 2 +-
.../firmware-manual-efi-acpi-aarch64.args | 2 +-
.../firmware-manual-efi-acpi-q35.args | 2 +-
.../firmware-manual-efi-noacpi-aarch64.args | 2 +-
.../firmware-manual-efi-secure.args | 2 +-
.../qemuxml2argvdata/firmware-manual-efi.args | 2 +-
.../firmware-manual-noefi-acpi-q35.args | 2 +-
.../firmware-manual-noefi-noacpi-aarch64.args | 2 +-
.../firmware-manual-noefi-noacpi-q35.args | 2 +-
.../hostdev-mdev-precreated.args | 2 +-
.../hostdev-pci-address-unassigned.args | 2 +-
.../hostdev-pci-multifunction.args | 2 +-
.../hostdev-scsi-vhost-scsi-ccw.args | 2 +-
.../hostdev-scsi-vhost-scsi-pci.args | 2 +-
.../hostdev-scsi-vhost-scsi-pcie.args | 2 +-
.../hostdev-subsys-mdev-vfio-ccw.args | 2 +-
.../hostdev-vfio-multidomain.args | 2 +-
.../hostdev-vfio-zpci-autogenerate-fids.args | 2 +-
.../hostdev-vfio-zpci-autogenerate-uids.args | 2 +-
.../hostdev-vfio-zpci-autogenerate.args | 2 +-
.../hostdev-vfio-zpci-boundaries.args | 2 +-
.../hostdev-vfio-zpci-ccw-memballoon.args | 2 +-
.../hostdev-vfio-zpci-multidomain-many.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio.args | 2 +-
tests/qemuxml2argvdata/hotplug-base.args | 2 +-
.../hugepages-default-2M.args | 2 +-
.../hugepages-default-system-size.args | 2 +-
tests/qemuxml2argvdata/hugepages-default.args | 2 +-
.../qemuxml2argvdata/hugepages-memaccess.args | 2 +-
.../hugepages-memaccess2.args | 2 +-
tests/qemuxml2argvdata/hugepages-nodeset.args | 2 +-
.../hugepages-numa-default-2M.args | 2 +-
.../hugepages-numa-default-dimm.args | 2 +-
.../hugepages-numa-default.args | 2 +-
.../hugepages-numa-nodeset-part.args | 2 +-
.../hugepages-numa-nodeset.args | 2 +-
tests/qemuxml2argvdata/hugepages-shared.args | 2 +-
.../hvf-aarch64-virt-headless.args | 2 +-
.../hvf-x86_64-q35-headless.args | 2 +-
.../qemuxml2argvdata/input-usbmouse-addr.args | 2 +-
tests/qemuxml2argvdata/input-usbmouse.args | 2 +-
tests/qemuxml2argvdata/input-usbtablet.args | 2 +-
tests/qemuxml2argvdata/input-virtio-ccw.args | 2 +-
.../iothreads-disk-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/iothreads-disk.args | 2 +-
.../iothreads-ids-partial.args | 2 +-
tests/qemuxml2argvdata/iothreads-ids.args | 2 +-
tests/qemuxml2argvdata/iothreads.args | 2 +-
tests/qemuxml2argvdata/kvm-features-off.args | 2 +-
tests/qemuxml2argvdata/kvm-features.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +-
tests/qemuxml2argvdata/kvmclock.args | 2 +-
.../mach-virt-console-virtio.args | 2 +-
.../mach-virt-serial-native.args | 2 +-
.../mach-virt-serial-pci.args | 2 +-
.../mach-virt-serial-usb.args | 2 +-
.../machine-aeskeywrap-off-cap.args | 2 +-
.../machine-aeskeywrap-off-caps.args | 2 +-
.../machine-aeskeywrap-on-cap.args | 2 +-
.../machine-aeskeywrap-on-caps.args | 2 +-
tests/qemuxml2argvdata/machine-aliases1.args | 2 +-
tests/qemuxml2argvdata/machine-aliases2.args | 2 +-
tests/qemuxml2argvdata/machine-core-off.args | 2 +-
tests/qemuxml2argvdata/machine-core-on.args | 2 +-
.../machine-deakeywrap-off-cap.args | 2 +-
.../machine-deakeywrap-off-caps.args | 2 +-
.../machine-deakeywrap-on-cap.args | 2 +-
.../machine-deakeywrap-on-caps.args | 2 +-
.../machine-keywrap-none-caps.args | 2 +-
.../machine-keywrap-none.args | 2 +-
...ine-loadparm-multiple-disks-nets-s390.args | 2 +-
.../machine-loadparm-net-s390.args | 2 +-
.../machine-loadparm-s390.args | 2 +-
.../qemuxml2argvdata/machine-vmport-opt.args | 2 +-
tests/qemuxml2argvdata/master-key.args | 2 +-
.../memory-hotplug-dimm-addr.args | 2 +-
.../qemuxml2argvdata/memory-hotplug-dimm.args | 2 +-
...emory-hotplug-nvdimm-ppc64-abi-update.args | 2 +-
.../memory-hotplug-nvdimm-ppc64.args | 2 +-
...emory-hotplug-ppc64-nonuma-abi-update.args | 2 +-
.../memory-hotplug-ppc64-nonuma.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug.args | 2 +-
tests/qemuxml2argvdata/memtune-unlimited.args | 2 +-
tests/qemuxml2argvdata/memtune.args | 2 +-
.../migrate-numa-unaligned.args | 2 +-
tests/qemuxml2argvdata/migrate.args | 2 +-
tests/qemuxml2argvdata/minimal.args | 2 +-
tests/qemuxml2argvdata/misc-acpi.args | 2 +-
tests/qemuxml2argvdata/misc-disable-s3.args | 2 +-
.../misc-disable-suspends.args | 2 +-
tests/qemuxml2argvdata/misc-enable-s4.args | 2 +-
tests/qemuxml2argvdata/misc-uuid.args | 2 +-
tests/qemuxml2argvdata/monitor-json.args | 2 +-
.../multifunction-pci-device.args | 2 +-
tests/qemuxml2argvdata/net-client.args | 2 +-
tests/qemuxml2argvdata/net-eth-hostip.args | 2 +-
tests/qemuxml2argvdata/net-eth-ifname.args | 2 +-
tests/qemuxml2argvdata/net-eth-names.args | 2 +-
.../net-eth-unmanaged-tap.args | 2 +-
tests/qemuxml2argvdata/net-eth.args | 2 +-
.../net-hostdev-bootorder.args | 2 +-
.../net-hostdev-multidomain.args | 2 +-
.../net-hostdev-vfio-multidomain.args | 2 +-
tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +-
tests/qemuxml2argvdata/net-hostdev.args | 2 +-
tests/qemuxml2argvdata/net-many-models.args | 2 +-
tests/qemuxml2argvdata/net-mcast.args | 2 +-
tests/qemuxml2argvdata/net-server.args | 2 +-
tests/qemuxml2argvdata/net-udp.args | 2 +-
tests/qemuxml2argvdata/net-user-addr.args | 2 +-
tests/qemuxml2argvdata/net-user.args | 2 +-
.../net-vhostuser-multiq.args | 2 +-
tests/qemuxml2argvdata/net-vhostuser.args | 2 +-
tests/qemuxml2argvdata/net-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/net-virtio-device.args | 2 +-
.../net-virtio-disable-offloads.args | 2 +-
tests/qemuxml2argvdata/net-virtio-netdev.args | 2 +-
.../net-virtio-rxtxqueuesize.args | 2 +-
.../net-virtio-teaming-hostdev.args | 2 +-
.../qemuxml2argvdata/net-virtio-teaming.args | 2 +-
tests/qemuxml2argvdata/net-virtio.args | 2 +-
tests/qemuxml2argvdata/nosharepages.args | 2 +-
.../numad-auto-memory-vcpu-cpuset.args | 2 +-
...o-memory-vcpu-no-cpuset-and-placement.args | 2 +-
.../numad-auto-vcpu-static-numatune.args | 2 +-
.../numad-static-memory-auto-vcpu.args | 2 +-
tests/qemuxml2argvdata/numad.args | 2 +-
.../numatune-auto-nodeset-invalid.args | 2 +-
.../numatune-auto-prefer.args | 2 +-
.../qemuxml2argvdata/numatune-distances.args | 2 +-
.../numatune-memnode-no-memory.args | 2 +-
tests/qemuxml2argvdata/numatune-memnode.args | 2 +-
tests/qemuxml2argvdata/numatune-memory.args | 2 +-
tests/qemuxml2argvdata/numatune-no-vcpu.args | 2 +-
.../qemuxml2argvdata/pages-dimm-discard.args | 2 +-
.../pages-discard-hugepages.args | 2 +-
tests/qemuxml2argvdata/pages-discard.args | 2 +-
.../parallel-parport-chardev.args | 2 +-
.../parallel-tcp-chardev.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +-
tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +-
.../pci-bridge-many-disks.args | 2 +-
tests/qemuxml2argvdata/pci-bridge.args | 4 +--
tests/qemuxml2argvdata/pci-expander-bus.args | 2 +-
tests/qemuxml2argvdata/pci-many.args | 2 +-
tests/qemuxml2argvdata/pci-rom-disabled.args | 2 +-
tests/qemuxml2argvdata/pci-rom.args | 2 +-
.../pci-serial-dev-chardev.args | 2 +-
tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +-
.../pcie-root-port-model-generic.args | 2 +-
.../pcie-root-port-model-ioh3420.args | 2 +-
tests/qemuxml2argvdata/pcie-root-port.args | 2 +-
tests/qemuxml2argvdata/pcie-root.args | 2 +-
.../pcie-switch-downstream-port.args | 2 +-
.../pcie-switch-upstream-port.args | 2 +-
tests/qemuxml2argvdata/pcihole64-q35.args | 2 +-
tests/qemuxml2argvdata/pcihole64.args | 2 +-
tests/qemuxml2argvdata/pmu-feature-off.args | 2 +-
tests/qemuxml2argvdata/pmu-feature.args | 2 +-
tests/qemuxml2argvdata/ppc-dtb.args | 2 +-
.../ppc64-usb-controller-legacy.args | 2 +-
.../ppc64-usb-controller-qemu-xhci.args | 2 +-
.../ppc64-usb-controller.args | 2 +-
tests/qemuxml2argvdata/ppce500-serial.args | 2 +-
tests/qemuxml2argvdata/pseries-basic.args | 2 +-
.../pseries-console-virtio.args | 2 +-
.../qemuxml2argvdata/pseries-cpu-compat.args | 2 +-
tests/qemuxml2argvdata/pseries-cpu-exact.args | 2 +-
tests/qemuxml2argvdata/pseries-cpu-le.args | 2 +-
tests/qemuxml2argvdata/pseries-features.args | 2 +-
.../qemuxml2argvdata/pseries-hostdevs-1.args | 2 +-
.../qemuxml2argvdata/pseries-hostdevs-2.args | 2 +-
.../qemuxml2argvdata/pseries-hostdevs-3.args | 2 +-
.../pseries-many-buses-1.args | 2 +-
.../pseries-many-buses-2.args | 2 +-
.../pseries-many-devices.args | 2 +-
tests/qemuxml2argvdata/pseries-nvram.args | 2 +-
.../pseries-panic-missing.args | 2 +-
.../pseries-panic-no-address.args | 2 +-
.../pseries-phb-default-missing.args | 2 +-
.../pseries-phb-numa-node.args | 2 +-
.../qemuxml2argvdata/pseries-phb-simple.args | 2 +-
.../pseries-serial-native.args | 2 +-
.../qemuxml2argvdata/pseries-serial-pci.args | 2 +-
.../qemuxml2argvdata/pseries-serial-usb.args | 2 +-
.../qemuxml2argvdata/pseries-usb-default.args | 2 +-
tests/qemuxml2argvdata/pseries-usb-kbd.args | 2 +-
tests/qemuxml2argvdata/pseries-usb-multi.args | 2 +-
.../pseries-vio-user-assigned.args | 2 +-
tests/qemuxml2argvdata/pseries-vio.args | 2 +-
.../q35-default-devices-only.args | 2 +-
tests/qemuxml2argvdata/q35-multifunction.args | 2 +-
.../q35-pci-force-address.args | 4 +--
tests/qemuxml2argvdata/q35-pcie-autoadd.args | 2 +-
tests/qemuxml2argvdata/q35-pcie.args | 2 +-
.../q35-pm-disable-fallback.args | 2 +-
tests/qemuxml2argvdata/q35-pm-disable.args | 2 +-
tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +-
tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +-
tests/qemuxml2argvdata/q35-usb2.args | 2 +-
.../q35-virt-manager-basic.args | 4 +--
tests/qemuxml2argvdata/q35-virtio-pci.args | 2 +-
tests/qemuxml2argvdata/q35.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +-
.../qemu-ns-commandline-ns0.args | 2 +-
.../qemu-ns-commandline-ns1.args | 2 +-
.../qemuxml2argvdata/qemu-ns-commandline.args | 2 +-
.../qemu-ns-domain-commandline-ns0.args | 2 +-
.../qemu-ns-domain-commandline.args | 2 +-
.../qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-no-env.args | 2 +-
.../reboot-timeout-disabled.args | 2 +-
.../reboot-timeout-enabled.args | 2 +-
tests/qemuxml2argvdata/restore-v2-fd.args | 2 +-
tests/qemuxml2argvdata/restore-v2.args | 2 +-
tests/qemuxml2argvdata/riscv64-virt-pci.args | 2 +-
tests/qemuxml2argvdata/riscv64-virt.args | 2 +-
.../qemuxml2argvdata/s390-panic-missing.args | 2 +-
.../s390-panic-no-address.args | 2 +-
tests/qemuxml2argvdata/s390-serial-2.args | 2 +-
.../qemuxml2argvdata/s390-serial-console.args | 2 +-
tests/qemuxml2argvdata/s390-serial.args | 2 +-
tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +-
.../seclabel-dynamic-baselabel.args | 2 +-
.../seclabel-dynamic-labelskip.args | 2 +-
.../seclabel-dynamic-override.args | 2 +-
.../seclabel-dynamic-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +-
tests/qemuxml2argvdata/seclabel-none.args | 2 +-
.../seclabel-static-labelskip.args | 2 +-
.../seclabel-static-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-static.args | 2 +-
.../serial-dev-chardev-iobase.args | 2 +-
.../qemuxml2argvdata/serial-dev-chardev.args | 2 +-
.../qemuxml2argvdata/serial-file-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-file-log.args | 2 +-
.../qemuxml2argvdata/serial-many-chardev.args | 2 +-
.../qemuxml2argvdata/serial-pty-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-spiceport.args | 2 +-
.../qemuxml2argvdata/serial-tcp-chardev.args | 2 +-
.../serial-tcp-telnet-chardev.args | 2 +-
.../serial-tcp-tlsx509-chardev-notls.args | 2 +-
.../serial-tcp-tlsx509-chardev-verify.args | 2 +-
.../serial-tcp-tlsx509-chardev.args | 2 +-
.../serial-tcp-tlsx509-secret-chardev.args | 2 +-
.../qemuxml2argvdata/serial-udp-chardev.args | 2 +-
.../qemuxml2argvdata/serial-unix-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +-
.../shmem-plain-doorbell.args | 2 +-
tests/qemuxml2argvdata/shmem.args | 2 +-
.../smartcard-controller.args | 2 +-
.../smartcard-host-certificates-database.args | 2 +-
.../smartcard-host-certificates.args | 2 +-
tests/qemuxml2argvdata/smartcard-host.args | 2 +-
.../smartcard-passthrough-spicevmc.args | 2 +-
.../smartcard-passthrough-tcp.args | 2 +-
tests/qemuxml2argvdata/smbios-type-fwcfg.args | 2 +-
tests/qemuxml2argvdata/smbios.args | 2 +-
tests/qemuxml2argvdata/smp-dies.args | 2 +-
tests/qemuxml2argvdata/smp.args | 2 +-
tests/qemuxml2argvdata/sound-device.args | 26 ++++++++---------
tests/qemuxml2argvdata/sound.args | 8 ++---
tests/qemuxml2argvdata/sparc-minimal.args | 2 +-
.../usb-controller-default-q35.args | 2 +-
.../usb-controller-explicit-q35.args | 2 +-
.../usb-controller-qemu-xhci.args | 2 +-
.../qemuxml2argvdata/usb-controller-xhci.args | 2 +-
tests/qemuxml2argvdata/usb-controller.args | 2 +-
.../usb-hub-autoadd-deluxe.args | 2 +-
tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +-
tests/qemuxml2argvdata/usb-hub.args | 2 +-
.../qemuxml2argvdata/usb-ich9-autoassign.args | 2 +-
.../qemuxml2argvdata/usb-ich9-companion.args | 2 +-
.../qemuxml2argvdata/usb-ich9-ehci-addr.args | 2 +-
.../qemuxml2argvdata/usb-long-port-path.args | 2 +-
tests/qemuxml2argvdata/usb-none.args | 2 +-
.../usb-piix3-controller.args | 2 +-
.../qemuxml2argvdata/usb-port-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb-port-missing.args | 2 +-
tests/qemuxml2argvdata/usb-ports.args | 2 +-
tests/qemuxml2argvdata/usb-redir-boot.args | 2 +-
.../usb-redir-filter-version.args | 2 +-
tests/qemuxml2argvdata/usb-redir-filter.args | 2 +-
tests/qemuxml2argvdata/usb-redir.args | 2 +-
.../qemuxml2argvdata/usb-xhci-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb1-usb2.args | 2 +-
tests/qemuxml2argvdata/user-aliases-usb.args | 2 +-
tests/qemuxml2argvdata/user-aliases.args | 6 ++--
.../vcpu-placement-static.args | 2 +-
.../video-device-pciaddr-default.args | 4 +--
tests/qemuxml2argvdata/video-none-device.args | 4 +--
.../video-qxl-device-vgamem.args | 2 +-
tests/qemuxml2argvdata/video-qxl-device.args | 2 +-
tests/qemuxml2argvdata/video-qxl-heads.args | 2 +-
tests/qemuxml2argvdata/video-qxl-noheads.args | 2 +-
.../video-qxl-resolution.args | 2 +-
.../video-qxl-sec-device-vgamem.args | 2 +-
.../video-qxl-sec-device.args | 2 +-
.../video-vga-device-vgamem.args | 2 +-
tests/qemuxml2argvdata/video-vga-device.args | 2 +-
.../qemuxml2argvdata/video-vga-qxl-heads.args | 2 +-
.../video-virtio-gpu-ccw.args | 4 +--
.../video-virtio-gpu-device.args | 2 +-
.../video-virtio-gpu-secondary.args | 2 +-
.../video-virtio-gpu-spice-gl.args | 2 +-
.../video-virtio-gpu-virgl.args | 2 +-
tests/qemuxml2argvdata/video-virtio-vga.args | 2 +-
.../virtio-input-passthrough.args | 2 +-
tests/qemuxml2argvdata/virtio-input.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-ccw.args | 2 +-
.../qemuxml2argvdata/virtio-rng-default.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-egd.args | 2 +-
.../qemuxml2argvdata/virtio-rng-multiple.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-random.args | 2 +-
tests/qemuxml2argvdata/vmcoreinfo.args | 2 +-
444 files changed, 480 insertions(+), 487 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 262fffe5fe..4d9a0eb2e1 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4692,8 +4692,7 @@ qemuBuildSoundDevCmd(virCommand *cmd,
return -1;
}
- if (!virDomainSoundModelSupportsCodecs(sound) &&
- virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
+ if (!virDomainSoundModelSupportsCodecs(sound)) {
if (!(audioid = qemuGetAudioIDString(def, sound->audioId)))
return -1;
}
@@ -4727,10 +4726,8 @@ qemuBuildSoundCodecCmd(virCommand *cmd,
g_autofree char *alias = g_strdup_printf("%s-codec%d",
sound->info.alias, codec->cad);
g_autofree char *bus = g_strdup_printf("%s.0", sound->info.alias);
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
- if (!(audioid = qemuGetAudioIDString(def, sound->audioId)))
- return -1;
- }
+ if (!(audioid = qemuGetAudioIDString(def, sound->audioId)))
+ return -1;
if (virJSONValueObjectAdd(&props,
"s:driver",
qemuSoundCodecTypeToString(codec->type),
@@ -8118,7 +8115,7 @@ qemuBuildAudioPulseAudioEnv(virCommand *cmd,
}
-static int
+static int G_GNUC_UNUSED
qemuBuildAudioCommandLineEnv(virCommand *cmd,
virDomainDef *def)
{
@@ -8220,12 +8217,9 @@ qemuBuildAudioCommandLineEnv(virCommand *cmd,
static int
qemuBuildAudioCommandLine(virCommand *cmd,
virDomainDef *def,
- virQEMUCaps *qemuCaps)
+ virQEMUCaps *qemuCaps G_GNUC_UNUSED)
{
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV))
- return qemuBuildAudioCommandLineArgs(cmd, def);
- else
- return qemuBuildAudioCommandLineEnv(cmd, def);
+ return qemuBuildAudioCommandLineArgs(cmd, def);
}
@@ -8264,10 +8258,14 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *cfg,
virQEMUCaps *qemuCaps,
virDomainGraphicsDef *graphics)
{
+ g_autofree char *audioid = qemuGetAudioIDString(def, graphics->data.vnc.audioId);
g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER;
virDomainGraphicsListenDef *glisten = NULL;
bool escapeAddr;
+ if (!audioid)
+ return -1;
+
if (!(glisten = virDomainGraphicsGetListen(graphics, 0))) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("missing listen element"));
@@ -8361,12 +8359,7 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfig *cfg,
"on" : "off");
}
- if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
- g_autofree char *audioid = qemuGetAudioIDString(def,
graphics->data.vnc.audioId);
- if (!audioid)
- return -1;
- virBufferAsprintf(&opt, ",audiodev=%s", audioid);
- }
+ virBufferAsprintf(&opt, ",audiodev=%s", audioid);
virCommandAddArg(cmd, "-vnc");
virCommandAddArgBuffer(cmd, &opt);
diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
index f41907ce2b..23edbd4edb 100644
--- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
@@ -38,6 +37,7 @@ QEMU_AUDIO_DRV=none \
-device virtio-net-device,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37 \
-chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-device,id=balloon0 \
-object rng-random,id=objrng0,filename=/dev/random \
-device virtio-rng-device,rng=objrng0,id=rng0 \
diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
index b22f8b1de4..6a9898193f 100644
--- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
+++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args
b/tests/qemuxml2argvdata/aarch64-gic-host.args
index a064d52b7d..5f78b398fc 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-host.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-host.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
index 48c856f517..483343b975 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args
b/tests/qemuxml2argvdata/aarch64-gic-v2.args
index 43e142372d..9cb4aa4b3b 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v2.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args
b/tests/qemuxml2argvdata/aarch64-gic-v3.args
index 2cc39ab3b5..56dc20bd0f 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v3.args
+++ b/tests/qemuxml2argvdata/aarch64-gic-v3.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
index 000346d64b..6ac50d6f17 100644
--- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
+++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-arm \
-name guest=armtest,debug-threads=on \
-S \
@@ -35,4 +34,5 @@ QEMU_AUDIO_DRV=none \
-device virtio-net-device,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37 \
-chardev pty,id=charserial0 \
-serial chardev:charserial0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-pci-serial.args
b/tests/qemuxml2argvdata/aarch64-pci-serial.args
index 89dee4243e..06f6f0227a 100644
--- a/tests/qemuxml2argvdata/aarch64-pci-serial.args
+++ b/tests/qemuxml2argvdata/aarch64-pci-serial.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
@@ -32,4 +31,5 @@ QEMU_AUDIO_DRV=none \
-add-fd set=0,fd=1751,opaque=serial0-log \
-chardev pty,id=charserial0,logfile=/dev/fdset/0,logappend=on \
-device pci-serial,chardev=charserial0,id=serial0,bus=pci.2,addr=0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
index 939e938231..fff5021883 100644
--- a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-device pcie-root-port,port=9,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x1 \
-chardev pty,id=charserial0 \
-device pci-serial,chardev=charserial0,id=serial0,bus=pci.2,addr=0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
index fbb40f8529..4c4e59ba7e 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-device nec-usb-xhci,id=usb,bus=pcie.0,addr=0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
index f7deb39419..32cfdff45b 100644
--- a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-device qemu-xhci,id=usb,bus=pcie.0,addr=0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-video-default.args
b/tests/qemuxml2argvdata/aarch64-video-default.args
index 19050eb340..24fddcf520 100644
--- a/tests/qemuxml2argvdata/aarch64-video-default.args
+++ b/tests/qemuxml2argvdata/aarch64-video-default.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64-vgpu/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64-vgpu/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64-vgpu/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64-vgpu,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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=16,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
--vnc 127.0.0.1:0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
-device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.2,addr=0x1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
index ce9144c820..7c710b7c33 100644
--- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
+++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64-vgpu/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64-vgpu/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64-vgpu/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64-vgpu,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ioh3420,port=9,chassis=2,id=pci.2,bus=pcie.0,multifunction=on,addr=0x1.0x1 \
-netdev user,id=hostnet0 \
-device
virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:73:34:53,bootindex=1,bus=pci.1,addr=0x0
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.2,addr=0x0 \
-msg timestamp=on
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 ac5cf85c85..7f8bd9d402 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
@@ -43,6 +42,7 @@ QEMU_AUDIO_DRV=none \
-serial chardev:charserial0 \
-chardev pty,id=charconsole1 \
-device virtconsole,chardev=charconsole1,id=console1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x4 \
-object rng-random,id=objrng0,filename=/dev/random \
-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.2,addr=0x5 \
diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
index 229c2fca89..9fc886d721 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64-virt-default/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64-virt-default/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64-virt-default/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64-virt-default-nic,debug-threads=on \
-S \
@@ -32,4 +31,5 @@ QEMU_AUDIO_DRV=none \
-append console=ttyAMA0 \
-netdev user,id=hostnet0 \
-device virtio-net-device,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
index c20f80928c..4a78ab1038 100644
--- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
+++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
@@ -40,6 +39,7 @@ QEMU_AUDIO_DRV=none \
-serial chardev:charserial0 \
-chardev pty,id=charconsole1 \
-device virtconsole,chardev=charconsole1,id=console1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-device,id=balloon0 \
-object rng-random,id=objrng0,filename=/dev/random \
-device virtio-rng-device,rng=objrng0,id=rng0 \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
index 4c63049723..2e2b523b07 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
@@ -46,6 +45,7 @@ QEMU_AUDIO_DRV=none \
-serial chardev:charserial0 \
-chardev pty,id=charconsole1 \
-device virtconsole,chardev=charconsole1,id=console1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x0 \
-object rng-random,id=objrng0,filename=/dev/random \
-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.5,addr=0x0 \
diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
index 4951a60cd0..671854a250 100644
--- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
@@ -41,4 +40,5 @@ QEMU_AUDIO_DRV=none \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:09:a4:37,bus=pci.3,addr=0x2
\
-netdev user,id=hostnet1 \
-device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:09:a4:38,bus=pci.2,addr=0x1
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/acpi-table.args
b/tests/qemuxml2argvdata/acpi-table.args
index 169fa61e1f..996dfac7b0 100644
--- a/tests/qemuxml2argvdata/acpi-table.args
+++ b/tests/qemuxml2argvdata/acpi-table.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-acpitable sig=SLIC,file=/var/lib/libvirt/acpi/slic.dat \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
index 19750162c2..b175c67dcd 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-arm \
-name guest=armtest,debug-threads=on \
-S \
@@ -35,4 +34,5 @@ QEMU_AUDIO_DRV=none \
-net nic,macaddr=52:54:00:09:a4:37,netdev=hostnet0,model=lan9118,id=net0 \
-chardev pty,id=charserial0 \
-serial chardev:charserial0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
index 5ef4e45766..f9638c5c80 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-arm \
-name guest=armtest,debug-threads=on \
-S \
@@ -30,4 +29,5 @@ QEMU_AUDIO_DRV=none \
-append console=ttyAMA0,115200n8 \
-dtb /arm.dtb \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
index 99580fa0d3..c8fd7ec981 100644
--- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
+++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-arm \
-name guest=armtest,debug-threads=on \
-S \
@@ -39,6 +38,7 @@ QEMU_AUDIO_DRV=none \
-serial chardev:charserial0 \
-chardev pty,id=charconsole1 \
-device virtconsole,chardev=charconsole1,id=console1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-device,id=balloon0 \
-object rng-random,id=objrng0,filename=/dev/random \
-device virtio-rng-device,rng=objrng0,id=rng0 \
diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.args
b/tests/qemuxml2argvdata/arm-virt-virtio.args
index 909d2caaf9..fb0bf0e374 100644
--- a/tests/qemuxml2argvdata/arm-virt-virtio.args
+++ b/tests/qemuxml2argvdata/arm-virt-virtio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-armtest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-arm \
-name guest=armtest,debug-threads=on \
-S \
@@ -38,6 +37,7 @@ QEMU_AUDIO_DRV=none \
-serial chardev:charserial0 \
-chardev pty,id=charconsole1 \
-device virtconsole,chardev=charconsole1,id=console1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-device,id=balloon0 \
-object rng-random,id=objrng0,filename=/dev/random \
-device virtio-rng-device,rng=objrng0,id=rng0 \
diff --git a/tests/qemuxml2argvdata/audio-default-sdl.args
b/tests/qemuxml2argvdata/audio-default-sdl.args
index 16b9646654..f64c20ce3c 100644
--- a/tests/qemuxml2argvdata/audio-default-sdl.args
+++ b/tests/qemuxml2argvdata/audio-default-sdl.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=sdl \
SDL_AUDIODRIVER=esd \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
@@ -29,6 +28,7 @@ SDL_AUDIODRIVER=esd \
-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 \
+-audiodev
'{"id":"audio1","driver":"sdl"}' \
-display sdl \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-default-spice.args
b/tests/qemuxml2argvdata/audio-default-spice.args
index a09070590a..2b6946e99a 100644
--- a/tests/qemuxml2argvdata/audio-default-spice.args
+++ b/tests/qemuxml2argvdata/audio-default-spice.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,6 +27,7 @@ QEMU_AUDIO_DRV=spice \
-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 \
+-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice port=0,seamless-migration=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/audio-default-vnc.args
b/tests/qemuxml2argvdata/audio-default-vnc.args
index 68090930d8..862bde252f 100644
--- a/tests/qemuxml2argvdata/audio-default-vnc.args
+++ b/tests/qemuxml2argvdata/audio-default-vnc.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=alsa \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,6 +27,7 @@ QEMU_AUDIO_DRV=alsa \
-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 \
--vnc 127.0.0.1:0 \
+-audiodev
'{"id":"audio1","driver":"alsa"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/autoindex.args
b/tests/qemuxml2argvdata/autoindex.args
index 85bb41e5b8..08a496c9b7 100644
--- a/tests/qemuxml2argvdata/autoindex.args
+++ b/tests/qemuxml2argvdata/autoindex.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -57,4 +56,5 @@ QEMU_AUDIO_DRV=none \
-device ich9-usb-ehci1,id=usb4,bus=pci.2,addr=0x2.0x7 \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
index 45fecc17b8..558fd23a06 100644
--- a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -25,5 +24,6 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-ccw,id=balloon0,deflate-on-oom=on,devno=fe.0.000a \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args
b/tests/qemuxml2argvdata/balloon-device-auto.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/balloon-device-auto.args
+++ b/tests/qemuxml2argvdata/balloon-device-auto.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
index c4deb228b3..de5a740a5c 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,deflate-on-oom=off,bus=pci.0,addr=0x12 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args
b/tests/qemuxml2argvdata/balloon-device-deflate.args
index 6b4d8742ce..060e1fc617 100644
--- a/tests/qemuxml2argvdata/balloon-device-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-device-deflate.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,deflate-on-oom=on,bus=pci.0,addr=0x12 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device-period.args
b/tests/qemuxml2argvdata/balloon-device-period.args
index a56b89a980..7ca265fd15 100644
--- a/tests/qemuxml2argvdata/balloon-device-period.args
+++ b/tests/qemuxml2argvdata/balloon-device-period.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-device.args
b/tests/qemuxml2argvdata/balloon-device.args
index a56b89a980..7ca265fd15 100644
--- a/tests/qemuxml2argvdata/balloon-device.args
+++ b/tests/qemuxml2argvdata/balloon-device.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x12 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
index 6837a3e578..78b52d8389 100644
--- a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
+++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-aarch64test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=aarch64test,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-initrd /aarch64.initrd \
-append 'earlyprintk console=ttyAMA0,115200n8 rw root=/dev/vda rootwait' \
-dtb /aarch64.dtb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-device,id=balloon0,deflate-on-oom=on \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/blkiotune-device.args
b/tests/qemuxml2argvdata/blkiotune-device.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/blkiotune-device.args
+++ b/tests/qemuxml2argvdata/blkiotune-device.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/blkiotune.args
b/tests/qemuxml2argvdata/blkiotune.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/blkiotune.args
+++ b/tests/qemuxml2argvdata/blkiotune.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-cdrom.args
b/tests/qemuxml2argvdata/boot-cdrom.args
index 57113954e0..59095372f5 100644
--- a/tests/qemuxml2argvdata/boot-cdrom.args
+++ b/tests/qemuxml2argvdata/boot-cdrom.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-complex.args
b/tests/qemuxml2argvdata/boot-complex.args
index bee8a4cc74..bf97a62e1b 100644
--- a/tests/qemuxml2argvdata/boot-complex.args
+++ b/tests/qemuxml2argvdata/boot-complex.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -46,4 +45,5 @@ QEMU_AUDIO_DRV=none \
-device
virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:11,bootindex=2,bus=pci.0,addr=0x2
\
-netdev user,id=hostnet1 \
-device virtio-net-pci,netdev=hostnet1,id=net1,mac=00:11:22:33:44:22,bus=pci.0,addr=0x3
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.args
b/tests/qemuxml2argvdata/boot-floppy-q35.args
index 079d660d92..632664c46b 100644
--- a/tests/qemuxml2argvdata/boot-floppy-q35.args
+++ b/tests/qemuxml2argvdata/boot-floppy-q35.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-floppy.args
b/tests/qemuxml2argvdata/boot-floppy.args
index 132a8a1105..b449214b7f 100644
--- a/tests/qemuxml2argvdata/boot-floppy.args
+++ b/tests/qemuxml2argvdata/boot-floppy.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -32,4 +31,5 @@ QEMU_AUDIO_DRV=none \
-drive file=/tmp/firmware.img,format=raw,if=none,id=drive-fdc0-0-0 \
-global isa-fdc.driveA=drive-fdc0-0-0 \
-global isa-fdc.bootindexA=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
index 43237975da..3538921f0e 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args
b/tests/qemuxml2argvdata/boot-menu-disable.args
index 43237975da..3538921f0e 100644
--- a/tests/qemuxml2argvdata/boot-menu-disable.args
+++ b/tests/qemuxml2argvdata/boot-menu-disable.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
index c634edde42..4a799dfe10 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args
b/tests/qemuxml2argvdata/boot-menu-enable.args
index 882046b3a0..5b5cf2c559 100644
--- a/tests/qemuxml2argvdata/boot-menu-enable.args
+++ b/tests/qemuxml2argvdata/boot-menu-enable.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-multi.args
b/tests/qemuxml2argvdata/boot-multi.args
index 882046b3a0..5b5cf2c559 100644
--- a/tests/qemuxml2argvdata/boot-multi.args
+++ b/tests/qemuxml2argvdata/boot-multi.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-network.args
b/tests/qemuxml2argvdata/boot-network.args
index 680b276300..30369ad55e 100644
--- a/tests/qemuxml2argvdata/boot-network.args
+++ b/tests/qemuxml2argvdata/boot-network.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/boot-order.args
b/tests/qemuxml2argvdata/boot-order.args
index 613b322310..241639546f 100644
--- a/tests/qemuxml2argvdata/boot-order.args
+++ b/tests/qemuxml2argvdata/boot-order.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -38,5 +37,6 @@ QEMU_AUDIO_DRV=none \
-global isa-fdc.bootindexB=4 \
-netdev user,id=hostnet0 \
-device
virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bootindex=2,bus=pci.0,addr=0x2
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args
b/tests/qemuxml2argvdata/channel-guestfwd.args
index fcd063fc2c..52411f9289 100644
--- a/tests/qemuxml2argvdata/channel-guestfwd.args
+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev pipe,id=charchannel0,path=/tmp/guestfwd \
-netdev user,guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,id=channel0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args
b/tests/qemuxml2argvdata/channel-spicevmc.args
index 45af2ac258..0671ae2660 100644
--- a/tests/qemuxml2argvdata/channel-spicevmc.args
+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,6 +30,7 @@ QEMU_AUDIO_DRV=spice \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev spicevmc,id=charchannel0,name=vdagent \
-device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=com.redhat.spice.0
\
+-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice
port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,tls-channel=main,seamless-migration=on
\
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args
b/tests/qemuxml2argvdata/channel-virtio-auto.args
index 72a1a38bd6..311860cc67 100644
--- a/tests/qemuxml2argvdata/channel-virtio-auto.args
+++ b/tests/qemuxml2argvdata/channel-virtio-auto.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -44,5 +43,6 @@ QEMU_AUDIO_DRV=none \
-device
virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh
\
-chardev pty,id=charchannel5 \
-device
virtserialport,bus=virtio-serial2.0,nr=1,chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
index a1e7f70467..e78c7a758b 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -43,5 +42,6 @@ QEMU_AUDIO_DRV=none \
-device
virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh
\
-chardev pty,id=charchannel5 \
-device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
index 528c8309bc..5974937da3 100644
--- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -43,5 +42,6 @@ QEMU_AUDIO_DRV=none \
-device
virtserialport,bus=virtio-serial1.0,nr=2,chardev=charchannel4,id=channel4,name=org.linux-kvm.port.ooh
\
-chardev pty,id=charchannel5 \
-device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel5,id=channel5,name=org.linux-kvm.port.lla
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args
b/tests/qemuxml2argvdata/channel-virtio-default.args
index b4e22e6c6b..278ce4b731 100644
--- a/tests/qemuxml2argvdata/channel-virtio-default.args
+++ b/tests/qemuxml2argvdata/channel-virtio-default.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -34,6 +33,7 @@ QEMU_AUDIO_DRV=spice \
-device virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0 \
-chardev spicevmc,id=charchannel1,name=vdagent \
-device
virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=com.redhat.spice.0
\
+-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice port=0,seamless-migration=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args
b/tests/qemuxml2argvdata/channel-virtio-state.args
index bb3ee46aa5..ea49528e02 100644
--- a/tests/qemuxml2argvdata/channel-virtio-state.args
+++ b/tests/qemuxml2argvdata/channel-virtio-state.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -36,5 +35,6 @@ QEMU_AUDIO_DRV=none \
-device
virtserialport,bus=virtio-serial1.0,nr=4,chardev=charchannel1,id=channel1,name=org.linux-kvm.port.foo1
\
-chardev pty,id=charchannel2 \
-device
virtserialport,bus=virtio-serial1.0,nr=5,chardev=charchannel2,id=channel2,name=org.linux-kvm.port.foo2
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args
b/tests/qemuxml2argvdata/channel-virtio-unix.args
index 5b36bf921b..45a102bbac 100644
--- a/tests/qemuxml2argvdata/channel-virtio-unix.args
+++ b/tests/qemuxml2argvdata/channel-virtio-unix.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -39,4 +38,5 @@ QEMU_AUDIO_DRV=none \
-device
virtserialport,bus=virtio-serial0.0,nr=3,chardev=charchannel2,id=channel2,name=ble \
-chardev socket,id=charchannel3,fd=1729,server=on,wait=off \
-device
virtserialport,bus=virtio-serial0.0,nr=4,chardev=charchannel3,id=channel3,name=fdsa \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/channel-virtio.args
b/tests/qemuxml2argvdata/channel-virtio.args
index 34ea509d0a..c96c019b6c 100644
--- a/tests/qemuxml2argvdata/channel-virtio.args
+++ b/tests/qemuxml2argvdata/channel-virtio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev pty,id=charchannel0 \
-device
virtserialport,bus=virtio-serial1.0,nr=3,chardev=charchannel0,id=channel0,name=org.linux-kvm.port.foo
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args
b/tests/qemuxml2argvdata/chardev-reconnect.args
index e184ee1879..87b7feabc5 100644
--- a/tests/qemuxml2argvdata/chardev-reconnect.args
+++ b/tests/qemuxml2argvdata/chardev-reconnect.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -36,6 +35,7 @@ QEMU_AUDIO_DRV=none \
-device
virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=asdf \
-chardev socket,id=charchannel1,path=/tmp/channel/fdsa,reconnect=0 \
-device
virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=fdsa \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-chardev socket,id=charredir0,host=localhost,port=3456,reconnect=15 \
-device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=2 \
-chardev socket,id=charrng0,host=localhost,port=2345,reconnect=5 \
diff --git a/tests/qemuxml2argvdata/clock-catchup.args
b/tests/qemuxml2argvdata/clock-catchup.args
index a342d82f66..0ec9e70f22 100644
--- a/tests/qemuxml2argvdata/clock-catchup.args
+++ b/tests/qemuxml2argvdata/clock-catchup.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-france.args
b/tests/qemuxml2argvdata/clock-france.args
index 0094082533..a5a8f3a088 100644
--- a/tests/qemuxml2argvdata/clock-france.args
+++ b/tests/qemuxml2argvdata/clock-france.args
@@ -7,7 +7,6 @@ XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
TZ=Europe/Paris \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args
b/tests/qemuxml2argvdata/clock-hpet-off.args
index ec0a34fed8..1979882c36 100644
--- a/tests/qemuxml2argvdata/clock-hpet-off.args
+++ b/tests/qemuxml2argvdata/clock-hpet-off.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
index 433037ae31..3a03f782c0 100644
--- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-localtime.args
b/tests/qemuxml2argvdata/clock-localtime.args
index 4fba3aa9cd..7cd450c9be 100644
--- a/tests/qemuxml2argvdata/clock-localtime.args
+++ b/tests/qemuxml2argvdata/clock-localtime.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-realtime.args
b/tests/qemuxml2argvdata/clock-realtime.args
index 63c983f023..4b9321552f 100644
--- a/tests/qemuxml2argvdata/clock-realtime.args
+++ b/tests/qemuxml2argvdata/clock-realtime.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
index 0505bfcaf3..dcef2edda3 100644
--- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 b5f235f530..39bc2c0a6e 100644
--- a/tests/qemuxml2argvdata/clock-utc.args
+++ b/tests/qemuxml2argvdata/clock-utc.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/clock-variable.args
b/tests/qemuxml2argvdata/clock-variable.args
index 6dd7483a5a..9d03ac30ff 100644
--- a/tests/qemuxml2argvdata/clock-variable.args
+++ b/tests/qemuxml2argvdata/clock-variable.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-compat-auto.args
b/tests/qemuxml2argvdata/console-compat-auto.args
index 30d6d5545c..cf08357b27 100644
--- a/tests/qemuxml2argvdata/console-compat-auto.args
+++ b/tests/qemuxml2argvdata/console-compat-auto.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev pty,id=charserial0 \
-device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args
b/tests/qemuxml2argvdata/console-compat-chardev.args
index 30d6d5545c..cf08357b27 100644
--- a/tests/qemuxml2argvdata/console-compat-chardev.args
+++ b/tests/qemuxml2argvdata/console-compat-chardev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev pty,id=charserial0 \
-device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-compat.args
b/tests/qemuxml2argvdata/console-compat.args
index 66c2224d6e..7013b6b570 100644
--- a/tests/qemuxml2argvdata/console-compat.args
+++ b/tests/qemuxml2argvdata/console-compat.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev pty,id=charserial0 \
-device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args
b/tests/qemuxml2argvdata/console-virtio-ccw.args
index ba897d7ba5..a663029542 100644
--- a/tests/qemuxml2argvdata/console-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/console-virtio-ccw.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
-device
virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-virtio-many.args
b/tests/qemuxml2argvdata/console-virtio-many.args
index 0fd92ac96a..534d75fbee 100644
--- a/tests/qemuxml2argvdata/console-virtio-many.args
+++ b/tests/qemuxml2argvdata/console-virtio-many.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -38,5 +37,6 @@ QEMU_AUDIO_DRV=none \
-device virtconsole,chardev=charconsole2,id=console2 \
-chardev pty,id=charconsole3 \
-device virtconsole,chardev=charconsole3,id=console3 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/console-virtio.args
b/tests/qemuxml2argvdata/console-virtio.args
index 7498dac2f8..c11c01ed2f 100644
--- a/tests/qemuxml2argvdata/console-virtio.args
+++ b/tests/qemuxml2argvdata/console-virtio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/controller-order.args
b/tests/qemuxml2argvdata/controller-order.args
index 8cfe69206e..9fcc9560f6 100644
--- a/tests/qemuxml2argvdata/controller-order.args
+++ b/tests/qemuxml2argvdata/controller-order.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fdr/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-fdr/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr/.config \
-QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr,debug-threads=on \
-S \
@@ -41,10 +40,11 @@ QEMU_AUDIO_DRV=spice \
-chardev spicevmc,id=charchannel0,name=vdagent \
-device
virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=com.redhat.spice.0
\
-device usb-tablet,id=input0,bus=usb.0,port=1.2 \
+-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice
port=5901,tls-port=5902,addr=0.0.0.0,x509-dir=/etc/pki/libvirt-spice,seamless-migration=on
\
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device intel-hda,id=sound0,bus=pci.0,addr=0x4 \
--device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
+-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0,audiodev=audio1 \
-device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb.0,port=2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
index da0493037a..560d845240 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 f459b38629..0db0ef998e 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 1cf23a883f..6bbcb68acb 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell2.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 401daa8ab2..4c6b79bd49 100644
--- a/tests/qemuxml2argvdata/cpu-Haswell3.args
+++ b/tests/qemuxml2argvdata/cpu-Haswell3.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 a8cc26577a..a4475fa592 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 9df5eee09b..f56551df79 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 d71cb3158f..d82582f66d 100644
--- a/tests/qemuxml2argvdata/cpu-cache-disable3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 eca256ece7..af7d0d6ae3 100644
--- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
+++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 dabf914768..22de341498 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 0aed025962..451643b43f 100644
--- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 7e56f1d584..bdcc09d7ac 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 7f11de3f59..96cba2a377 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-none2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 f1cccef206..e5da3d93cf 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 838ddfca7e..01c96a8382 100644
--- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
+++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 838ddfca7e..01c96a8382 100644
--- a/tests/qemuxml2argvdata/cpu-check-none.args
+++ b/tests/qemuxml2argvdata/cpu-check-none.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 8bd42174f8..aa9aec3f12 100644
--- a/tests/qemuxml2argvdata/cpu-exact1.args
+++ b/tests/qemuxml2argvdata/cpu-exact1.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 343d98c194..134547d3b9 100644
--- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
+++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 343d98c194..134547d3b9 100644
--- a/tests/qemuxml2argvdata/cpu-exact2.args
+++ b/tests/qemuxml2argvdata/cpu-exact2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 fb9a5e0b92..7aab132fb7 100644
--- a/tests/qemuxml2argvdata/cpu-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-fallback.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 679659a4a9..88b7d9ed0e 100644
--- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 723315d636..2fe3594248 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 9a6c527b28..143b663679 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 f091d6fe9d..5e489f3647 100644
--- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
+++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 c0603e1d5c..5360947e3d 100644
--- a/tests/qemuxml2argvdata/cpu-host-model.args
+++ b/tests/qemuxml2argvdata/cpu-host-model.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
-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 \
-device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
index 8f1991eceb..56597bafdf 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args
b/tests/qemuxml2argvdata/cpu-host-passthrough.args
index 7e56f1d584..bdcc09d7ac 100644
--- a/tests/qemuxml2argvdata/cpu-host-passthrough.args
+++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 419e8df7c2..8f873405f5 100644
--- a/tests/qemuxml2argvdata/cpu-hotplug-startup.args
+++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 260481b4d2..4093e2579b 100644
--- a/tests/qemuxml2argvdata/cpu-kvmclock.args
+++ b/tests/qemuxml2argvdata/cpu-kvmclock.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 5ea11420a6..9aa70f0ae4 100644
--- a/tests/qemuxml2argvdata/cpu-minimum1.args
+++ b/tests/qemuxml2argvdata/cpu-minimum1.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 fe9aa6e9ef..8096c7092b 100644
--- a/tests/qemuxml2argvdata/cpu-minimum2.args
+++ b/tests/qemuxml2argvdata/cpu-minimum2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 838ddfca7e..01c96a8382 100644
--- a/tests/qemuxml2argvdata/cpu-no-removed-features.args
+++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 491aa46dc4..c7a4067ba9 100644
--- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
+++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 0a57a591f5..4d359b0389 100644
--- a/tests/qemuxml2argvdata/cpu-numa-memshared.args
+++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 fef06295f3..a2895fd136 100644
--- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
+++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 fef06295f3..a2895fd136 100644
--- a/tests/qemuxml2argvdata/cpu-numa1.args
+++ b/tests/qemuxml2argvdata/cpu-numa1.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 fef06295f3..a2895fd136 100644
--- a/tests/qemuxml2argvdata/cpu-numa2.args
+++ b/tests/qemuxml2argvdata/cpu-numa2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 65071a6dd7..6935e7fcbb 100644
--- a/tests/qemuxml2argvdata/cpu-s390-features.args
+++ b/tests/qemuxml2argvdata/cpu-s390-features.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=guest1,debug-threads=on \
-S \
@@ -26,4 +25,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-s390-zEC12.args
b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
index a07864750c..401d794c0f 100644
--- a/tests/qemuxml2argvdata/cpu-s390-zEC12.args
+++ b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=guest1,debug-threads=on \
-S \
@@ -26,4 +25,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cpu-strict1.args
b/tests/qemuxml2argvdata/cpu-strict1.args
index 693a97bf1f..e3a02dfec9 100644
--- a/tests/qemuxml2argvdata/cpu-strict1.args
+++ b/tests/qemuxml2argvdata/cpu-strict1.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 762dba1fb1..997b081067 100644
--- a/tests/qemuxml2argvdata/cpu-topology1.args
+++ b/tests/qemuxml2argvdata/cpu-topology1.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 91a5e52240..1c81a5d558 100644
--- a/tests/qemuxml2argvdata/cpu-topology2.args
+++ b/tests/qemuxml2argvdata/cpu-topology2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 762dba1fb1..997b081067 100644
--- a/tests/qemuxml2argvdata/cpu-topology3.args
+++ b/tests/qemuxml2argvdata/cpu-topology3.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 14a88139bf..88266e8281 100644
--- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
+++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 c61d93067f..dbadcb9ec5 100644
--- a/tests/qemuxml2argvdata/cputune-numatune.args
+++ b/tests/qemuxml2argvdata/cputune-numatune.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-dummy2/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-dummy2/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-dummy2/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=dummy2,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args
b/tests/qemuxml2argvdata/cputune-zero-shares.args
index 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/cputune-zero-shares.args
+++ b/tests/qemuxml2argvdata/cputune-zero-shares.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args
index 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/cputune.args
+++ b/tests/qemuxml2argvdata/cputune.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args
b/tests/qemuxml2argvdata/default-kvm-host-arch.args
index 31f9c7b6da..9fcef59b7e 100644
--- a/tests/qemuxml2argvdata/default-kvm-host-arch.args
+++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-kvm/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-kvm/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-kvm/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=kvm,debug-threads=on \
-S \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 8fa501dd99..1e9878be2f 100644
--- a/tests/qemuxml2argvdata/default-qemu-host-arch.args
+++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-qemu-host/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-qemu-host/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-qemu-host/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=qemu-host,debug-threads=on \
-S \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
index 7067024402..048da754c5 100644
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-instance-00000092/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=instance-00000092,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 c857f96a0b..39f05c28d7 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-instance-00000092/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=instance-00000092,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 506291be24..9d8866d914 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-instance-00000092/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=instance-00000092,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 aacfa63e41..39ab4e0f2d 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-instance-00000092/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-instance-00000092/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-instance-00000092/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=instance-00000092,debug-threads=on \
-S \
@@ -33,5 +32,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-bios.args
b/tests/qemuxml2argvdata/firmware-manual-bios.args
index e1cb064b71..4f2ac0c682 100644
--- a/tests/qemuxml2argvdata/firmware-manual-bios.args
+++ b/tests/qemuxml2argvdata/firmware-manual-bios.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=test-bios,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
index ef98c940f7..3ff17a498e 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-aarch64.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args
b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args
index 0c5e3413c3..776f9fb467 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-acpi-q35.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
index f3aa947e52..a0dcc22db2 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-noacpi-aarch64.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
b/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
index fe0f78599b..94ee0e48c0 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi-secure.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test-bios,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi.args
b/tests/qemuxml2argvdata/firmware-manual-efi.args
index ac5f86dc83..8fb23cc1e6 100644
--- a/tests/qemuxml2argvdata/firmware-manual-efi.args
+++ b/tests/qemuxml2argvdata/firmware-manual-efi.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test-bios/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test-bios,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args
b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args
index d97ac2f634..b1c54a66e3 100644
--- a/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args
+++ b/tests/qemuxml2argvdata/firmware-manual-noefi-acpi-q35.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
-S \
@@ -25,4 +24,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args
b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args
index 293085b105..7efdf3c17f 100644
--- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args
+++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-aarch64.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
@@ -26,4 +25,5 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args
b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args
index c5e067853e..d0c35d1ef7 100644
--- a/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args
+++ b/tests/qemuxml2argvdata/firmware-manual-noefi-noacpi-q35.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
-S \
@@ -26,4 +25,5 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
index 2ee9d246bb..fb11171ed5 100644
--- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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-unassigned.args
b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
index b60c0a8930..06baf15bf1 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-delete/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-delete/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-delete/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=delete,debug-threads=on \
-S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 \
-device vfio-pci,host=0005:90:01.3,id=hostdev3,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
index 5cb7d5e722..40e27373b6 100644
--- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
+++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-delete/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-delete/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-delete/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=delete,debug-threads=on \
-S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 \
-device vfio-pci,host=0001:01:00.0,id=hostdev2,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
index 56e4238d1c..fa3ef73d7b 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest2,debug-threads=on \
-S \
@@ -28,6 +27,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device vhost-scsi-ccw,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,devno=fe.0.0002 \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0003 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
index 10828ecb49..d322962660 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
@@ -30,6 +29,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.0,addr=0x2
\
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
index a296367a11..098404ec3a 100644
--- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
-device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device vhost-scsi-pci,wwpn=naa.5123456789abcde0,vhostfd=3,id=hostdev0,bus=pci.1,addr=0x0
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
index 20ed633390..59e17b65fd 100644
--- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
+++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -25,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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-vfio-multidomain.args
b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
index 141c960785..eb113edeeb 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
index 0e99410315..0b9cca797d 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-fids.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -25,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 b8d17fd765..da7a684394 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate-uids.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -25,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 2fd50e6275..44c7416881 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -25,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 4011f99bbb..62b2472959 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device zpci,uid=65535,fid=4294967295,target=hostdev0,id=zpci65535 \
-device vfio-pci,host=ffff:00:00.0,id=hostdev0,bus=pci.1,addr=0x1f \
-device zpci,uid=1,fid=0,target=hostdev1,id=zpci1 \
diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
index fbf2cf4c9c..95ab50cb92 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-ccw-memballoon.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-KVMGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-KVMGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-KVMGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=KVMGuest1,debug-threads=on \
-S \
@@ -25,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 499b55a2b5..8761df3267 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -25,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 c4ee9e211f..9df47029be 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -25,6 +24,7 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 0928d2c05b..fcdf5f8aeb 100644
--- a/tests/qemuxml2argvdata/hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/hostdev-vfio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device vfio-pci,host=0000:06:12.1,id=hostdev0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hotplug-base.args
b/tests/qemuxml2argvdata/hotplug-base.args
index 34e4fbc11a..0467c76c55 100644
--- a/tests/qemuxml2argvdata/hotplug-base.args
+++ b/tests/qemuxml2argvdata/hotplug-base.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-hotplug/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-hotplug/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-hotplug/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=hotplug,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-device virtio-scsi-pci,id=scsi0,bus=pci.0,addr=0x3 \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x4 \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.args
b/tests/qemuxml2argvdata/hugepages-default-2M.args
index c31dca0eab..55aa0e8f52 100644
--- a/tests/qemuxml2argvdata/hugepages-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.args
b/tests/qemuxml2argvdata/hugepages-default-system-size.args
index 1e15f36c3b..ba2fcb6d67 100644
--- a/tests/qemuxml2argvdata/hugepages-default-system-size.args
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-default.args
b/tests/qemuxml2argvdata/hugepages-default.args
index 1a9dacc7fd..9bfb277454 100644
--- a/tests/qemuxml2argvdata/hugepages-default.args
+++ b/tests/qemuxml2argvdata/hugepages-default.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 58ca7a73a0..03f6c3fc4f 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -39,5 +38,6 @@ QEMU_AUDIO_DRV=none \
-device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args
b/tests/qemuxml2argvdata/hugepages-memaccess2.args
index 675f7af92c..f35001d39f 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.args
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -39,5 +38,6 @@ QEMU_AUDIO_DRV=none \
-device pc-dimm,node=1,memdev=memdimm0,id=dimm0,slot=0,addr=4294967296 \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.args
b/tests/qemuxml2argvdata/hugepages-nodeset.args
index c31dca0eab..55aa0e8f52 100644
--- a/tests/qemuxml2argvdata/hugepages-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-nodeset.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
index 6cce82feaf..75c0e8e7ca 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
index 1c2fb4d1af..0cde2b06d3 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=fedora,debug-threads=on \
-S \
@@ -32,4 +31,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-object
memory-backend-file,id=memdimm0,mem-path=/dev/hugepages1G/libvirt/qemu/-1-fedora,size=1073741824,host-nodes=1-3,policy=bind
\
-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.args
b/tests/qemuxml2argvdata/hugepages-numa-default.args
index e13c3f54c9..ea1766ab2f 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-default.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=fedora,debug-threads=on \
-S \
@@ -30,4 +29,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
index 13143db59b..5af3aa370e 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
index ca59b1bbd8..89018d92a2 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -35,4 +34,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hugepages-shared.args
b/tests/qemuxml2argvdata/hugepages-shared.args
index 0462327cf1..37f9ae9efa 100644
--- a/tests/qemuxml2argvdata/hugepages-shared.args
+++ b/tests/qemuxml2argvdata/hugepages-shared.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -37,5 +36,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
index 3c7747ee51..5de677d678 100644
--- a/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
+++ b/tests/qemuxml2argvdata/hvf-aarch64-virt-headless.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=test,debug-threads=on \
-S \
@@ -42,6 +41,7 @@ QEMU_AUDIO_DRV=none \
-serial chardev:charserial0 \
-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
-device
virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x0 \
-object rng-random,id=objrng0,filename=/dev/urandom \
-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.5,addr=0x0 \
diff --git a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
index 859d3a923d..a9b30271d4 100644
--- a/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
+++ b/tests/qemuxml2argvdata/hvf-x86_64-q35-headless.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=test,debug-threads=on \
-S \
@@ -41,6 +40,7 @@ QEMU_AUDIO_DRV=none \
-device isa-serial,chardev=charserial0,id=serial0,index=0 \
-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
-device
virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x0 \
-object rng-random,id=objrng0,filename=/dev/urandom \
-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.5,addr=0x0 \
diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args
b/tests/qemuxml2argvdata/input-usbmouse-addr.args
index bcd048d917..286582b06d 100644
--- a/tests/qemuxml2argvdata/input-usbmouse-addr.args
+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
-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 \
-device usb-mouse,id=input0,bus=usb.0,port=2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/input-usbmouse.args
b/tests/qemuxml2argvdata/input-usbmouse.args
index 4f7a844a74..f13ac6625a 100644
--- a/tests/qemuxml2argvdata/input-usbmouse.args
+++ b/tests/qemuxml2argvdata/input-usbmouse.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,4 +29,5 @@ QEMU_AUDIO_DRV=none \
-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 \
-device usb-mouse,id=input0,bus=usb.0,port=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/input-usbtablet.args
b/tests/qemuxml2argvdata/input-usbtablet.args
index 8b72174cee..53df43196d 100644
--- a/tests/qemuxml2argvdata/input-usbtablet.args
+++ b/tests/qemuxml2argvdata/input-usbtablet.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,4 +29,5 @@ QEMU_AUDIO_DRV=none \
-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 \
-device usb-tablet,id=input0,bus=usb.0,port=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.args
b/tests/qemuxml2argvdata/input-virtio-ccw.args
index 0d980cbfba..a99eca6353 100644
--- a/tests/qemuxml2argvdata/input-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/input-virtio-ccw.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
-device virtio-keyboard-ccw,id=input0,devno=fe.0.0002 \
-device virtio-mouse-ccw,id=input1,devno=fe.0.0003 \
-device virtio-tablet-ccw,id=input2,devno=fe.0.0004 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
index 32ae662b14..4a487475d6 100644
--- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-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 \
-device
virtio-blk-ccw,iothread=iothread2,devno=0.0.0007,drive=drive-virtio-disk1,id=virtio-disk1
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/iothreads-disk.args
b/tests/qemuxml2argvdata/iothreads-disk.args
index a8d27bf01e..8a4109872e 100644
--- a/tests/qemuxml2argvdata/iothreads-disk.args
+++ b/tests/qemuxml2argvdata/iothreads-disk.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -35,4 +34,5 @@ QEMU_AUDIO_DRV=none \
-device
virtio-blk-pci,iothread=iothread1,bus=pci.0,addr=0x4,drive=drive-virtio-disk1,id=virtio-disk1
\
-drive
file=/var/lib/libvirt/images/iothrtest2.img,format=raw,if=none,id=drive-virtio-disk2 \
-device
virtio-blk-pci,iothread=iothread2,bus=pci.0,addr=0x2,drive=drive-virtio-disk2,id=virtio-disk2
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.args
b/tests/qemuxml2argvdata/iothreads-ids-partial.args
index b5dbc8694b..5eadf315db 100644
--- a/tests/qemuxml2argvdata/iothreads-ids-partial.args
+++ b/tests/qemuxml2argvdata/iothreads-ids-partial.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -33,4 +32,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/iothreads-ids.args
b/tests/qemuxml2argvdata/iothreads-ids.args
index 52e28727d3..f591475f10 100644
--- a/tests/qemuxml2argvdata/iothreads-ids.args
+++ b/tests/qemuxml2argvdata/iothreads-ids.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/iothreads.args
b/tests/qemuxml2argvdata/iothreads.args
index a72be41a3d..e6e6e2b99b 100644
--- a/tests/qemuxml2argvdata/iothreads.args
+++ b/tests/qemuxml2argvdata/iothreads.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-features-off.args
b/tests/qemuxml2argvdata/kvm-features-off.args
index e14cc44b5b..6c878f5bc5 100644
--- a/tests/qemuxml2argvdata/kvm-features-off.args
+++ b/tests/qemuxml2argvdata/kvm-features-off.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-features.args
b/tests/qemuxml2argvdata/kvm-features.args
index 9c0a56d361..3ff3cc85a4 100644
--- a/tests/qemuxml2argvdata/kvm-features.args
+++ b/tests/qemuxml2argvdata/kvm-features.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args
b/tests/qemuxml2argvdata/kvm-pit-delay.args
index 09e8d5ec3b..f8cc371367 100644
--- a/tests/qemuxml2argvdata/kvm-pit-delay.args
+++ b/tests/qemuxml2argvdata/kvm-pit-delay.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args
b/tests/qemuxml2argvdata/kvm-pit-discard.args
index c8e25b07ad..e9cc6a7576 100644
--- a/tests/qemuxml2argvdata/kvm-pit-discard.args
+++ b/tests/qemuxml2argvdata/kvm-pit-discard.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args
index 537466067c..e038c038eb 100644
--- a/tests/qemuxml2argvdata/kvmclock.args
+++ b/tests/qemuxml2argvdata/kvmclock.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
index ad3ea235ae..f433f14ff7 100644
--- a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
+++ b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-device virtio-serial-device,id=virtio-serial0 \
-chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-native.args
b/tests/qemuxml2argvdata/mach-virt-serial-native.args
index a5f60e10b2..7fc8cfa300 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-native.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-native.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-chardev pty,id=charserial0 \
-serial chardev:charserial0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
index 3f6f66bd0a..dbd45881fa 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-device pcie-root-port,port=16,chassis=3,id=pci.3,bus=pcie.0,addr=0x2 \
-chardev pty,id=charserial0 \
-device pci-serial,chardev=charserial0,id=serial0,bus=pci.2,addr=0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
index 7b65f5bbbc..892aac76b8 100644
--- a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
+++ b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-aarch64 \
-name guest=guest,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-device qemu-xhci,id=usb,bus=pci.1,addr=0x0 \
-chardev pty,id=charserial0 \
-device usb-serial,chardev=charserial0,id=serial0,bus=usb.0,port=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
index 276edec05b..cdaa726832 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
index 276edec05b..cdaa726832 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
index 373deaed52..7987b3ed22 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
index 373deaed52..7987b3ed22 100644
--- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aliases1.args
b/tests/qemuxml2argvdata/machine-aliases1.args
index 038b660afe..c9f0f917a7 100644
--- a/tests/qemuxml2argvdata/machine-aliases1.args
+++ b/tests/qemuxml2argvdata/machine-aliases1.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-aliases2.args
b/tests/qemuxml2argvdata/machine-aliases2.args
index 8b87006b0b..670a622d1c 100644
--- a/tests/qemuxml2argvdata/machine-aliases2.args
+++ b/tests/qemuxml2argvdata/machine-aliases2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-core-off.args
b/tests/qemuxml2argvdata/machine-core-off.args
index b5f235f530..39bc2c0a6e 100644
--- a/tests/qemuxml2argvdata/machine-core-off.args
+++ b/tests/qemuxml2argvdata/machine-core-off.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-core-on.args
b/tests/qemuxml2argvdata/machine-core-on.args
index 4c3cbb1117..1ff7a360fa 100644
--- a/tests/qemuxml2argvdata/machine-core-on.args
+++ b/tests/qemuxml2argvdata/machine-core-on.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
index 55db1edc3f..77b3be6d58 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
index 55db1edc3f..77b3be6d58 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
index 3617cdccac..bd2632e2b6 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
index 3617cdccac..bd2632e2b6 100644
--- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
index c107313e88..83fd401afa 100644
--- a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.args
b/tests/qemuxml2argvdata/machine-keywrap-none.args
index c107313e88..83fd401afa 100644
--- a/tests/qemuxml2argvdata/machine-keywrap-none.args
+++ b/tests/qemuxml2argvdata/machine-keywrap-none.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 36abcb8b07..d544f88a17 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -33,5 +32,6 @@ QEMU_AUDIO_DRV=none \
-device
virtio-net-ccw,netdev=hostnet0,id=net0,mac=00:11:22:33:44:54,bootindex=2,devno=fe.0.0000
\
-netdev user,id=hostnet1 \
-device virtio-net-ccw,netdev=hostnet1,id=net1,mac=00:11:22:33:42:36,devno=fe.0.0004 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
index 0df3227913..c93796967d 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-netdev user,id=hostnet0 \
-device
virtio-net-ccw,netdev=hostnet0,id=net0,mac=00:11:22:33:44:54,bootindex=1,devno=fe.0.0000
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390.args
b/tests/qemuxml2argvdata/machine-loadparm-s390.args
index db65ad22ad..d6a7b8faa5 100644
--- a/tests/qemuxml2argvdata/machine-loadparm-s390.args
+++ b/tests/qemuxml2argvdata/machine-loadparm-s390.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args
b/tests/qemuxml2argvdata/machine-vmport-opt.args
index c95c972803..8b411a83d2 100644
--- a/tests/qemuxml2argvdata/machine-vmport-opt.args
+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/master-key.args
b/tests/qemuxml2argvdata/master-key.args
index b51cdc129e..aea6e71c84 100644
--- a/tests/qemuxml2argvdata/master-key.args
+++ b/tests/qemuxml2argvdata/master-key.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
index 110b1a32b7..00d3180c73 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
-device pc-dimm,node=0,memdev=memdimm2,id=dimm2,slot=2 \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
index 3f149ecace..c4497f5040 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
-device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
index 8c19c1ed3a..028145e1e8 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,size=537001984
\
-device
nvdimm,node=0,label-size=131072,uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
index 8c19c1ed3a..028145e1e8 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-object memory-backend-file,id=memnvdimm0,mem-path=/tmp/nvdimm,prealloc=on,size=537001984
\
-device
nvdimm,node=0,label-size=131072,uuid=49545eb3-75e1-2d0a-acdd-f0294406c99e,memdev=memnvdimm0,id=nvdimm0,slot=0
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 25ae1f55dd..79b01fecfb 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma-abi-update.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-device pc-dimm,memdev=memdimm0,id=dimm0,slot=0 \
-object memory-backend-ram,id=memdimm1,size=536870912 \
-device pc-dimm,memdev=memdimm1,id=dimm1,slot=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
index f6d0b3dd6c..f509fe0581 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-device pc-dimm,memdev=memdimm0,id=dimm0,slot=0 \
-object memory-backend-ram,id=memdimm1,size=536870912 \
-device pc-dimm,memdev=memdimm1,id=dimm1,slot=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memory-hotplug.args
b/tests/qemuxml2argvdata/memory-hotplug.args
index 4557f99437..d4e717e8f9 100644
--- a/tests/qemuxml2argvdata/memory-hotplug.args
+++ b/tests/qemuxml2argvdata/memory-hotplug.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args
b/tests/qemuxml2argvdata/memtune-unlimited.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/memtune-unlimited.args
+++ b/tests/qemuxml2argvdata/memtune-unlimited.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/memtune.args
+++ b/tests/qemuxml2argvdata/memtune.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
index 9a60c80f36..b50d93a12f 100644
--- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
+++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest,debug-threads=on \
-S \
@@ -33,6 +32,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-incoming fd:7 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.args
index 5050ab76bc..4f67bef4ce 100644
--- a/tests/qemuxml2argvdata/migrate.args
+++ b/tests/qemuxml2argvdata/migrate.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-incoming tcp:10.0.0.1:5000 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/minimal.args
+++ b/tests/qemuxml2argvdata/minimal.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-acpi.args
b/tests/qemuxml2argvdata/misc-acpi.args
index ce0b66e43c..052243cd9d 100644
--- a/tests/qemuxml2argvdata/misc-acpi.args
+++ b/tests/qemuxml2argvdata/misc-acpi.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args
b/tests/qemuxml2argvdata/misc-disable-s3.args
index 874635aa41..77729307bd 100644
--- a/tests/qemuxml2argvdata/misc-disable-s3.args
+++ b/tests/qemuxml2argvdata/misc-disable-s3.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,4 +29,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args
b/tests/qemuxml2argvdata/misc-disable-suspends.args
index 7df458b259..656922aa3e 100644
--- a/tests/qemuxml2argvdata/misc-disable-suspends.args
+++ b/tests/qemuxml2argvdata/misc-disable-suspends.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args
b/tests/qemuxml2argvdata/misc-enable-s4.args
index 9b3209340b..579d508a49 100644
--- a/tests/qemuxml2argvdata/misc-enable-s4.args
+++ b/tests/qemuxml2argvdata/misc-enable-s4.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,4 +29,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/misc-uuid.args
b/tests/qemuxml2argvdata/misc-uuid.args
index ce0b66e43c..052243cd9d 100644
--- a/tests/qemuxml2argvdata/misc-uuid.args
+++ b/tests/qemuxml2argvdata/misc-uuid.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/monitor-json.args
b/tests/qemuxml2argvdata/monitor-json.args
index b10eb8d5ea..65e9e5db26 100644
--- a/tests/qemuxml2argvdata/monitor-json.args
+++ b/tests/qemuxml2argvdata/monitor-json.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-encryptdisk/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-encryptdisk/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-encryptdisk/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=encryptdisk,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args
b/tests/qemuxml2argvdata/multifunction-pci-device.args
index 4991ab3b6c..22f782a1f3 100644
--- a/tests/qemuxml2argvdata/multifunction-pci-device.args
+++ b/tests/qemuxml2argvdata/multifunction-pci-device.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -38,5 +37,6 @@ QEMU_AUDIO_DRV=none \
-usb \
-drive file=/tmp/scsidisk.img,format=raw,if=none,id=drive-scsi0-0-0 \
-device scsi-hd,bus=scsi0.0,scsi-id=0,drive=drive-scsi0-0-0,id=scsi0-0-0,bootindex=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-client.args
b/tests/qemuxml2argvdata/net-client.args
index bdee6a691f..4ae01d8b59 100644
--- a/tests/qemuxml2argvdata/net-client.args
+++ b/tests/qemuxml2argvdata/net-client.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev socket,connect=192.168.0.1:5558,id=hostnet0 \
-device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args
b/tests/qemuxml2argvdata/net-eth-hostip.args
index 587c40dc61..517c7d0144 100644
--- a/tests/qemuxml2argvdata/net-eth-hostip.args
+++ b/tests/qemuxml2argvdata/net-eth-hostip.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev tap,fd=3,id=hostnet0 \
-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args
b/tests/qemuxml2argvdata/net-eth-ifname.args
index 587c40dc61..517c7d0144 100644
--- a/tests/qemuxml2argvdata/net-eth-ifname.args
+++ b/tests/qemuxml2argvdata/net-eth-ifname.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev tap,fd=3,id=hostnet0 \
-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth-names.args
b/tests/qemuxml2argvdata/net-eth-names.args
index 325e316d7f..b639329316 100644
--- a/tests/qemuxml2argvdata/net-eth-names.args
+++ b/tests/qemuxml2argvdata/net-eth-names.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -33,5 +32,6 @@ QEMU_AUDIO_DRV=none \
-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
-netdev tap,fd=3,id=hostnet1 \
-device e1000,netdev=hostnet1,id=net1,mac=00:11:22:33:44:56,bus=pci.0,addr=0x3 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
index 5909d60490..90d9e23b31 100644
--- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
+++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev tap,fd=3,vhost=on,vhostfd=44,id=hostnet0 \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=fe:11:22:33:44:55,bus=pci.0,addr=0x2
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args
index 587c40dc61..517c7d0144 100644
--- a/tests/qemuxml2argvdata/net-eth.args
+++ b/tests/qemuxml2argvdata/net-eth.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev tap,fd=3,id=hostnet0 \
-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
index 450cd9c0b8..7467c91cd1 100644
--- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device vfio-pci,host=0000:03:07.1,id=hostdev0,bootindex=1,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
index a2805dfcbb..1dfe67a8d9 100644
--- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device vfio-pci,host=2424:21:1c.6,id=hostdev0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
index aba9a4a6ed..247a7dd790 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device vfio-pci,host=0021:de:1f.1,id=hostdev0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args
b/tests/qemuxml2argvdata/net-hostdev-vfio.args
index c3dc1a5aba..d6ef6cc3da 100644
--- a/tests/qemuxml2argvdata/net-hostdev-vfio.args
+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device vfio-pci,host=0000:06:12.1,id=hostdev0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-hostdev.args
b/tests/qemuxml2argvdata/net-hostdev.args
index 2e2e2f4639..6bbb88307a 100644
--- a/tests/qemuxml2argvdata/net-hostdev.args
+++ b/tests/qemuxml2argvdata/net-hostdev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device vfio-pci,host=0000:03:07.1,id=hostdev0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-many-models.args
b/tests/qemuxml2argvdata/net-many-models.args
index 3e128003f3..1753f328f0 100644
--- a/tests/qemuxml2argvdata/net-many-models.args
+++ b/tests/qemuxml2argvdata/net-many-models.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -38,4 +37,5 @@ QEMU_AUDIO_DRV=none \
-device ne2k_pci,netdev=hostnet4,id=net4,mac=00:11:22:33:44:58,bus=pci.0,addr=0x6 \
-netdev user,id=hostnet5 \
-device pcnet,netdev=hostnet5,id=net5,mac=00:11:22:33:44:58,bus=pci.0,addr=0x7 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-mcast.args
b/tests/qemuxml2argvdata/net-mcast.args
index ceb27541e7..bd8c3b07f8 100644
--- a/tests/qemuxml2argvdata/net-mcast.args
+++ b/tests/qemuxml2argvdata/net-mcast.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev socket,mcast=192.0.0.1:5558,id=hostnet0 \
-device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-server.args
b/tests/qemuxml2argvdata/net-server.args
index 8a304b913b..32d17e11d0 100644
--- a/tests/qemuxml2argvdata/net-server.args
+++ b/tests/qemuxml2argvdata/net-server.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev socket,listen=192.168.0.1:5558,id=hostnet0 \
-device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args
index 5cee8250f8..2100c0379d 100644
--- a/tests/qemuxml2argvdata/net-udp.args
+++ b/tests/qemuxml2argvdata/net-udp.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev socket,udp=192.168.10.1:5555,localaddr=192.168.10.1:5556,id=hostnet0 \
-device rtl8139,netdev=hostnet0,id=net0,mac=52:54:00:8c:b9:05,bus=pci.0,addr=0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-user-addr.args
b/tests/qemuxml2argvdata/net-user-addr.args
index 9bc2e554da..c71817ee53 100644
--- a/tests/qemuxml2argvdata/net-user-addr.args
+++ b/tests/qemuxml2argvdata/net-user-addr.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev
user,net=172.17.2.0/24,ipv6-prefix=2001:db8:ac10:fd01::,ipv6-prefixlen=64,id=hostnet0 \
-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args
index aef00e219b..993e9a39d4 100644
--- a/tests/qemuxml2argvdata/net-user.args
+++ b/tests/qemuxml2argvdata/net-user.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev user,id=hostnet0 \
-device rtl8139,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
index 2160756488..d56a52f88e 100644
--- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -43,4 +42,5 @@ QEMU_AUDIO_DRV=none \
-chardev socket,id=charnet4,path=/tmp/vhost3.sock,reconnect=0 \
-netdev vhost-user,chardev=charnet4,queues=4,id=hostnet4 \
-device
virtio-net-pci,mq=on,vectors=10,netdev=hostnet4,id=net4,mac=52:54:00:ee:96:6e,bus=pci.0,addr=0x6
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-vhostuser.args
b/tests/qemuxml2argvdata/net-vhostuser.args
index 877ae58c8f..b804f29d58 100644
--- a/tests/qemuxml2argvdata/net-vhostuser.args
+++ b/tests/qemuxml2argvdata/net-vhostuser.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -35,4 +34,5 @@ QEMU_AUDIO_DRV=none \
-device virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:ee:96:6c,bus=pci.0,addr=0x3
\
-netdev socket,listen=:2015,id=hostnet2 \
-device rtl8139,netdev=hostnet2,id=net2,mac=52:54:00:95:db:c0,bus=pci.0,addr=0x4 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args
b/tests/qemuxml2argvdata/net-virtio-ccw.args
index 0294aa8e31..f7cc0a8e7a 100644
--- a/tests/qemuxml2argvdata/net-virtio-ccw.args
+++ b/tests/qemuxml2argvdata/net-virtio-ccw.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-device virtio-net-ccw,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,devno=fe.0.0001 \
-netdev user,id=hostnet1 \
-device virtio-net-ccw,netdev=hostnet1,id=net1,mac=00:11:22:33:44:54,devno=fe.0.0000 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-device.args
b/tests/qemuxml2argvdata/net-virtio-device.args
index dc13103f4a..0f7f959a86 100644
--- a/tests/qemuxml2argvdata/net-virtio-device.args
+++ b/tests/qemuxml2argvdata/net-virtio-device.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev user,id=hostnet0 \
-device
virtio-net-pci,tx=bh,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
index c9cd8badaf..c0e690254c 100644
--- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev user,id=hostnet0 \
-device
virtio-net-pci,csum=off,gso=off,host_tso4=off,host_tso6=off,host_ecn=off,host_ufo=off,mrg_rxbuf=off,guest_csum=off,guest_tso4=off,guest_tso6=off,guest_ecn=off,guest_ufo=off,netdev=hostnet0,id=net0,mac=00:22:44:66:88:aa,bus=pci.0,addr=0x2
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args
b/tests/qemuxml2argvdata/net-virtio-netdev.args
index 99dc72d2ae..768e59f5c6 100644
--- a/tests/qemuxml2argvdata/net-virtio-netdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-netdev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev user,id=hostnet0 \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
index e0e7a3345b..94849c71e6 100644
--- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev user,id=hostnet0 \
-device
virtio-net-pci,rx_queue_size=512,tx_queue_size=1024,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
index f9a96a1bc0..93a7dc7037 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -33,6 +32,7 @@ QEMU_AUDIO_DRV=none \
-device
virtio-net-pci,failover=on,netdev=hostua-backup0,id=ua-backup0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x3
\
-netdev user,id=hostua-backup1 \
-device
virtio-net-pci,failover=on,netdev=hostua-backup1,id=ua-backup1,mac=66:44:33:22:11:00,bus=pci.0,addr=0x4
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
vfio-pci,host=0000:03:07.1,id=hostdev0,failover_pair_id=ua-backup0,bus=pci.0,addr=0x5 \
-device
vfio-pci,host=0000:03:07.2,id=hostdev1,failover_pair_id=ua-backup1,bus=pci.0,addr=0x6 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x7 \
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args
b/tests/qemuxml2argvdata/net-virtio-teaming.args
index 9aeab9f49f..9c6fb3b4e1 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming.args
+++ b/tests/qemuxml2argvdata/net-virtio-teaming.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -33,6 +32,7 @@ QEMU_AUDIO_DRV=none \
-device
virtio-net-pci,failover=on,netdev=hostua-backup0,id=ua-backup0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2
\
-netdev user,id=hostua-backup1 \
-device
virtio-net-pci,failover=on,netdev=hostua-backup1,id=ua-backup1,mac=66:44:33:22:11:00,bus=pci.0,addr=0x3
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
vfio-pci,host=0000:03:07.1,id=hostdev0,failover_pair_id=ua-backup0,bus=pci.0,addr=0x4 \
-device
vfio-pci,host=0000:03:07.2,id=hostdev1,failover_pair_id=ua-backup1,bus=pci.0,addr=0x5 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
diff --git a/tests/qemuxml2argvdata/net-virtio.args
b/tests/qemuxml2argvdata/net-virtio.args
index 224f9f34c0..463d2cbf2f 100644
--- a/tests/qemuxml2argvdata/net-virtio.args
+++ b/tests/qemuxml2argvdata/net-virtio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-netdev user,id=hostnet0 \
-device virtio-net-pci,netdev=hostnet0,id=net0,mac=00:11:22:33:44:55,bus=pci.0,addr=0x2
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/nosharepages.args
b/tests/qemuxml2argvdata/nosharepages.args
index 83e11b91ed..4a448f0d7b 100644
--- a/tests/qemuxml2argvdata/nosharepages.args
+++ b/tests/qemuxml2argvdata/nosharepages.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
index 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
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 3d49cd3bb0..2a5455dfaf 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
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
index 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
index 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args
index 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/numad.args
+++ b/tests/qemuxml2argvdata/numad.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
index 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args
b/tests/qemuxml2argvdata/numatune-auto-prefer.args
index 85180f80f1..13e92198e1 100644
--- a/tests/qemuxml2argvdata/numatune-auto-prefer.args
+++ b/tests/qemuxml2argvdata/numatune-auto-prefer.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 40fa6c9e65..cdcc83dc9c 100644
--- a/tests/qemuxml2argvdata/numatune-distances.args
+++ b/tests/qemuxml2argvdata/numatune-distances.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest,debug-threads=on \
-S \
@@ -68,5 +67,6 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 f2818fb668..380f813932 100644
--- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 2ba762f116..1564a0ddd6 100644
--- a/tests/qemuxml2argvdata/numatune-memnode.args
+++ b/tests/qemuxml2argvdata/numatune-memnode.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest,debug-threads=on \
-S \
@@ -33,5 +32,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 3d49cd3bb0..2a5455dfaf 100644
--- a/tests/qemuxml2argvdata/numatune-memory.args
+++ b/tests/qemuxml2argvdata/numatune-memory.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.args
b/tests/qemuxml2argvdata/numatune-no-vcpu.args
index 29cc424142..4c36544b4e 100644
--- a/tests/qemuxml2argvdata/numatune-no-vcpu.args
+++ b/tests/qemuxml2argvdata/numatune-no-vcpu.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest,debug-threads=on \
-S \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 ca6016077a..7f2cfa4234 100644
--- a/tests/qemuxml2argvdata/pages-dimm-discard.args
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fedora/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-fedora/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-fedora/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=fedora,debug-threads=on \
-S \
@@ -32,4 +31,5 @@ QEMU_AUDIO_DRV=none \
-device pc-dimm,node=0,memdev=memdimm0,id=dimm0,slot=0 \
-object
memory-backend-file,id=memdimm1,mem-path=/var/lib/libvirt/qemu/ram/-1-fedora/dimm1,discard-data=on,share=off,size=536870912
\
-device pc-dimm,node=0,memdev=memdimm1,id=dimm1,slot=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.args
b/tests/qemuxml2argvdata/pages-discard-hugepages.args
index 6cce82feaf..75c0e8e7ca 100644
--- a/tests/qemuxml2argvdata/pages-discard-hugepages.args
+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-SomeDummyHugepagesGu/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=SomeDummyHugepagesGuest,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pages-discard.args
b/tests/qemuxml2argvdata/pages-discard.args
index 244e7bb820..b7d2731755 100644
--- a/tests/qemuxml2argvdata/pages-discard.args
+++ b/tests/qemuxml2argvdata/pages-discard.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,4 +30,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args
b/tests/qemuxml2argvdata/parallel-parport-chardev.args
index a0c12ce004..98d424d7b3 100644
--- a/tests/qemuxml2argvdata/parallel-parport-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev parport,id=charparallel0,path=/dev/parport0 \
-device isa-parallel,chardev=charparallel0,id=parallel0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
index 8730d2b59d..2066f97afb 100644
--- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev socket,id=charparallel0,host=127.0.0.1,port=9999,server=on,wait=off \
-device isa-parallel,chardev=charparallel0,id=parallel0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args
b/tests/qemuxml2argvdata/pci-autoadd-addr.args
index 676286bb79..d3b4e9cf6f 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-addr.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-fdr-br/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr-br,debug-threads=on \
-S \
@@ -35,6 +34,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.7,addr=0x6 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args
b/tests/qemuxml2argvdata/pci-autoadd-idx.args
index f7ea57c347..dbb7382918 100644
--- a/tests/qemuxml2argvdata/pci-autoadd-idx.args
+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-fdr-br/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr-br,debug-threads=on \
-S \
@@ -36,6 +35,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.4,addr=0x6 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args
b/tests/qemuxml2argvdata/pci-autofill-addr.args
index 856a78aeb7..98ae53988e 100644
--- a/tests/qemuxml2argvdata/pci-autofill-addr.args
+++ b/tests/qemuxml2argvdata/pci-autofill-addr.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-fdr-br/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr-br,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
index 9fdb261fb8..c6b8e73a18 100644
--- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
+++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-lots-of-disks/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-lots-of-disks/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-lots-of-disks/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=lots-of-disks,debug-threads=on \
-S \
@@ -240,4 +239,5 @@ QEMU_AUDIO_DRV=none \
-device virtio-blk-pci,bus=pci.3,addr=0xf,drive=drive-virtio-disk678,id=virtio-disk678 \
-drive
file=/var/lib/libvirt/images/disk-z-d.img,format=raw,if=none,id=drive-virtio-disk679 \
-device virtio-blk-pci,bus=pci.3,addr=0x10,drive=drive-virtio-disk679,id=virtio-disk679
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-bridge.args
b/tests/qemuxml2argvdata/pci-bridge.args
index 69d048cee1..c25780ab64 100644
--- a/tests/qemuxml2argvdata/pci-bridge.args
+++ b/tests/qemuxml2argvdata/pci-bridge.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-fdr-br/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr-br,debug-threads=on \
-S \
@@ -93,7 +92,8 @@ QEMU_AUDIO_DRV=none \
-device e1000,netdev=hostnet30,id=net30,mac=52:54:00:ec:d5:e3,bus=pci.1,addr=0x5 \
-netdev user,id=hostnet31 \
-device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6e:c8,bus=pci.1,addr=0x6 \
--vnc 127.0.0.1:0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
-k en-us \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args
b/tests/qemuxml2argvdata/pci-expander-bus.args
index 9a9a18dad9..14e330ed56 100644
--- a/tests/qemuxml2argvdata/pci-expander-bus.args
+++ b/tests/qemuxml2argvdata/pci-expander-bus.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-expander-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-expander-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-expander-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=expander-test,debug-threads=on \
-S \
@@ -94,5 +93,6 @@ QEMU_AUDIO_DRV=none \
-device e1000,netdev=hostnet30,id=net30,mac=52:54:00:ec:d5:e3,bus=pci.1,addr=0x3 \
-netdev user,id=hostnet31 \
-device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6e:c8,bus=pci.1,addr=0x4 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args
index 3dc932d089..8293f0ba02 100644
--- a/tests/qemuxml2argvdata/pci-many.args
+++ b/tests/qemuxml2argvdata/pci-many.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-fdr-br/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-fdr-br/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr-br/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=fdr-br,debug-threads=on \
-S \
@@ -84,6 +83,7 @@ QEMU_AUDIO_DRV=none \
-device virtio-blk-pci,bus=pci.0,addr=0x1e,drive=drive-virtio-disk182,id=virtio-disk182
\
-drive
file=/var/lib/libvirt/images/disk-g-b.img,format=raw,if=none,id=drive-virtio-disk183 \
-device virtio-blk-pci,bus=pci.0,addr=0x1f,drive=drive-virtio-disk183,id=virtio-disk183
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args
b/tests/qemuxml2argvdata/pci-rom-disabled.args
index 8095fb55dd..a1d89c944f 100644
--- a/tests/qemuxml2argvdata/pci-rom-disabled.args
+++ b/tests/qemuxml2argvdata/pci-rom-disabled.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-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=
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args
index e0b2da5409..b1cdec3d1d 100644
--- a/tests/qemuxml2argvdata/pci-rom.args
+++ b/tests/qemuxml2argvdata/pci-rom.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest2/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest2/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest2/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest2,debug-threads=on \
-S \
@@ -33,6 +32,7 @@ QEMU_AUDIO_DRV=none \
-device
virtio-net-pci,netdev=hostnet0,id=net0,mac=52:54:00:24:a5:9f,bus=pci.0,addr=0x2,rombar=1
\
-netdev user,id=hostnet1 \
-device
virtio-net-pci,netdev=hostnet1,id=net1,mac=52:54:00:24:a5:9e,bus=pci.0,addr=0x3,romfile=/etc/fake/bootrom.bin
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device vfio-pci,host=0000:06:12.5,id=hostdev0,bus=pci.0,addr=0x4,rombar=0 \
-device
vfio-pci,host=0000:06:12.6,id=hostdev1,bus=pci.0,addr=0x5,rombar=1,romfile=/etc/fake/bootrom.bin
\
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
index d1abb8a125..ecc02d35df 100644
--- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev tty,id=charserial0,path=/dev/ttyS2 \
-device pci-serial,chardev=charserial0,id=serial0,bus=pci.0,addr=0x4 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args
b/tests/qemuxml2argvdata/pcie-expander-bus.args
index 4661862d25..c4f59dd934 100644
--- a/tests/qemuxml2argvdata/pcie-expander-bus.args
+++ b/tests/qemuxml2argvdata/pcie-expander-bus.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-pcie-expander-bus-te/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-pcie-expander-bus-te/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-pcie-expander-bus-te/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=pcie-expander-bus-test,debug-threads=on \
-S \
@@ -129,4 +128,5 @@ QEMU_AUDIO_DRV=none \
-device e1000,netdev=hostnet30,id=net30,mac=52:54:00:7e:6e:c8,bus=pci.34,addr=0x0 \
-netdev user,id=hostnet31 \
-device e1000,netdev=hostnet31,id=net31,mac=52:54:00:7e:6d:c9,bus=pci.35,addr=0x0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
index 9b70394ac6..62c0bf982e 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-device pcie-root-port,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
-device pcie-root-port,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
-device ioh3420,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
index cf7ad03a52..0247c87166 100644
--- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
+++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=guest,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-device ioh3420,port=8,chassis=1,id=pci.1,bus=pcie.0,multifunction=on,addr=0x1 \
-device ioh3420,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-root-port.args
b/tests/qemuxml2argvdata/pcie-root-port.args
index bf22b1aa14..64469264b0 100644
--- a/tests/qemuxml2argvdata/pcie-root-port.args
+++ b/tests/qemuxml2argvdata/pcie-root-port.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
-device ioh3420,port=26,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 \
-device ide-hd,bus=ide.0,drive=drive-sata0-0-0,id=sata0-0-0,bootindex=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-root.args
b/tests/qemuxml2argvdata/pcie-root.args
index 9e505f3b18..06a31506f8 100644
--- a/tests/qemuxml2argvdata/pcie-root.args
+++ b/tests/qemuxml2argvdata/pcie-root.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -26,4 +25,5 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
index 48f3442b8b..228af19fa4 100644
--- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -38,5 +37,6 @@ QEMU_AUDIO_DRV=none \
-device xio3130-downstream,port=6,chassis=10,id=pci.10,bus=pci.2,addr=0x6 \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
index 2bdfda97fa..71970f91d1 100644
--- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
+++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
-device x3130-upstream,id=pci.4,bus=pci.2,addr=0x0 \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args
b/tests/qemuxml2argvdata/pcihole64-q35.args
index 86ff17a6d7..77685e127e 100644
--- a/tests/qemuxml2argvdata/pcihole64-q35.args
+++ b/tests/qemuxml2argvdata/pcihole64-q35.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pcihole64.args
b/tests/qemuxml2argvdata/pcihole64.args
index 859bee2afc..343e5b58b8 100644
--- a/tests/qemuxml2argvdata/pcihole64.args
+++ b/tests/qemuxml2argvdata/pcihole64.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-foo/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-foo/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-foo/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=foo,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-global i440FX-pcihost.pci-hole64-size=1048576K \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args
b/tests/qemuxml2argvdata/pmu-feature-off.args
index efd0747eac..b3fa26b231 100644
--- a/tests/qemuxml2argvdata/pmu-feature-off.args
+++ b/tests/qemuxml2argvdata/pmu-feature-off.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pmu-feature.args
b/tests/qemuxml2argvdata/pmu-feature.args
index 298e962f53..911c3c54a5 100644
--- a/tests/qemuxml2argvdata/pmu-feature.args
+++ b/tests/qemuxml2argvdata/pmu-feature.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/ppc-dtb.args b/tests/qemuxml2argvdata/ppc-dtb.args
index abb8732029..951edcda6b 100644
--- a/tests/qemuxml2argvdata/ppc-dtb.args
+++ b/tests/qemuxml2argvdata/ppc-dtb.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
-usb \
-chardev pty,id=charserial0 \
-serial chardev:charserial0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
index a0c4f2eec0..bf1b1f368a 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -26,5 +25,6 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 57f2ae4871..e5b05a2e9e 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -26,5 +25,6 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-boot strict=on \
-device qemu-xhci,id=usb,bus=pci.0,addr=0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 d381d7f5cd..58d876bcd5 100644
--- a/tests/qemuxml2argvdata/ppc64-usb-controller.args
+++ b/tests/qemuxml2argvdata/ppc64-usb-controller.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -26,5 +25,6 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-boot strict=on \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 ae67a0c752..1698f50498 100644
--- a/tests/qemuxml2argvdata/ppce500-serial.args
+++ b/tests/qemuxml2argvdata/ppce500-serial.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-usb \
-chardev pty,id=charserial0 \
-serial chardev:charserial0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-basic.args
b/tests/qemuxml2argvdata/pseries-basic.args
index 64dc188718..67f927a1fa 100644
--- a/tests/qemuxml2argvdata/pseries-basic.args
+++ b/tests/qemuxml2argvdata/pseries-basic.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-console-virtio.args
b/tests/qemuxml2argvdata/pseries-console-virtio.args
index 4d68c70e78..2e9d1bd831 100644
--- a/tests/qemuxml2argvdata/pseries-console-virtio.args
+++ b/tests/qemuxml2argvdata/pseries-console-virtio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-device virtio-serial-pci,id=virtio-serial0,bus=pci.0,addr=0x1 \
-chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat.args
b/tests/qemuxml2argvdata/pseries-cpu-compat.args
index 232fcf27e5..5e35726566 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-compat.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-compat.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-cpu-exact.args
b/tests/qemuxml2argvdata/pseries-cpu-exact.args
index 83c051e2e5..6059c5a31c 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-exact.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-exact.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-cpu-le.args
b/tests/qemuxml2argvdata/pseries-cpu-le.args
index 12d1c277d9..667264ac82 100644
--- a/tests/qemuxml2argvdata/pseries-cpu-le.args
+++ b/tests/qemuxml2argvdata/pseries-cpu-le.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-features.args
b/tests/qemuxml2argvdata/pseries-features.args
index 5452a57bb0..2398f4cf0a 100644
--- a/tests/qemuxml2argvdata/pseries-features.args
+++ b/tests/qemuxml2argvdata/pseries-features.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
@@ -25,4 +24,5 @@ QEMU_AUDIO_DRV=none \
-rtc base=utc \
-no-shutdown \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-1.args
b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
index 074ec68bdf..3339187420 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-1.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-device spapr-pci-host-bridge,index=1,id=pci.1 \
-device spapr-pci-host-bridge,index=2,id=pci.2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device vfio-pci,host=0005:90:01.0,id=hostdev0,bus=pci.1.0,addr=0x1 \
-device vfio-pci,host=0001:01:00.0,id=hostdev1,bus=pci.2.0,addr=0x1 \
-device vfio-pci,host=0001:01:00.1,id=hostdev2,bus=pci.2.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.args
b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
index a07a175f40..fca68ff76a 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-2.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
@@ -28,6 +27,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device vfio-pci,host=0001:01:00.0,id=hostdev0,bus=pci.1.0,addr=0x2 \
-device vfio-pci,host=0005:90:01.0,id=hostdev1,bus=pci.2.0,addr=0x1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.args
b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
index ae8a32e0ec..c236d0b38f 100644
--- a/tests/qemuxml2argvdata/pseries-hostdevs-3.args
+++ b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-device spapr-pci-host-bridge,index=1,id=pci.1 \
-device spapr-pci-host-bridge,index=2,id=pci.2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device vfio-pci,host=0001:01:00.0,id=hostdev0,bus=pci.2.0,addr=0x1 \
-device vfio-pci,host=0001:01:00.1,id=hostdev1,bus=pci.2.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-many-buses-1.args
b/tests/qemuxml2argvdata/pseries-many-buses-1.args
index eb7a763094..bbb7c90707 100644
--- a/tests/qemuxml2argvdata/pseries-many-buses-1.args
+++ b/tests/qemuxml2argvdata/pseries-many-buses-1.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-many-buses-2.args
b/tests/qemuxml2argvdata/pseries-many-buses-2.args
index aee15cf17e..961c62971c 100644
--- a/tests/qemuxml2argvdata/pseries-many-buses-2.args
+++ b/tests/qemuxml2argvdata/pseries-many-buses-2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-device spapr-pci-host-bridge,index=1,id=pci.2 \
-device spapr-pci-host-bridge,index=2,id=pci.1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-many-devices.args
b/tests/qemuxml2argvdata/pseries-many-devices.args
index 1cf9f4ee88..a108e44136 100644
--- a/tests/qemuxml2argvdata/pseries-many-devices.args
+++ b/tests/qemuxml2argvdata/pseries-many-devices.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
@@ -58,4 +57,5 @@ QEMU_AUDIO_DRV=none \
-device virtio-scsi-pci,id=scsi29,bus=pci.0,addr=0x1e \
-device virtio-scsi-pci,id=scsi30,bus=pci.0,addr=0x1f \
-device virtio-scsi-pci,id=scsi31,bus=pci.1.0,addr=0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-nvram.args
b/tests/qemuxml2argvdata/pseries-nvram.args
index 5bfbb39abb..f411777dc5 100644
--- a/tests/qemuxml2argvdata/pseries-nvram.args
+++ b/tests/qemuxml2argvdata/pseries-nvram.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -26,5 +25,6 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 64dc188718..67f927a1fa 100644
--- a/tests/qemuxml2argvdata/pseries-panic-missing.args
+++ b/tests/qemuxml2argvdata/pseries-panic-missing.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-panic-no-address.args
b/tests/qemuxml2argvdata/pseries-panic-no-address.args
index 64dc188718..67f927a1fa 100644
--- a/tests/qemuxml2argvdata/pseries-panic-no-address.args
+++ b/tests/qemuxml2argvdata/pseries-panic-no-address.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-usb \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-phb-default-missing.args
b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
index d89f493a52..6891512a31 100644
--- a/tests/qemuxml2argvdata/pseries-phb-default-missing.args
+++ b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-device spapr-pci-host-bridge,index=1,id=pci.1 \
-device spapr-pci-host-bridge,index=2,id=pci.2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.args
b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
index dbf193409e..62d38ce2b6 100644
--- a/tests/qemuxml2argvdata/pseries-phb-numa-node.args
+++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -32,4 +31,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.args
b/tests/qemuxml2argvdata/pseries-phb-simple.args
index d89f493a52..6891512a31 100644
--- a/tests/qemuxml2argvdata/pseries-phb-simple.args
+++ b/tests/qemuxml2argvdata/pseries-phb-simple.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-device spapr-pci-host-bridge,index=1,id=pci.1 \
-device spapr-pci-host-bridge,index=2,id=pci.2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-serial-native.args
b/tests/qemuxml2argvdata/pseries-serial-native.args
index 2b08627e3d..1fb4b31dd2 100644
--- a/tests/qemuxml2argvdata/pseries-serial-native.args
+++ b/tests/qemuxml2argvdata/pseries-serial-native.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-serial-pci.args
b/tests/qemuxml2argvdata/pseries-serial-pci.args
index b8f4876734..458970c329 100644
--- a/tests/qemuxml2argvdata/pseries-serial-pci.args
+++ b/tests/qemuxml2argvdata/pseries-serial-pci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-chardev pty,id=charserial0 \
-device pci-serial,chardev=charserial0,id=serial0,bus=pci.0,addr=0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-serial-usb.args
b/tests/qemuxml2argvdata/pseries-serial-usb.args
index 0702bbb224..e4c3ef54ec 100644
--- a/tests/qemuxml2argvdata/pseries-serial-usb.args
+++ b/tests/qemuxml2argvdata/pseries-serial-usb.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-guest/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=guest,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-usb-default.args
b/tests/qemuxml2argvdata/pseries-usb-default.args
index 581a6ae549..c491eb69b2 100644
--- a/tests/qemuxml2argvdata/pseries-usb-default.args
+++ b/tests/qemuxml2argvdata/pseries-usb-default.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-device pci-ohci,id=usb,bus=pci.0,addr=0x1 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-usb-kbd.args
b/tests/qemuxml2argvdata/pseries-usb-kbd.args
index 901a00e1c3..2a725806af 100644
--- a/tests/qemuxml2argvdata/pseries-usb-kbd.args
+++ b/tests/qemuxml2argvdata/pseries-usb-kbd.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
-device usb-kbd,id=input0,bus=usb.0,port=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-usb-multi.args
b/tests/qemuxml2argvdata/pseries-usb-multi.args
index 94b59ee47f..ac122b6586 100644
--- a/tests/qemuxml2argvdata/pseries-usb-multi.args
+++ b/tests/qemuxml2argvdata/pseries-usb-multi.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-device pci-ohci,id=usb1,bus=pci.0,addr=0x2 \
-chardev pty,id=charserial0 \
-device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
index a0750c7d39..34e9b83556 100644
--- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
+++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -34,4 +33,5 @@ QEMU_AUDIO_DRV=none \
-device spapr-vty,chardev=charserial0,id=serial0,reg=536870912 \
-chardev pty,id=charserial1 \
-device spapr-vty,chardev=charserial1,id=serial1,reg=805310464 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/pseries-vio.args
b/tests/qemuxml2argvdata/pseries-vio.args
index a9a393eef9..a5a641b49b 100644
--- a/tests/qemuxml2argvdata/pseries-vio.args
+++ b/tests/qemuxml2argvdata/pseries-vio.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-ppc64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -34,4 +33,5 @@ QEMU_AUDIO_DRV=none \
-device spapr-vty,chardev=charserial0,id=serial0,reg=805306368 \
-chardev pty,id=charserial1 \
-device spapr-vty,chardev=charserial1,id=serial1,reg=805310464 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.args
b/tests/qemuxml2argvdata/q35-default-devices-only.args
index 56defbc6fe..bc178aab47 100644
--- a/tests/qemuxml2argvdata/q35-default-devices-only.args
+++ b/tests/qemuxml2argvdata/q35-default-devices-only.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
-device ioh3420,port=9,chassis=2,id=pci.2,bus=pcie.0,addr=0x1.0x1 \
-device ioh3420,port=10,chassis=3,id=pci.3,bus=pcie.0,addr=0x1.0x2 \
-device nec-usb-xhci,id=usb,bus=pci.1,addr=0x0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-multifunction.args
b/tests/qemuxml2argvdata/q35-multifunction.args
index f98ae9e6af..f21bb11671 100644
--- a/tests/qemuxml2argvdata/q35-multifunction.args
+++ b/tests/qemuxml2argvdata/q35-multifunction.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -45,5 +44,6 @@ QEMU_AUDIO_DRV=none \
-device ioh3420,port=20,chassis=17,id=pci.17,bus=pcie.0,addr=0x2.0x4 \
-device ioh3420,port=21,chassis=18,id=pci.18,bus=pcie.0,addr=0x2.0x5 \
-device nec-usb-xhci,id=usb,bus=pci.1,addr=0x0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x0 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args
b/tests/qemuxml2argvdata/q35-pci-force-address.args
index 7d761c5875..7f2b2ef068 100644
--- a/tests/qemuxml2argvdata/q35-pci-force-address.args
+++ b/tests/qemuxml2argvdata/q35-pci-force-address.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -31,6 +30,7 @@ QEMU_AUDIO_DRV=none \
-device ioh3420,port=8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
-netdev user,id=hostnet0 \
-device e1000e,netdev=hostnet0,id=net0,mac=52:54:00:aa:bf:ef,bus=pci.2,addr=0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device intel-hda,id=sound0,bus=pci.3,addr=0x0 \
--device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
+-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0,audiodev=audio1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
index ef3767af3a..019943f6dd 100644
--- a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
+++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -55,6 +54,7 @@ QEMU_AUDIO_DRV=none \
-device virtio-mouse-pci,id=input1,bus=pci.11,addr=0x0 \
-device virtio-keyboard-pci,id=input2,bus=pci.12,addr=0x0 \
-device virtio-tablet-pci,id=input3,bus=pci.13,addr=0x0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-gpu-pci,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.8,addr=0x0 \
-object rng-random,id=objrng0,filename=/dev/urandom \
diff --git a/tests/qemuxml2argvdata/q35-pcie.args b/tests/qemuxml2argvdata/q35-pcie.args
index d860f8ca09..2f922f9352 100644
--- a/tests/qemuxml2argvdata/q35-pcie.args
+++ b/tests/qemuxml2argvdata/q35-pcie.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -56,6 +55,7 @@ QEMU_AUDIO_DRV=none \
-device virtio-mouse-pci,id=input1,bus=pci.13,addr=0x0 \
-device virtio-keyboard-pci,id=input2,bus=pci.14,addr=0x0 \
-device virtio-tablet-pci,id=input3,bus=pci.15,addr=0x0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-gpu-pci,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.10,addr=0x0 \
-object rng-random,id=objrng0,filename=/dev/urandom \
diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
index 05b1b98a0d..50eb2fa109 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-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=8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args
b/tests/qemuxml2argvdata/q35-pm-disable.args
index d65c3379db..3a6437cf31 100644
--- a/tests/qemuxml2argvdata/q35-pm-disable.args
+++ b/tests/qemuxml2argvdata/q35-pm-disable.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-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=8,chassis=3,id=pci.3,bus=pcie.0,addr=0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x1 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args
b/tests/qemuxml2argvdata/q35-usb2-multi.args
index 4d59460a13..0722fd972e 100644
--- a/tests/qemuxml2argvdata/q35-usb2-multi.args
+++ b/tests/qemuxml2argvdata/q35-usb2-multi.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -42,5 +41,6 @@ QEMU_AUDIO_DRV=none \
-device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.2,addr=0x1.0x2 \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args
b/tests/qemuxml2argvdata/q35-usb2-reorder.args
index 8af10dbcfe..43cb4657bc 100644
--- a/tests/qemuxml2argvdata/q35-usb2-reorder.args
+++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -42,5 +41,6 @@ QEMU_AUDIO_DRV=none \
-device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.2,multifunction=on,addr=0x1
\
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args
index 94e6713d7e..745a7bdbc4 100644
--- a/tests/qemuxml2argvdata/q35-usb2.args
+++ b/tests/qemuxml2argvdata/q35-usb2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
-device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
index 32875f291c..4c8e2781c7 100644
--- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-virt-manager-basic/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-virt-manager-basic/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-virt-manager-basic/.config \
-QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-x86_64 \
-name guest=virt-manager-basic,debug-threads=on \
-S \
@@ -46,10 +45,11 @@ QEMU_AUDIO_DRV=spice \
-chardev spicevmc,id=charchannel1,name=vdagent \
-device
virtserialport,bus=virtio-serial0.0,nr=2,chardev=charchannel1,id=channel1,name=com.redhat.spice.0
\
-device usb-tablet,id=input0,bus=usb.0,port=1 \
+-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice
port=5901,tls-port=5902,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,image-compression=off,seamless-migration=on
\
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pcie.0,addr=0x1
\
-device ich9-intel-hda,id=sound0,bus=pcie.0,addr=0x1b \
--device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
+-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0,audiodev=audio1 \
-chardev spicevmc,id=charredir0,name=usbredir \
-device usb-redir,chardev=charredir0,id=redir0,bus=usb.0,port=2 \
-chardev spicevmc,id=charredir1,name=usbredir \
diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.args
b/tests/qemuxml2argvdata/q35-virtio-pci.args
index 887141ebe1..6fc72ca1df 100644
--- a/tests/qemuxml2argvdata/q35-virtio-pci.args
+++ b/tests/qemuxml2argvdata/q35-virtio-pci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -56,6 +55,7 @@ QEMU_AUDIO_DRV=none \
-device virtio-mouse-pci,id=input1,bus=pci.2,addr=0x9 \
-device virtio-keyboard-pci,id=input2,bus=pci.2,addr=0xa \
-device virtio-tablet-pci,id=input3,bus=pci.2,addr=0xb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-gpu-pci,id=video0,max_outputs=1,bus=pcie.0,addr=0x1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.2,addr=0x6 \
-object rng-random,id=objrng0,filename=/dev/urandom \
diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args
index 370110db7d..5054c6ca17 100644
--- a/tests/qemuxml2argvdata/q35.args
+++ b/tests/qemuxml2argvdata/q35.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
-device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pcie.0,addr=0x1d.0x2 \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=33554432,bus=pcie.0,addr=0x1
\
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args
b/tests/qemuxml2argvdata/qemu-ns-alt.args
index eecf66f325..c96042232b 100644
--- a/tests/qemuxml2argvdata/qemu-ns-alt.args
+++ b/tests/qemuxml2argvdata/qemu-ns-alt.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
NS=ns \
BAR='' \
/usr/bin/qemu-system-i386 \
@@ -31,6 +30,7 @@ BAR='' \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-unknown parameter \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
index 40940ff5b9..4711cfcd93 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
index 40940ff5b9..4711cfcd93 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args
b/tests/qemuxml2argvdata/qemu-ns-commandline.args
index 40940ff5b9..4711cfcd93 100644
--- a/tests/qemuxml2argvdata/qemu-ns-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
index 40940ff5b9..4711cfcd93 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
index 40940ff5b9..4711cfcd93 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
index 40940ff5b9..4711cfcd93 100644
--- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 ARGUMENT \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args
b/tests/qemuxml2argvdata/qemu-ns-no-env.args
index 2b92249803..879f0b3e40 100644
--- a/tests/qemuxml2argvdata/qemu-ns-no-env.args
+++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-unknown parameter \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
index f8a72d2bca..2b161b0919 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot reboot-timeout=-1,strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
index 8f0213c8e5..570c3d0f70 100644
--- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
+++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot reboot-timeout=128,strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args
b/tests/qemuxml2argvdata/restore-v2-fd.args
index d65ed70b2f..96a756603d 100644
--- a/tests/qemuxml2argvdata/restore-v2-fd.args
+++ b/tests/qemuxml2argvdata/restore-v2-fd.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-incoming fd:7 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/restore-v2.args
b/tests/qemuxml2argvdata/restore-v2.args
index c24cde2b76..c930c83f0c 100644
--- a/tests/qemuxml2argvdata/restore-v2.args
+++ b/tests/qemuxml2argvdata/restore-v2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-incoming exec:cat \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.args
b/tests/qemuxml2argvdata/riscv64-virt-pci.args
index 34247c1b6e..5833041823 100644
--- a/tests/qemuxml2argvdata/riscv64-virt-pci.args
+++ b/tests/qemuxml2argvdata/riscv64-virt-pci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-riscv64/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-riscv64/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-riscv64/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-riscv64 \
-name guest=riscv64,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-append root=/dev/vda \
-drive
file=/var/lib/libvirt/images/riscv64.qcow2,format=qcow2,if=none,id=drive-virtio-disk0 \
-device
virtio-blk-pci,bus=pcie.0,addr=0x1,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/riscv64-virt.args
b/tests/qemuxml2argvdata/riscv64-virt.args
index a11dd6e1e3..ba21b2f307 100644
--- a/tests/qemuxml2argvdata/riscv64-virt.args
+++ b/tests/qemuxml2argvdata/riscv64-virt.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-riscv64/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-riscv64/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-riscv64/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-riscv64 \
-name guest=riscv64,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device virtio-blk-device,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-chardev pty,id=charserial0 \
-serial chardev:charserial0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-device,id=balloon0 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/s390-panic-missing.args
b/tests/qemuxml2argvdata/s390-panic-missing.args
index f353802d6e..a0e11764d7 100644
--- a/tests/qemuxml2argvdata/s390-panic-missing.args
+++ b/tests/qemuxml2argvdata/s390-panic-missing.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0000 \
-chardev pty,id=charconsole0 \
-device virtconsole,devno=fe.0.0001,chardev=charconsole0,id=console0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0002 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/s390-panic-no-address.args
b/tests/qemuxml2argvdata/s390-panic-no-address.args
index a021b706b3..735e64b728 100644
--- a/tests/qemuxml2argvdata/s390-panic-no-address.args
+++ b/tests/qemuxml2argvdata/s390-panic-no-address.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-device virtio-serial-ccw,id=virtio-serial0,devno=fe.0.0000 \
-chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/s390-serial-2.args
b/tests/qemuxml2argvdata/s390-serial-2.args
index 50ab7293a2..f4c7403543 100644
--- a/tests/qemuxml2argvdata/s390-serial-2.args
+++ b/tests/qemuxml2argvdata/s390-serial-2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-device sclpconsole,chardev=charserial0,id=serial0 \
-chardev pty,id=charserial1 \
-device sclplmconsole,chardev=charserial1,id=serial1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/s390-serial-console.args
b/tests/qemuxml2argvdata/s390-serial-console.args
index 81a864fae5..3e18863b6d 100644
--- a/tests/qemuxml2argvdata/s390-serial-console.args
+++ b/tests/qemuxml2argvdata/s390-serial-console.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-chardev pty,id=charserial0 \
-device sclpconsole,chardev=charserial0,id=serial0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/s390-serial.args
b/tests/qemuxml2argvdata/s390-serial.args
index 81a864fae5..3e18863b6d 100644
--- a/tests/qemuxml2argvdata/s390-serial.args
+++ b/tests/qemuxml2argvdata/s390-serial.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-chardev pty,id=charserial0 \
-device sclpconsole,chardev=charserial0,id=serial0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args
b/tests/qemuxml2argvdata/seclabel-dac-none.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-dac-none.args
+++ b/tests/qemuxml2argvdata/seclabel-dac-none.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
index 14572d10be..c722de5d51 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-drive file=/dev/HostVG/QEMUGuest2,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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args
b/tests/qemuxml2argvdata/seclabel-dynamic.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-dynamic.args
+++ b/tests/qemuxml2argvdata/seclabel-dynamic.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-none.args
b/tests/qemuxml2argvdata/seclabel-none.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-none.args
+++ b/tests/qemuxml2argvdata/seclabel-none.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args
b/tests/qemuxml2argvdata/seclabel-static-relabel.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-static-relabel.args
+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/seclabel-static.args
b/tests/qemuxml2argvdata/seclabel-static.args
index e02e797142..dbcb959334 100644
--- a/tests/qemuxml2argvdata/seclabel-static.args
+++ b/tests/qemuxml2argvdata/seclabel-static.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
index 9fc649e8c3..13911e128c 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev tty,id=charserial0,path=/dev/ttyS2 \
-device isa-serial,chardev=charserial0,id=serial0,index=0,iobase=1016,irq=4 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args
b/tests/qemuxml2argvdata/serial-dev-chardev.args
index 11e79f8eb5..9f023da2d4 100644
--- a/tests/qemuxml2argvdata/serial-dev-chardev.args
+++ b/tests/qemuxml2argvdata/serial-dev-chardev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev tty,id=charserial0,path=/dev/ttyS2 \
-device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args
b/tests/qemuxml2argvdata/serial-file-chardev.args
index e2f7b706da..3c4b30c577 100644
--- a/tests/qemuxml2argvdata/serial-file-chardev.args
+++ b/tests/qemuxml2argvdata/serial-file-chardev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
-add-fd set=0,fd=1750,opaque=serial0-source \
-chardev file,id=charserial0,path=/dev/fdset/0,append=on \
-device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-file-log.args
b/tests/qemuxml2argvdata/serial-file-log.args
index 1845320539..c06750eac6 100644
--- a/tests/qemuxml2argvdata/serial-file-log.args
+++ b/tests/qemuxml2argvdata/serial-file-log.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -33,4 +32,5 @@ QEMU_AUDIO_DRV=none \
-add-fd set=1,fd=1751,opaque=serial0-log \
-chardev
file,id=charserial0,path=/dev/fdset/0,append=on,logfile=/dev/fdset/1,logappend=on \
-device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args
b/tests/qemuxml2argvdata/serial-many-chardev.args
index 8e827f08d3..5a82badf63 100644
--- a/tests/qemuxml2argvdata/serial-many-chardev.args
+++ b/tests/qemuxml2argvdata/serial-many-chardev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
-add-fd set=0,fd=1750,opaque=serial1-source \
-chardev file,id=charserial1,path=/dev/fdset/0,append=on \
-device isa-serial,chardev=charserial1,id=serial1,index=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args
b/tests/qemuxml2argvdata/serial-pty-chardev.args
index 30d6d5545c..cf08357b27 100644
--- a/tests/qemuxml2argvdata/serial-pty-chardev.args
+++ b/tests/qemuxml2argvdata/serial-pty-chardev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev pty,id=charserial0 \
-device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-spiceport.args
b/tests/qemuxml2argvdata/serial-spiceport.args
index 79d738f30c..f736af38d5 100644
--- a/tests/qemuxml2argvdata/serial-spiceport.args
+++ b/tests/qemuxml2argvdata/serial-spiceport.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,6 +30,7 @@ QEMU_AUDIO_DRV=spice \
-chardev spiceport,id=charserial0,name=org.qemu.console.serial.0 \
-device isa-serial,chardev=charserial0,id=serial0,index=0 \
-device usb-tablet,id=input0,bus=usb.0,port=1 \
+-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice
port=5903,tls-port=5904,addr=127.0.0.1,x509-dir=/etc/pki/libvirt-spice,seamless-migration=on
\
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-chardev.args
index 0ea0c9846d..6450ecdf8d 100644
--- a/tests/qemuxml2argvdata/serial-tcp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev socket,id=charserial0,host=127.0.0.1,port=9999 \
-device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
index 80b8d8c173..7ba22be033 100644
--- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev socket,id=charserial0,host=127.0.0.1,port=9999,telnet=on,server=on,wait=off \
-device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
index a277345c75..9a8988b79e 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -33,5 +32,6 @@ QEMU_AUDIO_DRV=none \
-device isa-serial,chardev=charserial0,id=serial0,index=0 \
-chardev socket,id=charserial1,host=127.0.0.1,port=5555 \
-device isa-serial,chardev=charserial1,id=serial1,index=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
index 162de2be7a..9cdf2ca6f5 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
-object
tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,endpoint=client,verify-peer=on
\
-chardev socket,id=charserial1,host=127.0.0.1,port=5555,tls-creds=objcharserial1_tls0 \
-device isa-serial,chardev=charserial1,id=serial1,index=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
index 162de2be7a..9cdf2ca6f5 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
-object
tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,endpoint=client,verify-peer=on
\
-chardev socket,id=charserial1,host=127.0.0.1,port=5555,tls-creds=objcharserial1_tls0 \
-device isa-serial,chardev=charserial1,id=serial1,index=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
index e2fcd4210c..3cf523bb80 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -35,5 +34,6 @@ QEMU_AUDIO_DRV=none \
-object
tls-creds-x509,id=objcharserial1_tls0,dir=/etc/pki/libvirt-chardev,endpoint=client,verify-peer=on,passwordid=charserial1-secret0
\
-chardev socket,id=charserial1,host=127.0.0.1,port=5555,tls-creds=objcharserial1_tls0 \
-device isa-serial,chardev=charserial1,id=serial1,index=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args
b/tests/qemuxml2argvdata/serial-udp-chardev.args
index 488c770045..4cbd3b4f4c 100644
--- a/tests/qemuxml2argvdata/serial-udp-chardev.args
+++ b/tests/qemuxml2argvdata/serial-udp-chardev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -33,5 +32,6 @@ QEMU_AUDIO_DRV=none \
-device isa-serial,chardev=charserial0,id=serial0,index=0 \
-chardev udp,id=charserial1,host=,port=9999,localaddr=,localport=0 \
-device isa-serial,chardev=charserial1,id=serial1,index=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args
b/tests/qemuxml2argvdata/serial-unix-chardev.args
index 9947742c08..4a4c4e18ff 100644
--- a/tests/qemuxml2argvdata/serial-unix-chardev.args
+++ b/tests/qemuxml2argvdata/serial-unix-chardev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device isa-serial,chardev=charserial0,id=serial0,index=0 \
-chardev socket,id=charserial1,fd=1729,server=on,wait=off \
-device isa-serial,chardev=charserial1,id=serial1,index=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args
b/tests/qemuxml2argvdata/serial-vc-chardev.args
index f296990f03..7731c71fcc 100644
--- a/tests/qemuxml2argvdata/serial-vc-chardev.args
+++ b/tests/qemuxml2argvdata/serial-vc-chardev.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
-chardev vc,id=charserial0 \
-device isa-serial,chardev=charserial0,id=serial0,index=0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
index 47d6bdc1aa..763c30de12 100644
--- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 \
-object
memory-backend-file,id=shmmem-shmem1,mem-path=/dev/shm/shmem1,size=134217728,share=on \
diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shmem.args
index 45ef8dce5b..0902724ff8 100644
--- a/tests/qemuxml2argvdata/shmem.args
+++ b/tests/qemuxml2argvdata/shmem.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 \
-device ivshmem,id=shmem2,size=256m,shm=shmem2,bus=pci.0,addr=0x4 \
diff --git a/tests/qemuxml2argvdata/smartcard-controller.args
b/tests/qemuxml2argvdata/smartcard-controller.args
index 95817db881..975161796d 100644
--- a/tests/qemuxml2argvdata/smartcard-controller.args
+++ b/tests/qemuxml2argvdata/smartcard-controller.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
index 6541b29312..35d92270d9 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args
b/tests/qemuxml2argvdata/smartcard-host-certificates.args
index e77678885a..4279a34cae 100644
--- a/tests/qemuxml2argvdata/smartcard-host-certificates.args
+++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-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
\
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smartcard-host.args
b/tests/qemuxml2argvdata/smartcard-host.args
index 95817db881..975161796d 100644
--- a/tests/qemuxml2argvdata/smartcard-host.args
+++ b/tests/qemuxml2argvdata/smartcard-host.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,5 +28,6 @@ QEMU_AUDIO_DRV=none \
-usb \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-device ccid-card-emulated,backend=nss-emulated,id=smartcard0,bus=ccid0.0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
index 0de55f9d71..c0b940a2f7 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=spice \
-device usb-ccid,id=ccid0,bus=usb.0,port=1 \
-chardev spicevmc,id=charsmartcard0,name=smartcard \
-device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
+-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice port=0,seamless-migration=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
index e24aa7fc65..a7fd35fea9 100644
--- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
+++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
-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 \
-device ccid-card-passthru,chardev=charsmartcard0,id=smartcard0,bus=ccid0.0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.args
b/tests/qemuxml2argvdata/smbios-type-fwcfg.args
index 6341ec9fc0..986f72f6c7 100644
--- a/tests/qemuxml2argvdata/smbios-type-fwcfg.args
+++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args
index 9e976e31bb..31f56159ca 100644
--- a/tests/qemuxml2argvdata/smbios.args
+++ b/tests/qemuxml2argvdata/smbios.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -34,5 +33,6 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args
index 25e7a35612..4b0188b706 100644
--- a/tests/qemuxml2argvdata/smp-dies.args
+++ b/tests/qemuxml2argvdata/smp-dies.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args
index 379b45fa4c..d2d4368d29 100644
--- a/tests/qemuxml2argvdata/smp.args
+++ b/tests/qemuxml2argvdata/smp.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,4 +28,5 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/sound-device.args
b/tests/qemuxml2argvdata/sound-device.args
index d3a418ce61..6d8c2b5372 100644
--- a/tests/qemuxml2argvdata/sound-device.args
+++ b/tests/qemuxml2argvdata/sound-device.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,22 +28,23 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-soundhw pcspk \
--device ES1370,id=sound1,bus=pci.0,addr=0x2 \
--device sb16,id=sound2 \
--device AC97,id=sound3,bus=pci.0,addr=0x3 \
+-device ES1370,id=sound1,audiodev=audio1,bus=pci.0,addr=0x2 \
+-device sb16,id=sound2,audiodev=audio1 \
+-device AC97,id=sound3,audiodev=audio1,bus=pci.0,addr=0x3 \
-device intel-hda,id=sound4,bus=pci.0,addr=0x4 \
--device hda-duplex,id=sound4-codec0,bus=sound4.0,cad=0 \
+-device hda-duplex,id=sound4-codec0,bus=sound4.0,cad=0,audiodev=audio1 \
-device intel-hda,id=sound5,bus=pci.0,addr=0x5 \
--device hda-micro,id=sound5-codec0,bus=sound5.0,cad=0 \
--device hda-duplex,id=sound5-codec1,bus=sound5.0,cad=1 \
--device hda-output,id=sound5-codec2,bus=sound5.0,cad=2 \
+-device hda-micro,id=sound5-codec0,bus=sound5.0,cad=0,audiodev=audio1 \
+-device hda-duplex,id=sound5-codec1,bus=sound5.0,cad=1,audiodev=audio1 \
+-device hda-output,id=sound5-codec2,bus=sound5.0,cad=2,audiodev=audio1 \
-device ich9-intel-hda,id=sound6,bus=pci.0,addr=0x6 \
--device hda-duplex,id=sound6-codec0,bus=sound6.0,cad=0 \
+-device hda-duplex,id=sound6-codec0,bus=sound6.0,cad=0,audiodev=audio1 \
-device ich9-intel-hda,id=sound7,bus=pci.0,addr=0x7 \
--device hda-micro,id=sound7-codec0,bus=sound7.0,cad=0 \
--device hda-duplex,id=sound7-codec1,bus=sound7.0,cad=1 \
--device hda-output,id=sound7-codec2,bus=sound7.0,cad=2 \
--device usb-audio,id=sound8,bus=usb.0,port=1 \
+-device hda-micro,id=sound7-codec0,bus=sound7.0,cad=0,audiodev=audio1 \
+-device hda-duplex,id=sound7-codec1,bus=sound7.0,cad=1,audiodev=audio1 \
+-device hda-output,id=sound7-codec2,bus=sound7.0,cad=2,audiodev=audio1 \
+-device usb-audio,id=sound8,audiodev=audio1,bus=usb.0,port=1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x8 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sound.args
index 1cffb935c2..c2f923e51a 100644
--- a/tests/qemuxml2argvdata/sound.args
+++ b/tests/qemuxml2argvdata/sound.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,8 +28,9 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-soundhw pcspk \
--device ES1370,id=sound1,bus=pci.0,addr=0x2 \
--device sb16,id=sound2 \
--device AC97,id=sound3,bus=pci.0,addr=0x3 \
+-device ES1370,id=sound1,audiodev=audio1,bus=pci.0,addr=0x2 \
+-device sb16,id=sound2,audiodev=audio1 \
+-device AC97,id=sound3,audiodev=audio1,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/sparc-minimal.args
b/tests/qemuxml2argvdata/sparc-minimal.args
index 1296ef1771..5877b88013 100644
--- a/tests/qemuxml2argvdata/sparc-minimal.args
+++ b/tests/qemuxml2argvdata/sparc-minimal.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-redhat62sparc/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-redhat62sparc/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-redhat62sparc/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-sparc \
-name guest=redhat62sparc,debug-threads=on \
-S \
@@ -30,4 +29,5 @@ QEMU_AUDIO_DRV=none \
-device scsi-hd,bus=scsi.0,scsi-id=0,drive=drive-scsi0-0-0-0,id=scsi0-0-0-0,bootindex=1
\
-drive
file=/home/berrange/VirtualMachines/redhat-6.2-sparc.iso,format=raw,if=none,id=drive-scsi0-0-0-1,readonly=on
\
-device scsi-cd,bus=scsi.0,scsi-id=1,drive=drive-scsi0-0-0-1,id=scsi0-0-0-1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args
b/tests/qemuxml2argvdata/usb-controller-default-q35.args
index 88871b015c..f891a3dc77 100644
--- a/tests/qemuxml2argvdata/usb-controller-default-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pcie.0,addr=0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
index 1dd79d8946..5fb4553776 100644
--- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
+++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-q35-test/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=q35-test,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-device nec-usb-xhci,id=usb,bus=pcie.0,addr=0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
index fb9e2746ba..a88b2b47dc 100644
--- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-device qemu-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args
b/tests/qemuxml2argvdata/usb-controller-xhci.args
index 5e4edc24b6..feb7ae4ffa 100644
--- a/tests/qemuxml2argvdata/usb-controller-xhci.args
+++ b/tests/qemuxml2argvdata/usb-controller-xhci.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,4 +26,5 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-device nec-usb-xhci,p2=8,p3=8,id=usb,bus=pci.0,addr=0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-controller.args
b/tests/qemuxml2argvdata/usb-controller.args
index 75e09d7d02..7e48b9aa4a 100644
--- a/tests/qemuxml2argvdata/usb-controller.args
+++ b/tests/qemuxml2argvdata/usb-controller.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 805bfe6f58..0bce84c997 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -46,5 +45,6 @@ QEMU_AUDIO_DRV=none \
-device usb-tablet,id=input13,bus=usb.0,port=1.1.7 \
-device usb-tablet,id=input14,bus=usb.0,port=1.1.8 \
-device usb-tablet,id=input15,bus=usb.0,port=2.1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args
b/tests/qemuxml2argvdata/usb-hub-autoadd.args
index aa0400b933..1df0713728 100644
--- a/tests/qemuxml2argvdata/usb-hub-autoadd.args
+++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
-device usb-mouse,id=input1,bus=usb.0,port=1.1 \
-device usb-mouse,id=input2,bus=usb.0,port=1.2 \
-device usb-tablet,id=input3,bus=usb.0,port=1.3 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args
index 505da01810..8ab0eeceb8 100644
--- a/tests/qemuxml2argvdata/usb-hub.args
+++ b/tests/qemuxml2argvdata/usb-hub.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-usb \
-device usb-hub,id=hub0,bus=usb.0,port=1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
index 7c4436fee2..98ef795c4f 100644
--- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -35,5 +34,6 @@ QEMU_AUDIO_DRV=none \
-device usb-mouse,id=input0,bus=usb.0,port=3 \
-device usb-mouse,id=input1,bus=usb.0,port=4 \
-device usb-mouse,id=input2,bus=usb.0,port=5 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args
b/tests/qemuxml2argvdata/usb-ich9-companion.args
index b43dd84025..9b206d3662 100644
--- a/tests/qemuxml2argvdata/usb-ich9-companion.args
+++ b/tests/qemuxml2argvdata/usb-ich9-companion.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
-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 \
-device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
index 27c3ee1f17..9ea4d60e94 100644
--- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
+++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -38,5 +37,6 @@ QEMU_AUDIO_DRV=none \
-device ich9-usb-uhci1,masterbus=usb2.0,firstport=0,bus=pci.0,multifunction=on,addr=0x4
\
-device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
-device ich9-usb-uhci2,masterbus=usb2.0,firstport=2,bus=pci.0,addr=0x4.0x1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x5 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args
b/tests/qemuxml2argvdata/usb-long-port-path.args
index f4ec521ca6..3bef5b2e03 100644
--- a/tests/qemuxml2argvdata/usb-long-port-path.args
+++ b/tests/qemuxml2argvdata/usb-long-port-path.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -31,5 +30,6 @@ QEMU_AUDIO_DRV=none \
-device usb-hub,id=hub1,bus=usb.0,port=1.1 \
-device usb-hub,id=hub2,bus=usb.0,port=1.1.1 \
-device usb-hub,id=hub3,bus=usb.0,port=1.1.1.1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args
index 0000f6ee13..15f37829c1 100644
--- a/tests/qemuxml2argvdata/usb-none.args
+++ b/tests/qemuxml2argvdata/usb-none.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -26,5 +25,6 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 ca034d6885..c6ef400c5d 100644
--- a/tests/qemuxml2argvdata/usb-piix3-controller.args
+++ b/tests/qemuxml2argvdata/usb-piix3-controller.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,5 +26,6 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-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 da2611c430..c20e22e623 100644
--- a/tests/qemuxml2argvdata/usb-port-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-port-autoassign.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
-device usb-mouse,id=input0,bus=usb.0,port=1.1 \
-device usb-mouse,id=input1,bus=usb.0,port=1.2 \
-device usb-mouse,id=input2,bus=usb.0,port=1.3 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-port-missing.args
b/tests/qemuxml2argvdata/usb-port-missing.args
index 8ba74ec735..0f257fee3f 100644
--- a/tests/qemuxml2argvdata/usb-port-missing.args
+++ b/tests/qemuxml2argvdata/usb-port-missing.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
-device usb-hub,id=hub0,bus=usb.0,port=1 \
-device usb-hub,id=hub1,bus=usb.0,port=2 \
-device usb-mouse,id=input0,bus=usb.0,port=1.1 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-ports.args
b/tests/qemuxml2argvdata/usb-ports.args
index 458dff8286..a11986ce3d 100644
--- a/tests/qemuxml2argvdata/usb-ports.args
+++ b/tests/qemuxml2argvdata/usb-ports.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -32,5 +31,6 @@ QEMU_AUDIO_DRV=none \
-device usb-mouse,id=input0,bus=usb.0,port=1.1 \
-device usb-mouse,id=input1,bus=usb.0,port=1.2.1 \
-device usb-mouse,id=input2,bus=usb.0,port=1.2.2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args
b/tests/qemuxml2argvdata/usb-redir-boot.args
index 59edb9705f..b29df8721a 100644
--- a/tests/qemuxml2argvdata/usb-redir-boot.args
+++ b/tests/qemuxml2argvdata/usb-redir-boot.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=spice \
-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 \
-device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
+-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice port=0,seamless-migration=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-chardev socket,id=charredir0,host=localhost,port=4000 \
diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args
b/tests/qemuxml2argvdata/usb-redir-filter-version.args
index 67e9471694..593bb31f2f 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter-version.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -26,6 +25,7 @@ QEMU_AUDIO_DRV=spice \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice port=0,seamless-migration=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-chardev spicevmc,id=charredir0,name=usbredir \
diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args
b/tests/qemuxml2argvdata/usb-redir-filter.args
index 9b00bc2a9f..7c8a4bc729 100644
--- a/tests/qemuxml2argvdata/usb-redir-filter.args
+++ b/tests/qemuxml2argvdata/usb-redir-filter.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=spice \
-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 \
-device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
+-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice port=0,seamless-migration=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-chardev spicevmc,id=charredir0,name=usbredir \
diff --git a/tests/qemuxml2argvdata/usb-redir.args
b/tests/qemuxml2argvdata/usb-redir.args
index d4eb6e1371..94634f5446 100644
--- a/tests/qemuxml2argvdata/usb-redir.args
+++ b/tests/qemuxml2argvdata/usb-redir.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=spice \
-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 \
-device ich9-usb-uhci3,masterbus=usb.0,firstport=4,bus=pci.0,addr=0x4.0x2 \
+-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice port=0,seamless-migration=on \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-chardev socket,id=charredir0,host=localhost,port=4000 \
diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
index 71b3777ded..a8abeb4f70 100644
--- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
+++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -32,4 +31,5 @@ QEMU_AUDIO_DRV=none \
-device usb-mouse,id=input0,bus=usb.0,port=3 \
-device usb-mouse,id=input1,bus=usb.0,port=4 \
-device usb-mouse,id=input2,bus=usb.0,port=5 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/usb1-usb2.args
b/tests/qemuxml2argvdata/usb1-usb2.args
index 429be6c3a1..f4c3741def 100644
--- a/tests/qemuxml2argvdata/usb1-usb2.args
+++ b/tests/qemuxml2argvdata/usb1-usb2.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -37,6 +36,7 @@ QEMU_AUDIO_DRV=none \
-device ich9-usb-uhci3,masterbus=usb2.0,firstport=4,bus=pci.0,addr=0x5.0x2 \
-device usb-hub,id=hub0,bus=usb1.0,port=1 \
-device usb-tablet,id=input0,bus=usb.0,port=2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=usb2.0,port=1 \
-device usb-host,hostbus=14,hostaddr=7,id=hostdev1,bus=usb2.0,port=2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/user-aliases-usb.args
b/tests/qemuxml2argvdata/user-aliases-usb.args
index 6906abd4c1..932c3ea296 100644
--- a/tests/qemuxml2argvdata/user-aliases-usb.args
+++ b/tests/qemuxml2argvdata/user-aliases-usb.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-gentoo/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-gentoo/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-gentoo/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=gentoo,debug-threads=on \
-S \
@@ -35,6 +34,7 @@ QEMU_AUDIO_DRV=none \
-device
ich9-usb-uhci1,masterbus=ua-myUSB5.0,firstport=0,bus=pci.0,multifunction=on,addr=0x5 \
-device ich9-usb-uhci2,masterbus=ua-myUSB5.0,firstport=2,bus=pci.0,addr=0x5.0x1 \
-device ich9-usb-uhci3,masterbus=ua-myUSB5.0,firstport=4,bus=pci.0,addr=0x5.0x2 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device usb-host,hostbus=14,hostaddr=6,id=hostdev0,bus=ua-myUSB1.0,port=3 \
-device usb-host,hostbus=15,hostaddr=6,id=hostdev1,bus=ua-myUSB5.0,port=3 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
diff --git a/tests/qemuxml2argvdata/user-aliases.args
b/tests/qemuxml2argvdata/user-aliases.args
index c80be4b439..25eb4f4f90 100644
--- a/tests/qemuxml2argvdata/user-aliases.args
+++ b/tests/qemuxml2argvdata/user-aliases.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-gentoo/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-gentoo/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-gentoo/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=gentoo,debug-threads=on \
-S \
@@ -60,9 +59,10 @@ QEMU_AUDIO_DRV=none \
-device isa-serial,chardev=charserial1,id=serial1,index=1 \
-chardev socket,id=charchannel0,fd=1729,server=on,wait=off \
-device
virtserialport,bus=virtio-serial0.0,nr=1,chardev=charchannel0,id=channel0,name=org.qemu.guest_agent.0
\
--vnc 127.0.0.1:0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
-device cirrus-vga,id=video0,bus=pci.0,addr=0x2 \
-device intel-hda,id=sound0,bus=pci.0,addr=0x4 \
--device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0 \
+-device hda-duplex,id=sound0-codec0,bus=sound0.0,cad=0,audiodev=audio1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x6 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.args
b/tests/qemuxml2argvdata/vcpu-placement-static.args
index 515a849e8e..f5b24e1875 100644
--- a/tests/qemuxml2argvdata/vcpu-placement-static.args
+++ b/tests/qemuxml2argvdata/vcpu-placement-static.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-dummy2/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-dummy2/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-dummy2/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=dummy2,debug-threads=on \
-S \
@@ -28,4 +27,5 @@ QEMU_AUDIO_DRV=none \
-no-shutdown \
-no-acpi \
-boot strict=on \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
index 688585f049..50f5067a9d 100644
--- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
+++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,7 +27,8 @@ QEMU_AUDIO_DRV=none \
-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 \
--vnc 127.0.0.1:0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x3 \
-device
qxl,id=video1,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
-device
qxl,id=video2,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x5 \
diff --git a/tests/qemuxml2argvdata/video-none-device.args
b/tests/qemuxml2argvdata/video-none-device.args
index b215889d2d..533bb92786 100644
--- a/tests/qemuxml2argvdata/video-none-device.args
+++ b/tests/qemuxml2argvdata/video-none-device.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,6 +27,7 @@ QEMU_AUDIO_DRV=none \
-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 \
--vnc 127.0.0.1:0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
index 93c582c100..7c5d1ef124 100644
--- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x2
\
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-device.args
b/tests/qemuxml2argvdata/video-qxl-device.args
index c5b2267e42..666f47a59c 100644
--- a/tests/qemuxml2argvdata/video-qxl-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-device.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args
b/tests/qemuxml2argvdata/video-qxl-heads.args
index 1c1943ef05..10d431a633 100644
--- a/tests/qemuxml2argvdata/video-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-qxl-heads.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
-device
qxl,id=video1,max_outputs=3,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
-device
qxl,id=video2,max_outputs=7,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x5 \
diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args
b/tests/qemuxml2argvdata/video-qxl-noheads.args
index 39699d8a52..453c572a4b 100644
--- a/tests/qemuxml2argvdata/video-qxl-noheads.args
+++ b/tests/qemuxml2argvdata/video-qxl-noheads.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args
b/tests/qemuxml2argvdata/video-qxl-resolution.args
index 17482f9056..c48eef1b4a 100644
--- a/tests/qemuxml2argvdata/video-qxl-resolution.args
+++ b/tests/qemuxml2argvdata/video-qxl-resolution.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=8,xres=1280,yres=720,bus=pci.0,addr=0x2
\
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
index d5b54cfac7..560bbfd9b0 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x2
\
-device
qxl,id=video1,max_outputs=1,ram_size=67108864,vram_size=67108864,vgamem_mb=16,bus=pci.0,addr=0x4
\
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args
b/tests/qemuxml2argvdata/video-qxl-sec-device.args
index 3a4fd981b4..9d9d883e60 100644
--- a/tests/qemuxml2argvdata/video-qxl-sec-device.args
+++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
-device
qxl,id=video1,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x4 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
index 75b47c12f5..73fe9a0672 100644
--- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
+++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device VGA,id=video0,vgamem_mb=16,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-vga-device.args
b/tests/qemuxml2argvdata/video-vga-device.args
index ac19b4365e..296ac69132 100644
--- a/tests/qemuxml2argvdata/video-vga-device.args
+++ b/tests/qemuxml2argvdata/video-vga-device.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device VGA,id=video0,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
index 1c1943ef05..10d431a633 100644
--- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device
qxl-vga,id=video0,max_outputs=1,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x2 \
-device
qxl,id=video1,max_outputs=3,ram_size=67108864,vram_size=33554432,bus=pci.0,addr=0x4 \
-device
qxl,id=video2,max_outputs=7,ram_size=67108864,vram_size=67108864,bus=pci.0,addr=0x5 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
index d002b6daea..42354c6eca 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -26,7 +25,8 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
+-vnc 127.0.0.1:0,audiodev=audio1 \
-device virtio-gpu-ccw,id=video0,max_outputs=1,devno=fe.0.0002 \
-device virtio-gpu-ccw,id=video1,max_outputs=1,devno=fe.0.0003 \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.0001 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
index 012f8e50b9..72d3c3bde3 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
index 6061c6a34b..248bb6faf4 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-x86_64 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-gpu-pci,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \
-device virtio-gpu-pci,id=video1,max_outputs=1,bus=pci.0,addr=0x4 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
index 1b32054121..c16450e3fd 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=spice \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,6 +27,7 @@ QEMU_AUDIO_DRV=spice \
-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 \
+-audiodev
'{"id":"audio1","driver":"spice"}' \
-spice port=0,gl=on,rendernode=/dev/dri/foo,seamless-migration=on \
-device virtio-gpu-pci,id=video0,virgl=on,max_outputs=1,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
index 5851e93804..ab7686b3f8 100644
--- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
+++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-gpu-pci,id=video0,virgl=on,max_outputs=1,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args
b/tests/qemuxml2argvdata/video-virtio-vga.args
index bf864efec0..75be9dc8ed 100644
--- a/tests/qemuxml2argvdata/video-virtio-vga.args
+++ b/tests/qemuxml2argvdata/video-virtio-vga.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-vga,id=video0,max_outputs=1,bus=pci.0,addr=0x2 \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x3 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args
b/tests/qemuxml2argvdata/virtio-input-passthrough.args
index 4e45f27965..8f646201e2 100644
--- a/tests/qemuxml2argvdata/virtio-input-passthrough.args
+++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -28,5 +27,6 @@ QEMU_AUDIO_DRV=none \
-boot strict=on \
-usb \
-device virtio-input-host-pci,id=input0,evdev=/dev/input/event1234,bus=pci.0,addr=0x3 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-input.args
b/tests/qemuxml2argvdata/virtio-input.args
index 34164771c8..c21b482d5d 100644
--- a/tests/qemuxml2argvdata/virtio-input.args
+++ b/tests/qemuxml2argvdata/virtio-input.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,5 +29,6 @@ QEMU_AUDIO_DRV=none \
-device virtio-mouse-pci,id=input0,bus=pci.0,addr=0x3 \
-device virtio-keyboard-pci,id=input1,bus=pci.0,addr=0xa \
-device virtio-tablet-pci,id=input2,bus=pci.0,addr=0x4 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-msg timestamp=on
diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args
b/tests/qemuxml2argvdata/virtio-rng-ccw.args
index 0c235200e3..11650f12b3 100644
--- a/tests/qemuxml2argvdata/virtio-rng-ccw.args
+++ b/tests/qemuxml2argvdata/virtio-rng-ccw.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-s390x \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -30,6 +29,7 @@ QEMU_AUDIO_DRV=none \
-device
virtio-blk-ccw,devno=fe.0.0000,drive=drive-virtio-disk0,id=virtio-disk0,bootindex=1 \
-chardev pty,id=charconsole0 \
-device virtconsole,chardev=charconsole0,id=console0 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-ccw,id=balloon0,devno=fe.0.000a \
-object rng-random,id=objrng0,filename=/dev/hwrng \
-device virtio-rng-ccw,rng=objrng0,id=rng0,devno=fe.0.0002 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args
b/tests/qemuxml2argvdata/virtio-rng-default.args
index d4171e4ca3..ff997d006c 100644
--- a/tests/qemuxml2argvdata/virtio-rng-default.args
+++ b/tests/qemuxml2argvdata/virtio-rng-default.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-object rng-random,id=objrng0,filename=/dev/random \
-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x7 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args
b/tests/qemuxml2argvdata/virtio-rng-egd.args
index 21d2cb8e47..425bfc212c 100644
--- a/tests/qemuxml2argvdata/virtio-rng-egd.args
+++ b/tests/qemuxml2argvdata/virtio-rng-egd.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-chardev socket,id=charrng0,host=1.2.3.4,port=1234 \
-object rng-egd,id=objrng0,chardev=charrng0 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args
b/tests/qemuxml2argvdata/virtio-rng-multiple.args
index 7df6301d57..b7fbbc6110 100644
--- a/tests/qemuxml2argvdata/virtio-rng-multiple.args
+++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-object rng-random,id=objrng0,filename=/dev/random \
-device virtio-rng-pci,rng=objrng0,id=rng0,bus=pci.0,addr=0x7 \
diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args
b/tests/qemuxml2argvdata/virtio-rng-random.args
index ee4afdf364..1468629efb 100644
--- a/tests/qemuxml2argvdata/virtio-rng-random.args
+++ b/tests/qemuxml2argvdata/virtio-rng-random.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -27,6 +26,7 @@ QEMU_AUDIO_DRV=none \
-no-acpi \
-boot strict=on \
-usb \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-object rng-random,id=objrng0,filename=/dev/urandom \
-device virtio-rng-pci,rng=objrng0,id=rng0,max-bytes=123,period=1234,bus=pci.0,addr=0x3
\
diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args
b/tests/qemuxml2argvdata/vmcoreinfo.args
index b19675561a..b1912a19d9 100644
--- a/tests/qemuxml2argvdata/vmcoreinfo.args
+++ b/tests/qemuxml2argvdata/vmcoreinfo.args
@@ -6,7 +6,6 @@ LOGNAME=test \
XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
/usr/bin/qemu-system-i386 \
-name guest=QEMUGuest1,debug-threads=on \
-S \
@@ -29,6 +28,7 @@ QEMU_AUDIO_DRV=none \
-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 \
+-audiodev
'{"id":"audio1","driver":"none"}' \
-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x2 \
-device vmcoreinfo \
-msg timestamp=on
--
2.36.1
6:44 a.m.
New subject: [PATCH 16/20] qemu: command: Drop the code for configuring audio devices via environment variables
Remove the old now unused code.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 183 ----------------------------------------
1 file changed, 183 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 4d9a0eb2e1..57e8115db3 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8030,189 +8030,6 @@ qemuBuildAudioCommandLineArgs(virCommand *cmd,
return 0;
}
-static void
-qemuBuildAudioCommonEnv(virCommand *cmd,
- const char *prefix,
- virDomainAudioIOCommon *def)
-{
- if (def->fixedSettings)
- virCommandAddEnvFormat(cmd, "%sFIXED_SETTINGS=%s",
- prefix,
- virTristateSwitchTypeToString(def->fixedSettings));
-
- if (def->voices)
- virCommandAddEnvFormat(cmd, "%sVOICES=%u",
- prefix, def->voices);
-
- if (def->fixedSettings) {
- if (def->frequency)
- virCommandAddEnvFormat(cmd, "%sFIXED_FREQ=%u",
- prefix, def->frequency);
- if (def->channels)
- virCommandAddEnvFormat(cmd, "%sFIXED_CHANNELS=%u",
- prefix, def->channels);
- if (def->format)
- virCommandAddEnvFormat(cmd, "%sFIXED_FMT=%s",
- prefix,
- virDomainAudioFormatTypeToString(def->format));
- }
-}
-
-static void
-qemuBuildAudioALSAEnv(virCommand *cmd,
- const char *prefix,
- virDomainAudioIOALSA *def)
-{
- if (def->dev)
- virCommandAddEnvFormat(cmd, "%sDEV=%s",
- prefix, def->dev);
-}
-
-static void
-qemuBuildAudioCoreAudioEnv(virCommand *cmd,
- virDomainAudioDef *def)
-{
- if (def->backend.coreaudio.output.bufferCount)
- virCommandAddEnvFormat(cmd, "QEMU_COREAUDIO_BUFFER_COUNT=%u",
- def->backend.coreaudio.output.bufferCount);
- if (def->output.bufferLength)
- virCommandAddEnvFormat(cmd, "QEMU_COREAUDIO_BUFFER_SIZE=%u",
- def->output.bufferLength);
-}
-
-static void
-qemuBuildAudioOSSEnv(virCommand *cmd,
- const char *prefix,
- const char *prefix2,
- virDomainAudioIOOSS *def)
-{
- if (def->dev)
- virCommandAddEnvFormat(cmd, "%sDEV=%s",
- prefix, def->dev);
- if (def->tryPoll)
- virCommandAddEnvFormat(cmd, "%sTRY_POLL=%s", prefix2,
- virTristateSwitchTypeToString(def->tryPoll));
-}
-
-static void
-qemuBuildAudioPulseAudioEnv(virCommand *cmd,
- virDomainAudioDef *def)
-{
- if (def->backend.pulseaudio.input.name)
- virCommandAddEnvPair(cmd, "QEMU_PA_SOURCE",
- def->backend.pulseaudio.input.name);
- if (def->backend.pulseaudio.output.name)
- virCommandAddEnvPair(cmd, "QEMU_PA_SINK",
- def->backend.pulseaudio.output.name);
-
- if (def->input.bufferLength)
- virCommandAddEnvFormat(cmd, "QEMU_PA_SAMPLES=%u",
- def->input.bufferLength);
-
- if (def->backend.pulseaudio.serverName)
- virCommandAddEnvPair(cmd, "QEMU_PA_SERVER=%s",
- def->backend.pulseaudio.serverName);
-}
-
-
-static int G_GNUC_UNUSED
-qemuBuildAudioCommandLineEnv(virCommand *cmd,
- virDomainDef *def)
-{
- virDomainAudioDef *audio;
- if (def->naudios != 1)
- return 0;
-
- audio = def->audios[0];
- virCommandAddEnvPair(cmd, "QEMU_AUDIO_DRV",
- qemuAudioDriverTypeToString(audio->type));
-
- if (audio->timerPeriod)
- virCommandAddEnvFormat(cmd, "QEMU_AUDIO_TIMER_PERIOD=%u",
- audio->timerPeriod);
-
- qemuBuildAudioCommonEnv(cmd, "QEMU_AUDIO_ADC_", &audio->input);
- qemuBuildAudioCommonEnv(cmd, "QEMU_AUDIO_DAC_", &audio->output);
-
- switch (audio->type) {
- case VIR_DOMAIN_AUDIO_TYPE_NONE:
- break;
-
- case VIR_DOMAIN_AUDIO_TYPE_ALSA:
- qemuBuildAudioALSAEnv(cmd, "QEMU_AUDIO_ADC_",
&audio->backend.alsa.input);
- qemuBuildAudioALSAEnv(cmd, "QEMU_AUDIO_DAC_",
&audio->backend.alsa.output);
- break;
-
- case VIR_DOMAIN_AUDIO_TYPE_COREAUDIO:
- qemuBuildAudioCoreAudioEnv(cmd, audio);
- break;
-
- case VIR_DOMAIN_AUDIO_TYPE_JACK:
- break;
-
- case VIR_DOMAIN_AUDIO_TYPE_OSS:
- qemuBuildAudioOSSEnv(cmd, "QEMU_OSS_ADC_",
"QEMU_AUDIO_ADC_",
- &audio->backend.oss.input);
- qemuBuildAudioOSSEnv(cmd, "QEMU_OSS_DAC_",
"QEMU_AUDIO_DAC_",
- &audio->backend.oss.output);
-
- if (audio->backend.oss.input.bufferCount)
- virCommandAddEnvFormat(cmd, "QEMU_OSS_NFRAGS=%u",
- audio->backend.oss.input.bufferCount);
-
- if (audio->backend.oss.tryMMap)
- virCommandAddEnvFormat(cmd, "QEMU_OSS_MMAP=%s",
-
virTristateSwitchTypeToString(audio->backend.oss.tryMMap));
- if (audio->backend.oss.exclusive)
- virCommandAddEnvFormat(cmd, "QEMU_OSS_EXCLUSIVE=%s",
-
virTristateSwitchTypeToString(audio->backend.oss.exclusive));
- if (audio->backend.oss.dspPolicySet)
- virCommandAddEnvFormat(cmd, "QEMU_OSS_POLICY=%d",
- audio->backend.oss.dspPolicy);
- break;
-
- case VIR_DOMAIN_AUDIO_TYPE_PULSEAUDIO:
- qemuBuildAudioPulseAudioEnv(cmd, audio);
- break;
-
- case VIR_DOMAIN_AUDIO_TYPE_SDL:
- if (audio->output.bufferLength)
- virCommandAddEnvFormat(cmd, "QEMU_SDL_SAMPLES=%u",
- audio->output.bufferLength);
-
- if (audio->backend.sdl.driver) {
- /*
- * Some SDL audio driver names are different on SDL 1.2
- * vs 2.0. Given how old SDL 1.2 is, we're not going
- * make any attempt to support it here as it is unlikely
- * to have an real world users. We can assume libvirt
- * driver name strings match SDL 2.0 names.
- */
- virCommandAddEnvPair(cmd, "SDL_AUDIODRIVER",
- virDomainAudioSDLDriverTypeToString(
- audio->backend.sdl.driver));
- }
- break;
-
- case VIR_DOMAIN_AUDIO_TYPE_SPICE:
- break;
-
- case VIR_DOMAIN_AUDIO_TYPE_FILE:
- if (audio->backend.file.path)
- virCommandAddEnvFormat(cmd, "QEMU_WAV_PATH=%s",
- audio->backend.file.path);
- break;
-
- case VIR_DOMAIN_AUDIO_TYPE_DBUS:
- break;
-
- case VIR_DOMAIN_AUDIO_TYPE_LAST:
- default:
- virReportEnumRangeError(virDomainAudioType, audio->type);
- return -1;
- }
- return 0;
-}
static int
qemuBuildAudioCommandLine(virCommand *cmd,
--
2.36.1
6:44 a.m.
New subject: [PATCH 17/20] qemu: command: Drop qemuBuildAudioCommandLine thin wrapper
Rename qemuBuildAudioCommandLineArgs to qemuBuildAudioCommandLine and
fix the arguments.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_command.c | 15 +++------------
1 file changed, 3 insertions(+), 12 deletions(-)
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 57e8115db3..5af6ef5e11 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -8019,8 +8019,8 @@ qemuBuildAudioCommandLineArg(virCommand *cmd,
}
static int
-qemuBuildAudioCommandLineArgs(virCommand *cmd,
- virDomainDef *def)
+qemuBuildAudioCommandLine(virCommand *cmd,
+ virDomainDef *def)
{
size_t i;
for (i = 0; i < def->naudios; i++) {
@@ -8031,15 +8031,6 @@ qemuBuildAudioCommandLineArgs(virCommand *cmd,
}
-static int
-qemuBuildAudioCommandLine(virCommand *cmd,
- virDomainDef *def,
- virQEMUCaps *qemuCaps G_GNUC_UNUSED)
-{
- return qemuBuildAudioCommandLineArgs(cmd, def);
-}
-
-
static int
qemuBuildGraphicsSDLCommandLine(virQEMUDriverConfig *cfg G_GNUC_UNUSED,
virCommand *cmd,
@@ -10489,7 +10480,7 @@ qemuBuildCommandLine(virDomainObj *vm,
if (qemuBuildInputCommandLine(cmd, def, qemuCaps) < 0)
return NULL;
- if (qemuBuildAudioCommandLine(cmd, def, qemuCaps) < 0)
+ if (qemuBuildAudioCommandLine(cmd, def) < 0)
return NULL;
if (qemuBuildGraphicsCommandLine(cfg, cmd, def, qemuCaps) < 0)
--
2.36.1
6:44 a.m.
New subject: [PATCH 18/20] qemu: validate: Remove unreachable checks for QEMU_CAPS_AUDIODEV
We now only support qemu versions which already have the capability so
we can remove this now unused code.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_validate.c | 86 ----------------------------------------
1 file changed, 86 deletions(-)
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 764d5b029e..4016b1b6f0 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -1344,13 +1344,6 @@ qemuValidateDomainDef(const virDomainDef *def,
}
}
- if (def->naudios > 1 &&
- !virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("only one audio backend is supported with this QEMU
binary"));
- return -1;
- }
-
return 0;
}
@@ -4530,25 +4523,6 @@ qemuValidateDomainDeviceDefAudio(virDomainAudioDef *audio,
const virDomainDef *def,
virQEMUCaps *qemuCaps G_GNUC_UNUSED)
{
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
- if (audio->input.mixingEngine == VIR_TRISTATE_BOOL_NO ||
- audio->output.mixingEngine == VIR_TRISTATE_BOOL_NO) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("disabling audio mixing engine is not supported with
this QEMU"));
- return -1;
- }
-
- if ((audio->input.bufferLength ||
- audio->output.bufferLength) &&
- (audio->type != VIR_DOMAIN_AUDIO_TYPE_PULSEAUDIO &&
- audio->type != VIR_DOMAIN_AUDIO_TYPE_COREAUDIO &&
- audio->type != VIR_DOMAIN_AUDIO_TYPE_SDL)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("setting audio buffer length is not supported with this
QEMU"));
- return -1;
- }
- }
-
switch (audio->type) {
case VIR_DOMAIN_AUDIO_TYPE_NONE:
break;
@@ -4557,78 +4531,18 @@ qemuValidateDomainDeviceDefAudio(virDomainAudioDef *audio,
break;
case VIR_DOMAIN_AUDIO_TYPE_COREAUDIO:
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
- if (audio->input.bufferLength) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("setting audio buffer length is not supported with
this QEMU"));
- return -1;
- }
- if (audio->backend.coreaudio.input.bufferCount) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("setting audio buffer count is not supported with
this QEMU"));
- return -1;
- }
- }
break;
case VIR_DOMAIN_AUDIO_TYPE_JACK:
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("'jack' audio backend is not supported with
this QEMU"));
- return -1;
- }
break;
case VIR_DOMAIN_AUDIO_TYPE_OSS:
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
- if (audio->backend.oss.input.bufferCount !=
- audio->backend.oss.output.bufferCount) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("setting audio buffer count is not supported with
this QEMU"));
- return -1;
- }
- }
break;
case VIR_DOMAIN_AUDIO_TYPE_PULSEAUDIO:
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
- if (audio->backend.pulseaudio.input.streamName ||
- audio->backend.pulseaudio.output.streamName) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("setting audio stream name is not supported with
this QEMU"));
- return -1;
- }
-
- if (audio->backend.pulseaudio.input.latency ||
- audio->backend.pulseaudio.output.latency) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("setting audio latency is not supported with this
QEMU"));
- return -1;
- }
-
- if (audio->input.bufferLength != audio->output.bufferLength) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("setting audio buffer length is not supported with
this QEMU"));
- return -1;
- }
- }
break;
case VIR_DOMAIN_AUDIO_TYPE_SDL:
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
- if (audio->input.bufferLength) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("setting audio buffer length is not supported with
this QEMU"));
- return -1;
- }
-
- if (audio->backend.sdl.input.bufferCount ||
- audio->backend.sdl.output.bufferCount) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("setting audio buffer count is not supported with
this QEMU"));
- return -1;
- }
- }
break;
case VIR_DOMAIN_AUDIO_TYPE_SPICE:
--
2.36.1
8:57 a.m.
New subject: [PATCH 18/20] qemu: validate: Remove unreachable checks for QEMU_CAPS_AUDIODEV
On 7/15/22 13:44, Peter Krempa wrote:
We now only support qemu versions which already have the capability
so
we can remove this now unused code.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_validate.c | 86 ----------------------------------------
1 file changed, 86 deletions(-)
diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
index 764d5b029e..4016b1b6f0 100644
--- a/src/qemu/qemu_validate.c
+++ b/src/qemu/qemu_validate.c
@@ -1344,13 +1344,6 @@ qemuValidateDomainDef(const virDomainDef *def,
}
}
- if (def->naudios > 1 &&
- !virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("only one audio backend is supported with this QEMU
binary"));
- return -1;
- }
-
return 0;
}
@@ -4530,25 +4523,6 @@ qemuValidateDomainDeviceDefAudio(virDomainAudioDef *audio,
const virDomainDef *def,
virQEMUCaps *qemuCaps G_GNUC_UNUSED)
{
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
- if (audio->input.mixingEngine == VIR_TRISTATE_BOOL_NO ||
- audio->output.mixingEngine == VIR_TRISTATE_BOOL_NO) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("disabling audio mixing engine is not supported with
this QEMU"));
- return -1;
- }
-
- if ((audio->input.bufferLength ||
- audio->output.bufferLength) &&
- (audio->type != VIR_DOMAIN_AUDIO_TYPE_PULSEAUDIO &&
- audio->type != VIR_DOMAIN_AUDIO_TYPE_COREAUDIO &&
- audio->type != VIR_DOMAIN_AUDIO_TYPE_SDL)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("setting audio buffer length is not supported with
this QEMU"));
- return -1;
- }
- }
-
switch (audio->type) {
case VIR_DOMAIN_AUDIO_TYPE_NONE:
break;
@@ -4557,78 +4531,18 @@ qemuValidateDomainDeviceDefAudio(virDomainAudioDef *audio,
break;
case VIR_DOMAIN_AUDIO_TYPE_COREAUDIO:
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
- if (audio->input.bufferLength) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("setting audio buffer length is not supported with
this QEMU"));
- return -1;
- }
- if (audio->backend.coreaudio.input.bufferCount) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("setting audio buffer count is not supported with
this QEMU"));
- return -1;
- }
- }
break;
case VIR_DOMAIN_AUDIO_TYPE_JACK:
- if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_AUDIODEV)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("'jack' audio backend is not supported with
this QEMU"));
- return -1;
- }
break;
These 'break' statements, well 'case' can be joined into a single one:
case X:
case Y:
case Z:
break;
Michal
6:44 a.m.
New subject: [PATCH 19/20] qemuxml2(argv|xml)test: Remove use of QEMU_CAPS_AUDIODEV in fake-caps tests
The code no longer uses the capability so the tests don't need to assert
it.
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
tests/qemuxml2argvtest.c | 2 +-
tests/qemuxml2xmltest.c | 20 +++++++++-----------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 4897d2f87b..07bd40d6e9 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1490,7 +1490,7 @@ mymain(void)
DO_TEST("graphics-dbus-p2p",
QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS);
DO_TEST("graphics-dbus-audio",
- QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS, QEMU_CAPS_AUDIODEV);
+ QEMU_CAPS_DEVICE_CIRRUS_VGA, QEMU_CAPS_DISPLAY_DBUS);
DO_TEST("graphics-dbus-chardev",
QEMU_CAPS_DEVICE_ISA_SERIAL,
QEMU_CAPS_DEVICE_CIRRUS_VGA,
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 4eabefada0..9db28b14cf 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -411,8 +411,7 @@ mymain(void)
QEMU_CAPS_DISPLAY_DBUS);
DO_TEST("graphics-dbus-audio",
QEMU_CAPS_DEVICE_CIRRUS_VGA,
- QEMU_CAPS_DISPLAY_DBUS,
- QEMU_CAPS_AUDIODEV);
+ QEMU_CAPS_DISPLAY_DBUS);
DO_TEST("graphics-dbus-chardev",
QEMU_CAPS_DEVICE_CIRRUS_VGA,
QEMU_CAPS_DISPLAY_DBUS);
@@ -1401,18 +1400,17 @@ mymain(void)
DO_TEST_NOCAPS("audio-file-best");
/* Full <audio> only compat with new QEMU -audiodev args */
- DO_TEST("audio-none-full", QEMU_CAPS_AUDIODEV);
- DO_TEST("audio-alsa-full", QEMU_CAPS_AUDIODEV);
- DO_TEST("audio-coreaudio-full", QEMU_CAPS_AUDIODEV);
- DO_TEST("audio-jack-full", QEMU_CAPS_AUDIODEV);
- DO_TEST("audio-oss-full", QEMU_CAPS_AUDIODEV);
- DO_TEST("audio-pulseaudio-full", QEMU_CAPS_AUDIODEV);
- DO_TEST("audio-sdl-full", QEMU_CAPS_AUDIODEV);
+ DO_TEST_NOCAPS("audio-none-full");
+ DO_TEST_NOCAPS("audio-alsa-full");
+ DO_TEST_NOCAPS("audio-coreaudio-full");
+ DO_TEST_NOCAPS("audio-jack-full");
+ DO_TEST_NOCAPS("audio-oss-full");
+ DO_TEST_NOCAPS("audio-pulseaudio-full");
+ DO_TEST_NOCAPS("audio-sdl-full");
DO_TEST("audio-spice-full",
- QEMU_CAPS_AUDIODEV,
QEMU_CAPS_SPICE,
QEMU_CAPS_DEVICE_CIRRUS_VGA);
- DO_TEST("audio-file-full", QEMU_CAPS_AUDIODEV);
+ DO_TEST_NOCAPS("audio-file-full");
DO_TEST_CAPS_LATEST("audio-many-backends");
--
2.36.1
6:44 a.m.
New subject: [PATCH 20/20] qemu: capabilities: Retire QEMU_CAPS_AUDIODEV
Signed-off-by: Peter Krempa <pkrempa(a)redhat.com>
---
src/qemu/qemu_capabilities.c | 3 +--
src/qemu/qemu_capabilities.h | 2 +-
tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 -
tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml | 1 -
28 files changed, 2 insertions(+), 29 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index c02fef6acd..e4295aa8a9 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -620,7 +620,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
/* 395 */
"vnc-power-control", /* QEMU_CAPS_VNC_POWER_CONTROL */
- "audiodev", /* QEMU_CAPS_AUDIODEV */
+ "audiodev", /* X_QEMU_CAPS_AUDIODEV */
"blockdev-backup", /* QEMU_CAPS_BLOCKDEV_BACKUP */
"object.qapified", /* QEMU_CAPS_OBJECT_JSON */
"rotation-rate", /* QEMU_CAPS_ROTATION_RATE */
@@ -3306,7 +3306,6 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] =
{
{ "spice", "gl", QEMU_CAPS_SPICE_GL },
{ "spice", "rendernode", QEMU_CAPS_SPICE_RENDERNODE },
{ "vnc", "power-control", QEMU_CAPS_VNC_POWER_CONTROL },
- { "vnc", "audiodev", QEMU_CAPS_AUDIODEV },
};
static int
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index a409c1272c..14ecdabe60 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -599,7 +599,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check
*/
/* 395 */
QEMU_CAPS_VNC_POWER_CONTROL, /* -vnc power-control option */
- QEMU_CAPS_AUDIODEV, /* -audiodev instead of QEMU_AUDIO_DRV */
+ X_QEMU_CAPS_AUDIODEV, /* -audiodev instead of QEMU_AUDIO_DRV */
QEMU_CAPS_BLOCKDEV_BACKUP, /* qemu supports the blockdev-backup job */
QEMU_CAPS_OBJECT_JSON, /* parameters for object-add are formally described */
QEMU_CAPS_ROTATION_RATE, /* scsi-disk / ide-drive rotation-rate prop */
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
index 875e491581..51f2dfa246 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@@ -156,7 +156,6 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='rotation-rate'/>
<flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 428ecd4f42..93b8e8b8a2 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -154,7 +154,6 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
- <flag name='audiodev'/>
<flag name='rotation-rate'/>
<flag name='input-linux'/>
<flag name='query-display-options'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
index 725745593c..401aa2d22d 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@@ -121,7 +121,6 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='rotation-rate'/>
<flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index 6a54c44d79..b198448036 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -199,7 +199,6 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='rotation-rate'/>
<flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
index 35998cabf0..e27a250ad4 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@@ -166,7 +166,6 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='rotation-rate'/>
<flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
index b8ddf2e9a8..5ee8feed6c 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@@ -172,7 +172,6 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='rotation-rate'/>
<flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
index c49c258255..438eb94ca8 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@@ -158,7 +158,6 @@
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='rotation-rate'/>
<flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index ce297f2ef5..12f97ca168 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -206,7 +206,6 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='rotation-rate'/>
<flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
index e6a3ed5ec0..c53b6054dd 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@@ -80,7 +80,6 @@
<flag name='netdev.vhost-vdpa'/>
<flag name='ncr53c90'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='rotation-rate'/>
<flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index a49650cbcc..ffbc83333a 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -208,7 +208,6 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='rotation-rate'/>
<flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
index 42a4418a08..f32d0d6107 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@@ -170,7 +170,6 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='rotation-rate'/>
<flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
index d0dd058743..d0694c2605 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@@ -174,7 +174,6 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='rotation-rate'/>
<flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
index 25339f86d9..963e742470 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@@ -160,7 +160,6 @@
<flag name='am53c974'/>
<flag name='vhost-user-blk'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='rotation-rate'/>
<flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
index 30d10236e9..c03b43df0f 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@@ -128,7 +128,6 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='rotation-rate'/>
<flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 4ff03dbead..805b8acaf2 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -209,7 +209,6 @@
<flag name='vhost-user-blk'/>
<flag name='cpu-max'/>
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='rotation-rate'/>
<flag name='input-linux'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
index 2d861da97b..dc3944383f 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@@ -173,7 +173,6 @@
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
<flag name='migration-param.block-bitmap-mapping'/>
<flag name='vnc-power-control'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='object.qapified'/>
<flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
index 06543071aa..84aa09fc76 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@@ -130,7 +130,6 @@
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
<flag name='migration-param.block-bitmap-mapping'/>
<flag name='vnc-power-control'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='object.qapified'/>
<flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
index 38acee5f18..f089a30a06 100644
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@@ -212,7 +212,6 @@
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
<flag name='migration-param.block-bitmap-mapping'/>
<flag name='vnc-power-control'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='object.qapified'/>
<flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
index b03c6bfc24..7ca644202b 100644
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@@ -212,7 +212,6 @@
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
<flag name='migration-param.block-bitmap-mapping'/>
<flag name='vnc-power-control'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='object.qapified'/>
<flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
index 942c0ba169..dd13c1ea4c 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.aarch64.xml
@@ -182,7 +182,6 @@
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
<flag name='migration-param.block-bitmap-mapping'/>
<flag name='vnc-power-control'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='object.qapified'/>
<flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
index 983b54430d..fa3eaab75b 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.ppc64.xml
@@ -175,7 +175,6 @@
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
<flag name='migration-param.block-bitmap-mapping'/>
<flag name='vnc-power-control'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='object.qapified'/>
<flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
index 32f226acbd..af85cb41b2 100644
--- a/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0.x86_64.xml
@@ -212,7 +212,6 @@
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
<flag name='migration-param.block-bitmap-mapping'/>
<flag name='vnc-power-control'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='object.qapified'/>
<flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
index f4d7cbdd10..88247e586f 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.aarch64.xml
@@ -183,7 +183,6 @@
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
<flag name='migration-param.block-bitmap-mapping'/>
<flag name='vnc-power-control'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='object.qapified'/>
<flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
index 2f895294de..ad3b50ce23 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.ppc64.xml
@@ -186,7 +186,6 @@
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
<flag name='migration-param.block-bitmap-mapping'/>
<flag name='vnc-power-control'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='object.qapified'/>
<flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
index 17ea778d38..617c101a5d 100644
--- a/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0.x86_64.xml
@@ -212,7 +212,6 @@
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
<flag name='migration-param.block-bitmap-mapping'/>
<flag name='vnc-power-control'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='object.qapified'/>
<flag name='rotation-rate'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
index 5f5c839fea..8393400779 100644
--- a/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0.x86_64.xml
@@ -212,7 +212,6 @@
<flag name='memory-backend-file.x-use-canonical-path-for-ramblock-id'/>
<flag name='migration-param.block-bitmap-mapping'/>
<flag name='vnc-power-control'/>
- <flag name='audiodev'/>
<flag name='blockdev-backup'/>
<flag name='object.qapified'/>
<flag name='rotation-rate'/>
--
2.36.1
6:54 a.m.
Hello Peter,
can we retire as well support for migration_set_speed then?
The "if (!bwParam)" branches with calls to qemuMonitorSetMigrationSpeed are
overcomplicating qemu_migration.c and qemu_driver.c in my view.
Thanks,
Claudio
On 7/15/22 13:44, Peter Krempa wrote:
In August Debian 10 officially reaches EOL, thus we can bump minimum
qemu version to 4.2 which is being limited by Ubuntu and RHEL/Centos 8.
QEMU-4.2 allows us to remove a big bunch of old code though. Few
examples which this series (and the next iterations of it) will deal
with:
- old auidiodev config via ENV variables
- old-style VIRTIO tranitional setup (possibly)
- most of legacy block device setup (upcoming series)
This series is lacking the removal of Debian 10 from our CI infra
though, I'll post that separately once I get to it.
The patches can also be fetched at:
git fetch https://gitlab.com/pipo.sk/libvirt.git debian-10-remove-part1
as some of the pure-removal patches here will be truncated to prevent
spamming the list.
Peter Krempa (20):
qemuxml2(argv|xml)test: Remove 'qemu-4.1' variant of
'x86-kvm-32-on-64'
tests: qemuxml2argv: Remove pre-blockdev versions of disk-related
tests
qemuxml2argvtest: Drop 'qemu-4.1' variants of all audio tests
qemuxml2argvtest: Remove 'qemu-3.1' versions of
virtio-(non-)transitional tests
qemuxml2argvtest: Remove pre-qemu-4.2 versions of 'cpu-host-model'
test
qemuxml2argvtest: Remove 'qemu-4.0' version of aarch64-features-sve
case
qemuxml2argvtest: Remove 'qemu-4.0' versions of 'cpu-host-model-cmt'
and 'cpu-tsc-frequency'
tests: qemucapabilities: Remove qemu-3.1 test data
tests: domaincaps: Remove test data for qemu-3.1
qemucapabilitiestest: Remove test data for qemu-4.0
domaincapstest: Remove test data for qemu-4.0
qemucapabilitiestest: Remove test data for qemu-4.1
domaincapstest: Remove test data for qemu-4.1
qemu: Formally deprecate support for qemu < 4.2
qemu: command: Always assume QEMU_CAPS_AUDIODEV
qemu: command: Drop the code for configuring audio devices via
environment variables
qemu: command: Drop qemuBuildAudioCommandLine thin wrapper
qemu: validate: Remove unreachable checks for QEMU_CAPS_AUDIODEV
qemuxml2(argv|xml)test: Remove use of QEMU_CAPS_AUDIODEV in fake-caps
tests
qemu: capabilities: Retire QEMU_CAPS_AUDIODEV
docs/drvqemu.rst | 2 +-
src/qemu/qemu_capabilities.c | 7 +-
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 221 +-
src/qemu/qemu_validate.c | 86 -
.../domaincapsdata/qemu_3.1.0-q35.x86_64.xml | 211 -
.../domaincapsdata/qemu_3.1.0-tcg.x86_64.xml | 230 -
tests/domaincapsdata/qemu_3.1.0.ppc64.xml | 138 -
tests/domaincapsdata/qemu_3.1.0.x86_64.xml | 211 -
.../domaincapsdata/qemu_4.0.0-q35.x86_64.xml | 211 -
.../domaincapsdata/qemu_4.0.0-tcg.x86_64.xml | 230 -
.../qemu_4.0.0-virt.aarch64.xml | 179 -
tests/domaincapsdata/qemu_4.0.0.aarch64.xml | 173 -
tests/domaincapsdata/qemu_4.0.0.ppc64.xml | 139 -
tests/domaincapsdata/qemu_4.0.0.s390x.xml | 236 -
tests/domaincapsdata/qemu_4.0.0.x86_64.xml | 211 -
.../domaincapsdata/qemu_4.1.0-q35.x86_64.xml | 217 -
.../domaincapsdata/qemu_4.1.0-tcg.x86_64.xml | 233 -
tests/domaincapsdata/qemu_4.1.0.x86_64.xml | 217 -
.../caps_3.1.0.ppc64.replies | 23732 ---------------
.../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1072 -
.../caps_3.1.0.x86_64.replies | 24428 ---------------
.../caps_3.1.0.x86_64.xml | 1387 -
.../caps_4.0.0.aarch64.replies | 20893 -------------
.../caps_4.0.0.aarch64.xml | 363 -
.../caps_4.0.0.ppc64.replies | 24461 ---------------
.../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1091 -
.../caps_4.0.0.riscv32.replies | 18154 -----------
.../caps_4.0.0.riscv32.xml | 157 -
.../caps_4.0.0.riscv64.replies | 18154 -----------
.../caps_4.0.0.riscv64.xml | 157 -
.../caps_4.0.0.s390x.replies | 21721 -------------
.../qemucapabilitiesdata/caps_4.0.0.s390x.xml | 2891 --
.../caps_4.0.0.x86_64.replies | 25001 ---------------
.../caps_4.0.0.x86_64.xml | 1398 -
.../caps_4.1.0.x86_64.replies | 25198 ----------------
.../caps_4.1.0.x86_64.xml | 1971 --
.../caps_4.2.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 -
.../qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 -
.../caps_4.2.0.x86_64.xml | 1 -
.../caps_5.0.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 -
.../caps_5.0.0.riscv64.xml | 1 -
.../caps_5.0.0.x86_64.xml | 1 -
.../qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 -
.../caps_5.1.0.x86_64.xml | 1 -
.../caps_5.2.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 -
.../caps_5.2.0.riscv64.xml | 1 -
.../qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 -
.../caps_5.2.0.x86_64.xml | 1 -
.../caps_6.0.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 -
.../caps_6.0.0.x86_64.xml | 1 -
.../caps_6.1.0.x86_64.xml | 1 -
.../caps_6.2.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_6.2.0.ppc64.xml | 1 -
.../caps_6.2.0.x86_64.xml | 1 -
.../caps_7.0.0.aarch64.xml | 1 -
.../qemucapabilitiesdata/caps_7.0.0.ppc64.xml | 1 -
.../caps_7.0.0.x86_64.xml | 1 -
.../caps_7.1.0.x86_64.xml | 1 -
.../aarch64-aavmf-virtio-mmio.args | 2 +-
.../aarch64-cpu-passthrough.args | 2 +-
.../aarch64-features-sve.aarch64-4.0.0.err | 1 -
tests/qemuxml2argvdata/aarch64-gic-host.args | 2 +-
.../aarch64-gic-none-tcg.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-v2.args | 2 +-
tests/qemuxml2argvdata/aarch64-gic-v3.args | 2 +-
.../aarch64-kvm-32-on-64.args | 2 +-
.../qemuxml2argvdata/aarch64-pci-serial.args | 2 +-
.../aarch64-traditional-pci.args | 2 +-
.../aarch64-usb-controller-nec-xhci.args | 2 +-
.../aarch64-usb-controller-qemu-xhci.args | 2 +-
.../aarch64-video-default.args | 4 +-
.../aarch64-video-virtio-gpu-pci.args | 2 +-
.../aarch64-virt-2.6-virtio-pci-default.args | 2 +-
.../aarch64-virt-default-nic.args | 2 +-
.../qemuxml2argvdata/aarch64-virt-virtio.args | 2 +-
.../aarch64-virtio-pci-default.args | 2 +-
.../aarch64-virtio-pci-manual-addresses.args | 2 +-
tests/qemuxml2argvdata/acpi-table.args | 2 +-
.../arm-vexpressa9-basic.args | 2 +-
.../arm-vexpressa9-nodevs.args | 2 +-
.../arm-vexpressa9-virtio.args | 2 +-
tests/qemuxml2argvdata/arm-virt-virtio.args | 2 +-
.../audio-alsa-best.x86_64-4.1.0.args | 46 -
.../audio-alsa-full.x86_64-4.1.0.err | 1 -
.../audio-alsa-minimal.x86_64-4.1.0.args | 33 -
.../audio-coreaudio-best.x86_64-4.1.0.args | 46 -
.../audio-coreaudio-full.x86_64-4.1.0.err | 1 -
.../audio-coreaudio-minimal.x86_64-4.1.0.args | 33 -
...audio-default-nographics.x86_64-4.1.0.args | 33 -
tests/qemuxml2argvdata/audio-default-sdl.args | 2 +-
.../qemuxml2argvdata/audio-default-spice.args | 2 +-
tests/qemuxml2argvdata/audio-default-vnc.args | 4 +-
.../audio-file-best.x86_64-4.1.0.args | 45 -
.../audio-file-full.x86_64-4.1.0.err | 1 -
.../audio-file-minimal.x86_64-4.1.0.args | 33 -
.../audio-jack-full.x86_64-4.1.0.err | 1 -
.../audio-jack-minimal.x86_64-4.1.0.err | 1 -
.../audio-many-backends.x86_64-4.1.0.err | 1 -
.../audio-none-best.x86_64-4.1.0.args | 44 -
.../audio-none-full.x86_64-4.1.0.err | 1 -
.../audio-none-minimal.x86_64-4.1.0.args | 33 -
.../audio-oss-best.x86_64-4.1.0.args | 49 -
.../audio-oss-full.x86_64-4.1.0.err | 1 -
.../audio-oss-minimal.x86_64-4.1.0.args | 33 -
.../audio-pulseaudio-best.x86_64-4.1.0.args | 48 -
.../audio-pulseaudio-full.x86_64-4.1.0.err | 1 -
...audio-pulseaudio-minimal.x86_64-4.1.0.args | 33 -
.../audio-sdl-best.x86_64-4.1.0.args | 46 -
.../audio-sdl-full.x86_64-4.1.0.err | 1 -
.../audio-sdl-minimal.x86_64-4.1.0.args | 33 -
.../audio-spice-best.x86_64-4.1.0.args | 45 -
.../audio-spice-full.x86_64-4.1.0.err | 1 -
.../audio-spice-minimal.x86_64-4.1.0.args | 34 -
tests/qemuxml2argvdata/autoindex.args | 2 +-
.../qemuxml2argvdata/balloon-ccw-deflate.args | 2 +-
.../qemuxml2argvdata/balloon-device-auto.args | 2 +-
.../balloon-device-deflate-off.args | 2 +-
.../balloon-device-deflate.args | 2 +-
.../balloon-device-period.args | 2 +-
tests/qemuxml2argvdata/balloon-device.args | 2 +-
.../balloon-mmio-deflate.args | 2 +-
.../blkdeviotune-group-num.x86_64-4.1.0.args | 37 -
.../blkdeviotune-max-length.x86_64-4.1.0.args | 37 -
.../blkdeviotune-max.x86_64-4.1.0.args | 37 -
tests/qemuxml2argvdata/blkiotune-device.args | 2 +-
tests/qemuxml2argvdata/blkiotune.args | 2 +-
tests/qemuxml2argvdata/boot-cdrom.args | 2 +-
tests/qemuxml2argvdata/boot-complex.args | 2 +-
tests/qemuxml2argvdata/boot-floppy-q35.args | 2 +-
tests/qemuxml2argvdata/boot-floppy.args | 2 +-
.../boot-menu-disable-drive.args | 2 +-
tests/qemuxml2argvdata/boot-menu-disable.args | 2 +-
.../boot-menu-enable-with-timeout.args | 2 +-
tests/qemuxml2argvdata/boot-menu-enable.args | 2 +-
tests/qemuxml2argvdata/boot-multi.args | 2 +-
tests/qemuxml2argvdata/boot-network.args | 2 +-
tests/qemuxml2argvdata/boot-order.args | 2 +-
tests/qemuxml2argvdata/channel-guestfwd.args | 2 +-
tests/qemuxml2argvdata/channel-spicevmc.args | 2 +-
.../qemuxml2argvdata/channel-virtio-auto.args | 2 +-
.../channel-virtio-autoadd.args | 2 +-
.../channel-virtio-autoassign.args | 2 +-
.../channel-virtio-default.args | 2 +-
.../channel-virtio-state.args | 2 +-
.../qemuxml2argvdata/channel-virtio-unix.args | 2 +-
tests/qemuxml2argvdata/channel-virtio.args | 2 +-
tests/qemuxml2argvdata/chardev-reconnect.args | 2 +-
tests/qemuxml2argvdata/clock-catchup.args | 2 +-
tests/qemuxml2argvdata/clock-france.args | 2 +-
tests/qemuxml2argvdata/clock-hpet-off.args | 2 +-
.../clock-localtime-basis-localtime.args | 2 +-
tests/qemuxml2argvdata/clock-localtime.args | 2 +-
tests/qemuxml2argvdata/clock-realtime.args | 2 +-
.../clock-timer-hyperv-rtc.args | 2 +-
tests/qemuxml2argvdata/clock-utc.args | 2 +-
tests/qemuxml2argvdata/clock-variable.args | 2 +-
.../qemuxml2argvdata/console-compat-auto.args | 2 +-
.../console-compat-chardev.args | 2 +-
tests/qemuxml2argvdata/console-compat.args | 2 +-
.../qemuxml2argvdata/console-virtio-ccw.args | 2 +-
.../qemuxml2argvdata/console-virtio-many.args | 2 +-
tests/qemuxml2argvdata/console-virtio.args | 2 +-
tests/qemuxml2argvdata/controller-order.args | 4 +-
tests/qemuxml2argvdata/cpu-Haswell-noTSX.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell2.args | 2 +-
tests/qemuxml2argvdata/cpu-Haswell3.args | 2 +-
tests/qemuxml2argvdata/cpu-cache-disable.args | 2 +-
.../qemuxml2argvdata/cpu-cache-disable2.args | 2 +-
.../qemuxml2argvdata/cpu-cache-disable3.args | 2 +-
.../cpu-cache-emulate-l3.args | 2 +-
.../cpu-cache-passthrough.args | 2 +-
.../cpu-cache-passthrough2.args | 2 +-
.../cpu-check-default-none.args | 2 +-
.../cpu-check-default-none2.args | 2 +-
.../cpu-check-default-partial.args | 2 +-
.../cpu-check-default-partial2.args | 2 +-
tests/qemuxml2argvdata/cpu-check-none.args | 2 +-
tests/qemuxml2argvdata/cpu-exact1.args | 2 +-
.../cpu-exact2-nofallback.args | 2 +-
tests/qemuxml2argvdata/cpu-exact2.args | 2 +-
tests/qemuxml2argvdata/cpu-fallback.args | 2 +-
tests/qemuxml2argvdata/cpu-host-kvmclock.args | 2 +-
.../qemuxml2argvdata/cpu-host-model-cmt.args | 2 +-
.../cpu-host-model-cmt.x86_64-4.0.0.args | 33 -
.../cpu-host-model-fallback.args | 2 +-
.../cpu-host-model-vendor.args | 2 +-
tests/qemuxml2argvdata/cpu-host-model.args | 2 +-
.../cpu-host-model.x86_64-3.1.0.args | 36 -
.../cpu-host-model.x86_64-4.0.0.args | 36 -
.../cpu-host-model.x86_64-4.1.0.args | 36 -
.../cpu-host-passthrough-features.args | 2 +-
.../cpu-host-passthrough.args | 2 +-
.../qemuxml2argvdata/cpu-hotplug-startup.args | 2 +-
tests/qemuxml2argvdata/cpu-kvmclock.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum1.args | 2 +-
tests/qemuxml2argvdata/cpu-minimum2.args | 2 +-
.../cpu-no-removed-features.args | 2 +-
tests/qemuxml2argvdata/cpu-numa-disjoint.args | 2 +-
.../qemuxml2argvdata/cpu-numa-memshared.args | 2 +-
.../cpu-numa-no-memory-element.args | 2 +-
tests/qemuxml2argvdata/cpu-numa1.args | 2 +-
tests/qemuxml2argvdata/cpu-numa2.args | 2 +-
tests/qemuxml2argvdata/cpu-s390-features.args | 2 +-
tests/qemuxml2argvdata/cpu-s390-zEC12.args | 2 +-
tests/qemuxml2argvdata/cpu-strict1.args | 2 +-
tests/qemuxml2argvdata/cpu-topology1.args | 2 +-
tests/qemuxml2argvdata/cpu-topology2.args | 2 +-
tests/qemuxml2argvdata/cpu-topology3.args | 2 +-
tests/qemuxml2argvdata/cpu-tsc-frequency.args | 2 +-
.../cpu-tsc-frequency.x86_64-4.0.0.args | 33 -
tests/qemuxml2argvdata/cputune-numatune.args | 2 +-
.../qemuxml2argvdata/cputune-zero-shares.args | 2 +-
tests/qemuxml2argvdata/cputune.args | 2 +-
.../default-kvm-host-arch.args | 2 +-
.../default-qemu-host-arch.args | 2 +-
.../disk-aio.x86_64-4.1.0.args | 36 -
.../disk-arm-virtio-sd.aarch64-4.0.0.args | 38 -
...isk-backing-chains-index.x86_64-4.1.0.args | 45 -
...k-backing-chains-noindex.x86_64-4.1.0.args | 1 -
.../disk-cache.x86_64-3.1.0.args | 42 -
.../disk-cache.x86_64-4.1.0.args | 42 -
.../disk-cdrom-network.x86_64-4.1.0.args | 39 -
.../disk-cdrom-tray.x86_64-4.1.0.args | 38 -
.../disk-cdrom.x86_64-4.1.0.args | 39 -
.../disk-copy_on_read.x86_64-4.1.0.args | 39 -
.../disk-detect-zeroes.x86_64-4.1.0.args | 37 -
.../disk-discard.x86_64-4.1.0.args | 36 -
.../disk-error-policy-s390x.s390x-4.0.0.args | 35 -
.../disk-error-policy.x86_64-4.1.0.args | 37 -
.../disk-floppy-q35.x86_64-4.1.0.args | 36 -
.../disk-floppy.x86_64-4.1.0.args | 37 -
.../disk-fmt-qcow.x86_64-4.1.0.args | 35 -
.../disk-network-gluster.x86_64-4.1.0.args | 37 -
.../disk-network-iscsi.x86_64-4.1.0.args | 49 -
.../disk-network-nbd.x86_64-4.1.0.args | 41 -
...disk-network-rbd-no-colon.x86_64-4.1.0.err | 1 -
.../disk-network-rbd.x86_64-4.1.0.args | 44 -
.../disk-network-sheepdog.x86_64-4.1.0.args | 35 -
...disk-network-source-auth.x86_64-4.1.0.args | 40 -
...disk-network-tlsx509-nbd.x86_64-4.1.0.args | 35 -
...isk-network-tlsx509-vxhs.x86_64-4.1.0.args | 41 -
.../disk-readonly-disk.x86_64-4.1.0.args | 36 -
.../disk-shared.x86_64-3.1.0.args | 41 -
.../disk-shared.x86_64-4.1.0.args | 41 -
.../disk-source-pool-mode.x86_64-4.1.0.args | 40 -
.../disk-source-pool.x86_64-4.1.0.args | 42 -
.../disk-transient.x86_64-4.1.0.err | 1 -
...virtio-scsi-reservations.x86_64-4.1.0.args | 39 -
.../encrypted-disk-usage.x86_64-4.1.0.args | 35 -
.../encrypted-disk.x86_64-4.1.0.args | 35 -
.../fd-memory-no-numa-topology.args | 2 +-
.../fd-memory-numa-topology.args | 2 +-
.../fd-memory-numa-topology2.args | 2 +-
.../fd-memory-numa-topology3.args | 2 +-
.../firmware-manual-bios.args | 2 +-
.../firmware-manual-efi-acpi-aarch64.args | 2 +-
.../firmware-manual-efi-acpi-q35.args | 2 +-
.../firmware-manual-efi-noacpi-aarch64.args | 2 +-
...l-efi-nvram-network-iscsi.x86_64-4.1.0.err | 1 -
.../firmware-manual-efi-secure.args | 2 +-
.../qemuxml2argvdata/firmware-manual-efi.args | 2 +-
.../firmware-manual-noefi-acpi-q35.args | 2 +-
.../firmware-manual-noefi-noacpi-aarch64.args | 2 +-
.../firmware-manual-noefi-noacpi-q35.args | 2 +-
.../floppy-drive-fat.x86_64-4.1.0.args | 35 -
.../hostdev-mdev-precreated.args | 2 +-
.../hostdev-pci-address-unassigned.args | 2 +-
.../hostdev-pci-multifunction.args | 2 +-
.../hostdev-scsi-lsi.x86_64-4.1.0.args | 49 -
.../hostdev-scsi-vhost-scsi-ccw.args | 2 +-
.../hostdev-scsi-vhost-scsi-pci.args | 2 +-
.../hostdev-scsi-vhost-scsi-pcie.args | 2 +-
...hostdev-scsi-virtio-scsi.x86_64-4.1.0.args | 51 -
.../hostdev-subsys-mdev-vfio-ccw.args | 2 +-
.../hostdev-vfio-multidomain.args | 2 +-
.../hostdev-vfio-zpci-autogenerate-fids.args | 2 +-
.../hostdev-vfio-zpci-autogenerate-uids.args | 2 +-
.../hostdev-vfio-zpci-autogenerate.args | 2 +-
.../hostdev-vfio-zpci-boundaries.args | 2 +-
.../hostdev-vfio-zpci-ccw-memballoon.args | 2 +-
.../hostdev-vfio-zpci-multidomain-many.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio-zpci.args | 2 +-
tests/qemuxml2argvdata/hostdev-vfio.args | 2 +-
tests/qemuxml2argvdata/hotplug-base.args | 2 +-
.../hugepages-default-2M.args | 2 +-
.../hugepages-default-system-size.args | 2 +-
tests/qemuxml2argvdata/hugepages-default.args | 2 +-
.../qemuxml2argvdata/hugepages-memaccess.args | 2 +-
.../hugepages-memaccess2.args | 2 +-
tests/qemuxml2argvdata/hugepages-nodeset.args | 2 +-
.../hugepages-numa-default-2M.args | 2 +-
.../hugepages-numa-default-dimm.args | 2 +-
.../hugepages-numa-default.args | 2 +-
.../hugepages-numa-nodeset-part.args | 2 +-
.../hugepages-numa-nodeset.args | 2 +-
tests/qemuxml2argvdata/hugepages-shared.args | 2 +-
.../hvf-aarch64-virt-headless.args | 2 +-
.../hvf-x86_64-q35-headless.args | 2 +-
.../qemuxml2argvdata/input-usbmouse-addr.args | 2 +-
tests/qemuxml2argvdata/input-usbmouse.args | 2 +-
tests/qemuxml2argvdata/input-usbtablet.args | 2 +-
tests/qemuxml2argvdata/input-virtio-ccw.args | 2 +-
.../iothreads-disk-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/iothreads-disk.args | 2 +-
.../iothreads-ids-partial.args | 2 +-
tests/qemuxml2argvdata/iothreads-ids.args | 2 +-
tests/qemuxml2argvdata/iothreads.args | 2 +-
tests/qemuxml2argvdata/kvm-features-off.args | 2 +-
tests/qemuxml2argvdata/kvm-features.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-delay.args | 2 +-
tests/qemuxml2argvdata/kvm-pit-discard.args | 2 +-
tests/qemuxml2argvdata/kvmclock.args | 2 +-
.../luks-disks-source.x86_64-4.1.0.args | 48 -
.../luks-disks.x86_64-4.1.0.args | 39 -
.../mach-virt-console-virtio.args | 2 +-
.../mach-virt-serial-native.args | 2 +-
.../mach-virt-serial-pci.args | 2 +-
.../mach-virt-serial-usb.args | 2 +-
.../machine-aeskeywrap-off-cap.args | 2 +-
.../machine-aeskeywrap-off-caps.args | 2 +-
.../machine-aeskeywrap-on-cap.args | 2 +-
.../machine-aeskeywrap-on-caps.args | 2 +-
tests/qemuxml2argvdata/machine-aliases1.args | 2 +-
tests/qemuxml2argvdata/machine-aliases2.args | 2 +-
tests/qemuxml2argvdata/machine-core-off.args | 2 +-
tests/qemuxml2argvdata/machine-core-on.args | 2 +-
.../machine-deakeywrap-off-cap.args | 2 +-
.../machine-deakeywrap-off-caps.args | 2 +-
.../machine-deakeywrap-on-cap.args | 2 +-
.../machine-deakeywrap-on-caps.args | 2 +-
.../machine-keywrap-none-caps.args | 2 +-
.../machine-keywrap-none.args | 2 +-
...ine-loadparm-multiple-disks-nets-s390.args | 2 +-
.../machine-loadparm-net-s390.args | 2 +-
.../machine-loadparm-s390.args | 2 +-
.../qemuxml2argvdata/machine-vmport-opt.args | 2 +-
tests/qemuxml2argvdata/master-key.args | 2 +-
.../memory-hotplug-dimm-addr.args | 2 +-
.../qemuxml2argvdata/memory-hotplug-dimm.args | 2 +-
...emory-hotplug-nvdimm-ppc64-abi-update.args | 2 +-
.../memory-hotplug-nvdimm-ppc64.args | 2 +-
...emory-hotplug-ppc64-nonuma-abi-update.args | 2 +-
.../memory-hotplug-ppc64-nonuma.args | 2 +-
tests/qemuxml2argvdata/memory-hotplug.args | 2 +-
tests/qemuxml2argvdata/memtune-unlimited.args | 2 +-
tests/qemuxml2argvdata/memtune.args | 2 +-
.../migrate-numa-unaligned.args | 2 +-
tests/qemuxml2argvdata/migrate.args | 2 +-
tests/qemuxml2argvdata/minimal.args | 2 +-
tests/qemuxml2argvdata/misc-acpi.args | 2 +-
tests/qemuxml2argvdata/misc-disable-s3.args | 2 +-
.../misc-disable-suspends.args | 2 +-
tests/qemuxml2argvdata/misc-enable-s4.args | 2 +-
tests/qemuxml2argvdata/misc-uuid.args | 2 +-
tests/qemuxml2argvdata/monitor-json.args | 2 +-
.../multifunction-pci-device.args | 2 +-
tests/qemuxml2argvdata/net-client.args | 2 +-
tests/qemuxml2argvdata/net-eth-hostip.args | 2 +-
tests/qemuxml2argvdata/net-eth-ifname.args | 2 +-
tests/qemuxml2argvdata/net-eth-names.args | 2 +-
.../net-eth-unmanaged-tap.args | 2 +-
tests/qemuxml2argvdata/net-eth.args | 2 +-
.../net-hostdev-bootorder.args | 2 +-
.../net-hostdev-multidomain.args | 2 +-
.../net-hostdev-vfio-multidomain.args | 2 +-
tests/qemuxml2argvdata/net-hostdev-vfio.args | 2 +-
tests/qemuxml2argvdata/net-hostdev.args | 2 +-
tests/qemuxml2argvdata/net-many-models.args | 2 +-
tests/qemuxml2argvdata/net-mcast.args | 2 +-
tests/qemuxml2argvdata/net-server.args | 2 +-
tests/qemuxml2argvdata/net-udp.args | 2 +-
tests/qemuxml2argvdata/net-user-addr.args | 2 +-
tests/qemuxml2argvdata/net-user.args | 2 +-
.../net-vhostuser-multiq.args | 2 +-
tests/qemuxml2argvdata/net-vhostuser.args | 2 +-
tests/qemuxml2argvdata/net-virtio-ccw.args | 2 +-
tests/qemuxml2argvdata/net-virtio-device.args | 2 +-
.../net-virtio-disable-offloads.args | 2 +-
tests/qemuxml2argvdata/net-virtio-netdev.args | 2 +-
.../net-virtio-rxtxqueuesize.args | 2 +-
.../net-virtio-teaming-hostdev.args | 2 +-
.../qemuxml2argvdata/net-virtio-teaming.args | 2 +-
tests/qemuxml2argvdata/net-virtio.args | 2 +-
tests/qemuxml2argvdata/nosharepages.args | 2 +-
.../numad-auto-memory-vcpu-cpuset.args | 2 +-
...o-memory-vcpu-no-cpuset-and-placement.args | 2 +-
.../numad-auto-vcpu-static-numatune.args | 2 +-
.../numad-static-memory-auto-vcpu.args | 2 +-
tests/qemuxml2argvdata/numad.args | 2 +-
.../numatune-auto-nodeset-invalid.args | 2 +-
.../numatune-auto-prefer.args | 2 +-
.../qemuxml2argvdata/numatune-distances.args | 2 +-
.../numatune-memnode-no-memory.args | 2 +-
tests/qemuxml2argvdata/numatune-memnode.args | 2 +-
tests/qemuxml2argvdata/numatune-memory.args | 2 +-
tests/qemuxml2argvdata/numatune-no-vcpu.args | 2 +-
.../qemuxml2argvdata/pages-dimm-discard.args | 2 +-
.../pages-discard-hugepages.args | 2 +-
tests/qemuxml2argvdata/pages-discard.args | 2 +-
.../parallel-parport-chardev.args | 2 +-
.../parallel-tcp-chardev.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-addr.args | 2 +-
tests/qemuxml2argvdata/pci-autoadd-idx.args | 2 +-
tests/qemuxml2argvdata/pci-autofill-addr.args | 2 +-
.../pci-bridge-many-disks.args | 2 +-
tests/qemuxml2argvdata/pci-bridge.args | 4 +-
tests/qemuxml2argvdata/pci-expander-bus.args | 2 +-
tests/qemuxml2argvdata/pci-many.args | 2 +-
tests/qemuxml2argvdata/pci-rom-disabled.args | 2 +-
tests/qemuxml2argvdata/pci-rom.args | 2 +-
.../pci-serial-dev-chardev.args | 2 +-
tests/qemuxml2argvdata/pcie-expander-bus.args | 2 +-
.../pcie-root-port-model-generic.args | 2 +-
.../pcie-root-port-model-ioh3420.args | 2 +-
tests/qemuxml2argvdata/pcie-root-port.args | 2 +-
tests/qemuxml2argvdata/pcie-root.args | 2 +-
.../pcie-switch-downstream-port.args | 2 +-
.../pcie-switch-upstream-port.args | 2 +-
tests/qemuxml2argvdata/pcihole64-q35.args | 2 +-
tests/qemuxml2argvdata/pcihole64.args | 2 +-
tests/qemuxml2argvdata/pmu-feature-off.args | 2 +-
tests/qemuxml2argvdata/pmu-feature.args | 2 +-
tests/qemuxml2argvdata/ppc-dtb.args | 2 +-
.../ppc64-usb-controller-legacy.args | 2 +-
.../ppc64-usb-controller-qemu-xhci.args | 2 +-
.../ppc64-usb-controller.args | 2 +-
tests/qemuxml2argvdata/ppce500-serial.args | 2 +-
tests/qemuxml2argvdata/pseries-basic.args | 2 +-
.../pseries-console-virtio.args | 2 +-
.../qemuxml2argvdata/pseries-cpu-compat.args | 2 +-
tests/qemuxml2argvdata/pseries-cpu-exact.args | 2 +-
tests/qemuxml2argvdata/pseries-cpu-le.args | 2 +-
tests/qemuxml2argvdata/pseries-features.args | 2 +-
.../qemuxml2argvdata/pseries-hostdevs-1.args | 2 +-
.../qemuxml2argvdata/pseries-hostdevs-2.args | 2 +-
.../qemuxml2argvdata/pseries-hostdevs-3.args | 2 +-
.../pseries-many-buses-1.args | 2 +-
.../pseries-many-buses-2.args | 2 +-
.../pseries-many-devices.args | 2 +-
tests/qemuxml2argvdata/pseries-nvram.args | 2 +-
.../pseries-panic-missing.args | 2 +-
.../pseries-panic-no-address.args | 2 +-
.../pseries-phb-default-missing.args | 2 +-
.../pseries-phb-numa-node.args | 2 +-
.../qemuxml2argvdata/pseries-phb-simple.args | 2 +-
.../pseries-serial-native.args | 2 +-
.../qemuxml2argvdata/pseries-serial-pci.args | 2 +-
.../qemuxml2argvdata/pseries-serial-usb.args | 2 +-
.../qemuxml2argvdata/pseries-usb-default.args | 2 +-
tests/qemuxml2argvdata/pseries-usb-kbd.args | 2 +-
tests/qemuxml2argvdata/pseries-usb-multi.args | 2 +-
.../pseries-vio-user-assigned.args | 2 +-
tests/qemuxml2argvdata/pseries-vio.args | 2 +-
.../q35-default-devices-only.args | 2 +-
tests/qemuxml2argvdata/q35-multifunction.args | 2 +-
.../q35-pci-force-address.args | 4 +-
tests/qemuxml2argvdata/q35-pcie-autoadd.args | 2 +-
tests/qemuxml2argvdata/q35-pcie.args | 2 +-
.../q35-pm-disable-fallback.args | 2 +-
tests/qemuxml2argvdata/q35-pm-disable.args | 2 +-
tests/qemuxml2argvdata/q35-usb2-multi.args | 2 +-
tests/qemuxml2argvdata/q35-usb2-reorder.args | 2 +-
tests/qemuxml2argvdata/q35-usb2.args | 2 +-
.../q35-virt-manager-basic.args | 4 +-
tests/qemuxml2argvdata/q35-virtio-pci.args | 2 +-
tests/qemuxml2argvdata/q35.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-alt.args | 2 +-
.../qemu-ns-commandline-ns0.args | 2 +-
.../qemu-ns-commandline-ns1.args | 2 +-
.../qemuxml2argvdata/qemu-ns-commandline.args | 2 +-
.../qemu-ns-domain-commandline-ns0.args | 2 +-
.../qemu-ns-domain-commandline.args | 2 +-
.../qemuxml2argvdata/qemu-ns-domain-ns0.args | 2 +-
tests/qemuxml2argvdata/qemu-ns-no-env.args | 2 +-
.../reboot-timeout-disabled.args | 2 +-
.../reboot-timeout-enabled.args | 2 +-
tests/qemuxml2argvdata/restore-v2-fd.args | 2 +-
tests/qemuxml2argvdata/restore-v2.args | 2 +-
tests/qemuxml2argvdata/riscv64-virt-pci.args | 2 +-
tests/qemuxml2argvdata/riscv64-virt.args | 2 +-
.../qemuxml2argvdata/s390-panic-missing.args | 2 +-
.../s390-panic-no-address.args | 2 +-
tests/qemuxml2argvdata/s390-serial-2.args | 2 +-
.../qemuxml2argvdata/s390-serial-console.args | 2 +-
tests/qemuxml2argvdata/s390-serial.args | 2 +-
tests/qemuxml2argvdata/seclabel-dac-none.args | 2 +-
.../seclabel-dynamic-baselabel.args | 2 +-
.../seclabel-dynamic-labelskip.args | 2 +-
.../seclabel-dynamic-override.args | 2 +-
.../seclabel-dynamic-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-dynamic.args | 2 +-
tests/qemuxml2argvdata/seclabel-none.args | 2 +-
.../seclabel-static-labelskip.args | 2 +-
.../seclabel-static-relabel.args | 2 +-
tests/qemuxml2argvdata/seclabel-static.args | 2 +-
.../serial-dev-chardev-iobase.args | 2 +-
.../qemuxml2argvdata/serial-dev-chardev.args | 2 +-
.../qemuxml2argvdata/serial-file-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-file-log.args | 2 +-
.../qemuxml2argvdata/serial-many-chardev.args | 2 +-
.../qemuxml2argvdata/serial-pty-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-spiceport.args | 2 +-
.../qemuxml2argvdata/serial-tcp-chardev.args | 2 +-
.../serial-tcp-telnet-chardev.args | 2 +-
.../serial-tcp-tlsx509-chardev-notls.args | 2 +-
.../serial-tcp-tlsx509-chardev-verify.args | 2 +-
.../serial-tcp-tlsx509-chardev.args | 2 +-
.../serial-tcp-tlsx509-secret-chardev.args | 2 +-
.../qemuxml2argvdata/serial-udp-chardev.args | 2 +-
.../qemuxml2argvdata/serial-unix-chardev.args | 2 +-
tests/qemuxml2argvdata/serial-vc-chardev.args | 2 +-
.../shmem-plain-doorbell.args | 2 +-
tests/qemuxml2argvdata/shmem.args | 2 +-
.../smartcard-controller.args | 2 +-
.../smartcard-host-certificates-database.args | 2 +-
.../smartcard-host-certificates.args | 2 +-
tests/qemuxml2argvdata/smartcard-host.args | 2 +-
.../smartcard-passthrough-spicevmc.args | 2 +-
.../smartcard-passthrough-tcp.args | 2 +-
tests/qemuxml2argvdata/smbios-type-fwcfg.args | 2 +-
tests/qemuxml2argvdata/smbios.args | 2 +-
tests/qemuxml2argvdata/smp-dies.args | 2 +-
tests/qemuxml2argvdata/smp.args | 2 +-
tests/qemuxml2argvdata/sound-device.args | 26 +-
tests/qemuxml2argvdata/sound.args | 8 +-
tests/qemuxml2argvdata/sparc-minimal.args | 2 +-
.../usb-controller-default-q35.args | 2 +-
.../usb-controller-explicit-q35.args | 2 +-
.../usb-controller-qemu-xhci.args | 2 +-
.../qemuxml2argvdata/usb-controller-xhci.args | 2 +-
tests/qemuxml2argvdata/usb-controller.args | 2 +-
.../usb-hub-autoadd-deluxe.args | 2 +-
tests/qemuxml2argvdata/usb-hub-autoadd.args | 2 +-
tests/qemuxml2argvdata/usb-hub.args | 2 +-
.../qemuxml2argvdata/usb-ich9-autoassign.args | 2 +-
.../qemuxml2argvdata/usb-ich9-companion.args | 2 +-
.../qemuxml2argvdata/usb-ich9-ehci-addr.args | 2 +-
.../qemuxml2argvdata/usb-long-port-path.args | 2 +-
tests/qemuxml2argvdata/usb-none.args | 2 +-
.../usb-piix3-controller.args | 2 +-
.../qemuxml2argvdata/usb-port-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb-port-missing.args | 2 +-
tests/qemuxml2argvdata/usb-ports.args | 2 +-
tests/qemuxml2argvdata/usb-redir-boot.args | 2 +-
.../usb-redir-filter-version.args | 2 +-
tests/qemuxml2argvdata/usb-redir-filter.args | 2 +-
tests/qemuxml2argvdata/usb-redir.args | 2 +-
.../qemuxml2argvdata/usb-xhci-autoassign.args | 2 +-
tests/qemuxml2argvdata/usb1-usb2.args | 2 +-
tests/qemuxml2argvdata/user-aliases-usb.args | 2 +-
tests/qemuxml2argvdata/user-aliases.args | 6 +-
.../vcpu-placement-static.args | 2 +-
.../video-device-pciaddr-default.args | 4 +-
tests/qemuxml2argvdata/video-none-device.args | 4 +-
.../video-qxl-device-vgamem.args | 2 +-
tests/qemuxml2argvdata/video-qxl-device.args | 2 +-
tests/qemuxml2argvdata/video-qxl-heads.args | 2 +-
tests/qemuxml2argvdata/video-qxl-noheads.args | 2 +-
.../video-qxl-resolution.args | 2 +-
.../video-qxl-sec-device-vgamem.args | 2 +-
.../video-qxl-sec-device.args | 2 +-
.../video-vga-device-vgamem.args | 2 +-
tests/qemuxml2argvdata/video-vga-device.args | 2 +-
.../qemuxml2argvdata/video-vga-qxl-heads.args | 2 +-
.../video-virtio-gpu-ccw.args | 4 +-
.../video-virtio-gpu-device.args | 2 +-
.../video-virtio-gpu-secondary.args | 2 +-
.../video-virtio-gpu-spice-gl.args | 2 +-
.../video-virtio-gpu-virgl.args | 2 +-
tests/qemuxml2argvdata/video-virtio-vga.args | 2 +-
.../virtio-input-passthrough.args | 2 +-
tests/qemuxml2argvdata/virtio-input.args | 2 +-
.../virtio-non-transitional.x86_64-3.1.0.args | 53 -
tests/qemuxml2argvdata/virtio-rng-ccw.args | 2 +-
.../qemuxml2argvdata/virtio-rng-default.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-egd.args | 2 +-
.../qemuxml2argvdata/virtio-rng-multiple.args | 2 +-
tests/qemuxml2argvdata/virtio-rng-random.args | 2 +-
.../virtio-transitional.x86_64-3.1.0.args | 46 -
tests/qemuxml2argvdata/vmcoreinfo.args | 2 +-
.../x86-kvm-32-on-64.x86_64-4.1.0.args | 31 -
tests/qemuxml2argvtest.c | 93 +-
.../x86-kvm-32-on-64.x86_64-4.1.0.xml | 24 -
tests/qemuxml2xmltest.c | 21 +-
590 files changed, 495 insertions(+), 218552 deletions(-)
delete mode 100644 tests/domaincapsdata/qemu_3.1.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.1.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.1.0.ppc64.xml
delete mode 100644 tests/domaincapsdata/qemu_3.1.0.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0-virt.aarch64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0.aarch64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0.ppc64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0.s390x.xml
delete mode 100644 tests/domaincapsdata/qemu_4.0.0.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.1.0-q35.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.1.0-tcg.x86_64.xml
delete mode 100644 tests/domaincapsdata/qemu_4.1.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.replies
delete mode 100644 tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
delete mode 100644 tests/qemuxml2argvdata/aarch64-features-sve.aarch64-4.0.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-alsa-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-alsa-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-alsa-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-coreaudio-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-default-nographics.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-file-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-file-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-file-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-jack-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-jack-minimal.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-many-backends.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-none-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-none-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-none-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-oss-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-oss-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-oss-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-pulseaudio-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-sdl-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-sdl-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-sdl-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-spice-best.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/audio-spice-full.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/audio-spice-minimal.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-group-num.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max-length.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/blkdeviotune-max.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model-cmt.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-host-model.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-aio.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-arm-virtio-sd.aarch64-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-4.1.0.args
delete mode 120000 tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cache.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-network.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-cdrom.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-copy_on_read.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-discard.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-4.0.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-error-policy.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-floppy-q35.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-floppy.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-fmt-qcow.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-gluster.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-iscsi.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-nbd.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd-no-colon.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/disk-network-rbd.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-source-auth.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-nbd.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-network-tlsx509-vxhs.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-readonly-disk.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-shared.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-source-pool-mode.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-source-pool.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/disk-transient.x86_64-4.1.0.err
delete mode 100644
tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/encrypted-disk-usage.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/encrypted-disk.x86_64-4.1.0.args
delete mode 100644
tests/qemuxml2argvdata/firmware-manual-efi-nvram-network-iscsi.x86_64-4.1.0.err
delete mode 100644 tests/qemuxml2argvdata/floppy-drive-fat.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-lsi.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/luks-disks-source.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/luks-disks.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
delete mode 100644 tests/qemuxml2argvdata/x86-kvm-32-on-64.x86_64-4.1.0.args
delete mode 100644 tests/qemuxml2xmloutdata/x86-kvm-32-on-64.x86_64-4.1.0.xml
7:03 a.m.
On 7/15/22 13:54, Claudio Fontana wrote:
Hello Peter,
can we retire as well support for migration_set_speed then?
The "if (!bwParam)" branches with calls to qemuMonitorSetMigrationSpeed are
overcomplicating qemu_migration.c and qemu_driver.c in my view.
While there are only a few such branches, I believe we can do that, but
in a separate commit/series since QEMU docs claim this was introduced in
2.8.
qapi/migration.json:
# @max-bandwidth: to set maximum speed for migration. maximum speed in
# bytes per second. (Since 2.8)
Michal
7:18 a.m.
On Fri, Jul 15, 2022 at 13:54:26 +0200, Claudio Fontana wrote:
Hello Peter,
can we retire as well support for migration_set_speed then?
The "if (!bwParam)" branches with calls to qemuMonitorSetMigrationSpeed are
overcomplicating qemu_migration.c and qemu_driver.c in my view.
Indeed. I've noticed multiple qemu params which can be assumed (e.g. the
speed parameter is in starting with qemu-2.8).
I'll post patches very shortly.
8:57 a.m.
On 7/15/22 13:44, Peter Krempa wrote:
In August Debian 10 officially reaches EOL, thus we can bump minimum
qemu version to 4.2 which is being limited by Ubuntu and RHEL/Centos 8.
QEMU-4.2 allows us to remove a big bunch of old code though. Few
examples which this series (and the next iterations of it) will deal
with:
- old auidiodev config via ENV variables
- old-style VIRTIO tranitional setup (possibly)
- most of legacy block device setup (upcoming series)
This series is lacking the removal of Debian 10 from our CI infra
though, I'll post that separately once I get to it.
The patches can also be fetched at:
git fetch https://gitlab.com/pipo.sk/libvirt.git debian-10-remove-part1
as some of the pure-removal patches here will be truncated to prevent
spamming the list.
Peter Krempa (20):
qemuxml2(argv|xml)test: Remove 'qemu-4.1' variant of
'x86-kvm-32-on-64'
tests: qemuxml2argv: Remove pre-blockdev versions of disk-related
tests
qemuxml2argvtest: Drop 'qemu-4.1' variants of all audio tests
qemuxml2argvtest: Remove 'qemu-3.1' versions of
virtio-(non-)transitional tests
qemuxml2argvtest: Remove pre-qemu-4.2 versions of 'cpu-host-model'
test
qemuxml2argvtest: Remove 'qemu-4.0' version of aarch64-features-sve
case
qemuxml2argvtest: Remove 'qemu-4.0' versions of 'cpu-host-model-cmt'
and 'cpu-tsc-frequency'
tests: qemucapabilities: Remove qemu-3.1 test data
tests: domaincaps: Remove test data for qemu-3.1
qemucapabilitiestest: Remove test data for qemu-4.0
domaincapstest: Remove test data for qemu-4.0
qemucapabilitiestest: Remove test data for qemu-4.1
domaincapstest: Remove test data for qemu-4.1
qemu: Formally deprecate support for qemu < 4.2
qemu: command: Always assume QEMU_CAPS_AUDIODEV
qemu: command: Drop the code for configuring audio devices via
environment variables
qemu: command: Drop qemuBuildAudioCommandLine thin wrapper
qemu: validate: Remove unreachable checks for QEMU_CAPS_AUDIODEV
qemuxml2(argv|xml)test: Remove use of QEMU_CAPS_AUDIODEV in fake-caps
tests
qemu: capabilities: Retire QEMU_CAPS_AUDIODEV
590 files changed, 495 insertions(+), 218552 deletions(-)
Reviewed-by: Michal Privoznik <mprivozn(a)redhat.com>
Michal
6:08 p.m.
On a Friday in 2022, Peter Krempa wrote:
In August Debian 10 officially reaches EOL, thus we can bump minimum
qemu version to 4.2 which is being limited by Ubuntu and RHEL/Centos 8.
QEMU-4.2 allows us to remove a big bunch of old code though. Few
examples which this series (and the next iterations of it) will deal
with:
- old auidiodev config via ENV variables
- old-style VIRTIO tranitional setup (possibly)
- most of legacy block device setup (upcoming series)
This series is lacking the removal of Debian 10 from our CI infra
though, I'll post that separately once I get to it.
The patches can also be fetched at:
git fetch https://gitlab.com/pipo.sk/libvirt.git debian-10-remove-part1
as some of the pure-removal patches here will be truncated to prevent
spamming the list.
Peter Krempa (20):
qemuxml2(argv|xml)test: Remove 'qemu-4.1' variant of
'x86-kvm-32-on-64'
tests: qemuxml2argv: Remove pre-blockdev versions of disk-related
tests
qemuxml2argvtest: Drop 'qemu-4.1' variants of all audio tests
qemuxml2argvtest: Remove 'qemu-3.1' versions of
virtio-(non-)transitional tests
qemuxml2argvtest: Remove pre-qemu-4.2 versions of 'cpu-host-model'
test
qemuxml2argvtest: Remove 'qemu-4.0' version of aarch64-features-sve
case
qemuxml2argvtest: Remove 'qemu-4.0' versions of 'cpu-host-model-cmt'
and 'cpu-tsc-frequency'
tests: qemucapabilities: Remove qemu-3.1 test data
tests: domaincaps: Remove test data for qemu-3.1
qemucapabilitiestest: Remove test data for qemu-4.0
domaincapstest: Remove test data for qemu-4.0
qemucapabilitiestest: Remove test data for qemu-4.1
domaincapstest: Remove test data for qemu-4.1
qemu: Formally deprecate support for qemu < 4.2
qemu: command: Always assume QEMU_CAPS_AUDIODEV
qemu: command: Drop the code for configuring audio devices via
environment variables
qemu: command: Drop qemuBuildAudioCommandLine thin wrapper
qemu: validate: Remove unreachable checks for QEMU_CAPS_AUDIODEV
qemuxml2(argv|xml)test: Remove use of QEMU_CAPS_AUDIODEV in fake-caps
tests
qemu: capabilities: Retire QEMU_CAPS_AUDIODEV
Reviewed-by: Ján Tomko <jtomko(a)redhat.com>
Jano
841
days inactive
861
days old
29 comments
4 participants
participants (4)
-
Claudio Fontana -
Ján Tomko -
Michal Prívozník -
Peter Krempa