From e88367095f3cad2cf80a687fd599dfaeb3073841 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
Date: Wed, 24 Feb 2021 14:24:10 +0000
Subject: [PATCH] qemu: populate <audio> element with default config
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Currently the QEMU driver secretly sets the QEMU_AUDIO_DRV env variable

 - VNC - set to "none", unless passthrough of host env variable is set
 - SPICE - always set to "spice"
 - SDL - always passthrough host env
 - No graphics - set to "none", unless passthrough of host env variable is set

The setting of the QEMU_AUDIO_DRV env variable is done in the code which
configures graphics.

If no <audio> element is present, we now auto-populate <audio> elements
to reflect this historical default config. This avoids need to set audio
env when processing graphics.

Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---
 src/qemu/qemu_command.c                       |  43 +------
 src/qemu/qemu_domain.c                        | 110 +++++++++++++++++-
 .../redefine.xml                              |   1 +
 .../disk_snapshot_redefine.xml                |   1 +
 .../external_vm_redefine.xml                  |   1 +
 .../full_domain.xml                           |   1 +
 .../qemudomainsnapshotxml2xmlout/metadata.xml |   1 +
 .../ppc64-modern-bulk-result-conf.xml         |   1 +
 .../ppc64-modern-bulk-result-live.xml         |   1 +
 .../ppc64-modern-individual-result-conf.xml   |   1 +
 .../ppc64-modern-individual-result-live.xml   |   1 +
 .../x86-modern-bulk-result-conf.xml           |   1 +
 .../x86-modern-bulk-result-live.xml           |   1 +
 .../x86-modern-individual-add-result-conf.xml |   1 +
 .../x86-modern-individual-add-result-live.xml |   1 +
 .../x86-old-bulk-result-conf.xml              |   1 +
 .../x86-old-bulk-result-live.xml              |   1 +
 .../qemuhotplug-base-ccw-live+ccw-virtio.xml  |   1 +
 ...with-2-ccw-virtio+ccw-virtio-1-reverse.xml |   1 +
 ...otplug-base-ccw-live-with-2-ccw-virtio.xml |   1 +
 ...-with-ccw-virtio+ccw-virtio-2-explicit.xml |   1 +
 ...-ccw-live-with-ccw-virtio+ccw-virtio-2.xml |   1 +
 ...uhotplug-base-ccw-live-with-ccw-virtio.xml |   1 +
 .../qemuhotplug-base-ccw-live.xml             |   1 +
 ...uhotplug-base-live+disk-scsi-multipath.xml |   1 +
 ...+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml |   1 +
 .../qemuhotplug-base-live+disk-scsi.xml       |   1 +
 .../qemuhotplug-base-live+disk-usb.xml        |   1 +
 .../qemuhotplug-base-live+disk-virtio.xml     |   1 +
 .../qemuhotplug-base-live+guestfwd.xml        |   1 +
 .../qemuhotplug-base-live+hostdev-pci.xml     |   1 +
 .../qemuhotplug-base-live+interface-vdpa.xml  |   1 +
 ...qemuhotplug-base-live+ivshmem-doorbell.xml |   1 +
 .../qemuhotplug-base-live+ivshmem-plain.xml   |   1 +
 .../qemuhotplug-base-live+qemu-agent.xml      |   1 +
 ...uhotplug-base-live+watchdog-user-alias.xml |   1 +
 .../qemuhotplug-base-live+watchdog.xml        |   1 +
 .../qemuhotplug-base-live.xml                 |   1 +
 ...hotplug-base-with-scsi-controller-live.xml |   1 +
 ...thout-scsi-controller-live+disk-scsi-2.xml |   1 +
 ...g-console-compat-2-live+console-virtio.xml |   1 +
 .../qemuhotplug-console-compat-2-live.xml     |   1 +
 ...uhotplug-pseries-base-live+hostdev-pci.xml |   1 +
 .../qemuhotplug-pseries-base-live.xml         |   1 +
 .../full-xml2xml-out.xml                      |   1 +
 .../qemustatusxml2xmldata/backup-pull-in.xml  |   1 +
 .../blockjob-blockdev-in.xml                  |   1 +
 .../blockjob-mirror-in.xml                    |   1 +
 .../migration-in-params-in.xml                |   1 +
 .../migration-out-nbd-bitmaps-in.xml          |   1 +
 .../migration-out-nbd-out.xml                 |   1 +
 .../migration-out-nbd-tls-out.xml             |   1 +
 .../migration-out-params-in.xml               |   1 +
 tests/qemustatusxml2xmldata/modern-in.xml     |   1 +
 tests/qemustatusxml2xmldata/upgrade-out.xml   |   1 +
 .../qemustatusxml2xmldata/vcpus-multi-in.xml  |   1 +
 tests/qemuxml2argvdata/aarch64-gic-host.xml   |   1 +
 tests/qemuxml2argvdata/aarch64-gic-v2.xml     |   1 +
 tests/qemuxml2argvdata/aarch64-gic-v3.xml     |   1 +
 .../audio-default-nographics.args             |  29 +++++
 .../audio-default-nographics.xml              |  31 +++++
 tests/qemuxml2argvdata/audio-default-sdl.args |  31 +++++
 tests/qemuxml2argvdata/audio-default-sdl.xml  |  35 ++++++
 .../qemuxml2argvdata/audio-default-spice.args |  30 +++++
 .../qemuxml2argvdata/audio-default-spice.xml  |  35 ++++++
 tests/qemuxml2argvdata/audio-default-vnc.args |  30 +++++
 tests/qemuxml2argvdata/audio-default-vnc.xml  |  35 ++++++
 .../blkdeviotune-group-num.xml                |   1 +
 .../blkdeviotune-max-length.xml               |   1 +
 tests/qemuxml2argvdata/blkdeviotune-max.xml   |   1 +
 tests/qemuxml2argvdata/boot-floppy-q35.xml    |   1 +
 tests/qemuxml2argvdata/clock-france.args      |   2 +-
 tests/qemuxml2argvdata/clock-realtime.xml     |   1 +
 .../clock-timer-armvtimer.xml                 |   1 +
 tests/qemuxml2argvdata/disk-detect-zeroes.xml |   1 +
 tests/qemuxml2argvdata/disk-nvme.xml          |   1 +
 tests/qemuxml2argvdata/disk-virtio-queues.xml |   1 +
 .../disk-virtio-scsi-reservations.xml         |   1 +
 tests/qemuxml2argvdata/downscript.xml         |   1 +
 .../qemuxml2argvdata/encrypted-disk-usage.xml |   1 +
 .../fd-memory-no-numa-topology.xml            |   1 +
 .../fd-memory-numa-topology.xml               |   1 +
 .../fd-memory-numa-topology2.xml              |   1 +
 .../fd-memory-numa-topology3.xml              |   1 +
 .../qemuxml2argvdata/graphics-spice-sasl.args |   2 +-
 tests/qemuxml2argvdata/graphics-vnc-sasl.args |   2 +-
 ...graphics-vnc-tls-secret.x86_64-latest.args |   2 +-
 tests/qemuxml2argvdata/graphics-vnc-tls.args  |   2 +-
 .../graphics-vnc-tls.x86_64-2.4.0.args        |   2 +-
 .../graphics-vnc-tls.x86_64-latest.args       |   2 +-
 .../qemuxml2argvdata/hugepages-default-2M.xml |   1 +
 .../hugepages-default-system-size.xml         |   1 +
 .../qemuxml2argvdata/hugepages-memaccess.xml  |   1 +
 .../qemuxml2argvdata/hugepages-memaccess2.xml |   1 +
 .../hugepages-numa-default-dimm.xml           |   1 +
 tests/qemuxml2argvdata/hugepages-nvdimm.xml   |   1 +
 .../qemuxml2argvdata/intel-iommu-aw-bits.xml  |   1 +
 .../intel-iommu-caching-mode.xml              |   1 +
 .../intel-iommu-device-iotlb.xml              |   1 +
 tests/qemuxml2argvdata/intel-iommu-eim.xml    |   1 +
 tests/qemuxml2argvdata/intel-iommu.xml        |   1 +
 tests/qemuxml2argvdata/luks-disks.xml         |   1 +
 .../memfd-memory-default-hugepage.xml         |   1 +
 tests/qemuxml2argvdata/memfd-memory-numa.xml  |   1 +
 .../memory-hotplug-nvdimm-access.xml          |   1 +
 .../memory-hotplug-nvdimm-align.xml           |   1 +
 .../memory-hotplug-nvdimm-label.xml           |   1 +
 .../memory-hotplug-nvdimm-pmem.xml            |   1 +
 .../memory-hotplug-nvdimm-readonly.xml        |   1 +
 .../memory-hotplug-nvdimm.xml                 |   1 +
 .../memory-hotplug-ppc64-nonuma.xml           |   1 +
 .../memory-hotplug-virtio-pmem.xml            |   1 +
 tests/qemuxml2argvdata/net-user-addr.xml      |   1 +
 .../net-virtio-teaming-hostdev.xml            |   1 +
 tests/qemuxml2argvdata/numatune-hmat.xml      |   1 +
 tests/qemuxml2argvdata/numatune-no-vcpu.xml   |   1 +
 tests/qemuxml2argvdata/pages-dimm-discard.xml |   1 +
 .../pages-discard-hugepages.xml               |   1 +
 tests/qemuxml2argvdata/pages-discard.xml      |   1 +
 .../serial-tcp-tlsx509-chardev-notls.xml      |   1 +
 tests/qemuxml2argvdata/smbios-type-fwcfg.xml  |   1 +
 tests/qemuxml2argvdata/user-aliases.xml       |   1 +
 .../vcpu-placement-static.xml                 |   1 +
 .../vhost-user-fs-fd-memory.xml               |   1 +
 .../vhost-user-fs-hugepages.xml               |   1 +
 .../vhost-vsock-ccw-iommu.xml                 |   1 +
 tests/qemuxml2argvdata/vhost-vsock-ccw.xml    |   1 +
 tests/qemuxml2argvdata/vhost-vsock.xml        |   1 +
 .../qemuxml2argvdata/video-qxl-resolution.xml |   1 +
 tests/qemuxml2argvdata/virtio-options.xml     |   1 +
 tests/qemuxml2argvtest.c                      |  21 ++++
 .../aarch64-aavmf-virtio-mmio.xml             |   1 +
 ...efault-cpu-kvm-virt-4.2.aarch64-latest.xml |   1 +
 ...efault-cpu-tcg-virt-4.2.aarch64-latest.xml |   1 +
 .../aarch64-features-sve.aarch64-latest.xml   |   1 +
 .../aarch64-gic-none-tcg.xml                  |   1 +
 ...aarch64-os-firmware-efi.aarch64-latest.xml |   1 +
 .../qemuxml2xmloutdata/aarch64-pci-serial.xml |   1 +
 .../aarch64-traditional-pci.xml               |   1 +
 .../aarch64-video-default.xml                 |   1 +
 .../aarch64-video-virtio-gpu-pci.xml          |   1 +
 .../aarch64-virt-graphics.aarch64-latest.xml  |   1 +
 .../aarch64-virt-headless.aarch64-latest.xml  |   1 +
 .../aarch64-virtio-pci-default.xml            |   1 +
 .../aarch64-virtio-pci-manual-addresses.xml   |   1 +
 tests/qemuxml2xmloutdata/acpi-table.xml       |   1 +
 ...audio-default-nographics.x86_64-latest.xml |  39 +++++++
 .../audio-default-nographics.xml              |   1 +
 .../audio-default-sdl.x86_64-latest.xml       |  44 +++++++
 .../qemuxml2xmloutdata/audio-default-sdl.xml  |   1 +
 .../audio-default-spice.x86_64-latest.xml     |  46 ++++++++
 .../audio-default-spice.xml                   |   1 +
 .../audio-default-vnc.x86_64-latest.xml       |  46 ++++++++
 .../qemuxml2xmloutdata/audio-default-vnc.xml  |   1 +
 tests/qemuxml2xmloutdata/autoindex.xml        |   1 +
 .../balloon-device-auto.xml                   |   1 +
 .../balloon-device-period.xml                 |   1 +
 .../bios-nvram-os-interleave.xml              |   1 +
 tests/qemuxml2xmloutdata/bios-nvram.xml       |   1 +
 .../blkdeviotune.x86_64-latest.xml            |   1 +
 tests/qemuxml2xmloutdata/blkiotune-device.xml |   1 +
 tests/qemuxml2xmloutdata/blkiotune.xml        |   1 +
 tests/qemuxml2xmloutdata/boot-cdrom.xml       |   1 +
 tests/qemuxml2xmloutdata/boot-floppy.xml      |   1 +
 .../boot-menu-disable-with-timeout.xml        |   1 +
 .../qemuxml2xmloutdata/boot-menu-disable.xml  |   1 +
 .../boot-menu-enable-with-timeout.xml         |   1 +
 tests/qemuxml2xmloutdata/boot-multi.xml       |   1 +
 tests/qemuxml2xmloutdata/boot-network.xml     |   1 +
 tests/qemuxml2xmloutdata/boot-order.xml       |   1 +
 tests/qemuxml2xmloutdata/channel-guestfwd.xml |   1 +
 .../channel-unix-source-path-active.xml       |   1 +
 .../channel-unix-source-path-inactive.xml     |   1 +
 .../channel-virtio-auto.xml                   |   1 +
 .../channel-virtio-state-active.xml           |   1 +
 .../channel-virtio-state-inactive.xml         |   1 +
 tests/qemuxml2xmloutdata/channel-virtio.xml   |   1 +
 tests/qemuxml2xmloutdata/chardev-label.xml    |   1 +
 tests/qemuxml2xmloutdata/clock-catchup.xml    |   1 +
 tests/qemuxml2xmloutdata/clock-localtime.xml  |   1 +
 .../clock-timer-hyperv-rtc.xml                |   1 +
 tests/qemuxml2xmloutdata/clock-utc.xml        |   1 +
 .../console-compat-auto.xml                   |   1 +
 tests/qemuxml2xmloutdata/console-compat.xml   |   1 +
 tests/qemuxml2xmloutdata/console-compat2.xml  |   1 +
 .../console-virtio-many.xml                   |   1 +
 tests/qemuxml2xmloutdata/console-virtio.xml   |   1 +
 .../controller-usb-order.xml                  |   1 +
 .../controller-virtio-scsi.xml                |   1 +
 ...pu-Icelake-Server-pconfig.x86_64-3.1.0.xml |   1 +
 ...u-Icelake-Server-pconfig.x86_64-latest.xml |   1 +
 .../cpu-check-default-none.xml                |   1 +
 .../cpu-check-default-none2.xml               |   1 +
 .../cpu-check-default-partial.xml             |   1 +
 .../cpu-check-default-partial2.xml            |   1 +
 tests/qemuxml2xmloutdata/cpu-check-full.xml   |   1 +
 tests/qemuxml2xmloutdata/cpu-check-none.xml   |   1 +
 .../qemuxml2xmloutdata/cpu-check-partial.xml  |   1 +
 tests/qemuxml2xmloutdata/cpu-empty.xml        |   1 +
 tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml |   1 +
 tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml  |   1 +
 .../qemuxml2xmloutdata/cpu-host-kvmclock.xml  |   1 +
 .../cpu-host-model-features.xml               |   1 +
 .../cpu-host-model-vendor.xml                 |   1 +
 .../cpu-host-passthrough-features.xml         |   1 +
 tests/qemuxml2xmloutdata/cpu-kvmclock.xml     |   1 +
 .../qemuxml2xmloutdata/cpu-numa-disjoint.xml  |   1 +
 .../cpu-numa-disordered.xml                   |   1 +
 .../qemuxml2xmloutdata/cpu-numa-memshared.xml |   1 +
 .../cpu-numa-no-memory-element.xml            |   1 +
 tests/qemuxml2xmloutdata/cpu-numa1.xml        |   1 +
 tests/qemuxml2xmloutdata/cpu-numa2.xml        |   1 +
 .../cputune-cpuset-big-id.x86_64-latest.xml   |   1 +
 .../qemuxml2xmloutdata/cputune-iothreads.xml  |   1 +
 .../cputune-iothreadsched-zeropriority.xml    |   1 +
 .../cputune-iothreadsched.xml                 |   1 +
 tests/qemuxml2xmloutdata/cputune-numatune.xml |   1 +
 .../cputune-zero-shares.xml                   |   1 +
 tests/qemuxml2xmloutdata/cputune.xml          |   1 +
 .../default-kvm-host-arch.xml                 |   1 +
 .../default-qemu-host-arch.xml                |   1 +
 ...ault-video-type-aarch64.aarch64-latest.xml |   1 +
 .../default-video-type-ppc64.ppc64-latest.xml |   1 +
 ...ault-video-type-riscv64.riscv64-latest.xml |   1 +
 .../default-video-type-s390x.s390x-latest.xml |   1 +
 .../default-video-type-x86_64-caps-test-0.xml |   1 +
 .../default-video-type-x86_64-caps-test-1.xml |   1 +
 .../disk-active-commit-active.xml             |   1 +
 .../disk-active-commit-inactive.xml           |   1 +
 .../disk-aio-io_uring.x86_64-latest.xml       |   1 +
 tests/qemuxml2xmloutdata/disk-aio.xml         |   1 +
 .../disk-arm-virtio-sd.aarch64-latest.xml     |   1 +
 .../disk-backing-chains-active.xml            |   1 +
 .../disk-backing-chains-inactive.xml          |   1 +
 .../disk-backing-chains-index-active.xml      |   1 +
 .../disk-backing-chains-index-inactive.xml    |   1 +
 .../disk-backing-chains-noindex.xml           |   1 +
 tests/qemuxml2xmloutdata/disk-boot-cdrom.xml  |   1 +
 tests/qemuxml2xmloutdata/disk-boot-disk.xml   |   1 +
 .../disk-cache.x86_64-1.5.3.xml               |   1 +
 .../disk-cache.x86_64-2.12.0.xml              |   1 +
 .../disk-cache.x86_64-2.6.0.xml               |   1 +
 .../disk-cache.x86_64-2.7.0.xml               |   1 +
 .../disk-cache.x86_64-latest.xml              |   1 +
 .../disk-cdrom-bus-other.xml                  |   1 +
 ...om-empty-network-invalid.x86_64-latest.xml |   1 +
 tests/qemuxml2xmloutdata/disk-cdrom.xml       |   1 +
 .../qemuxml2xmloutdata/disk-copy_on_read.xml  |   1 +
 .../disk-discard.x86_64-latest.xml            |   1 +
 .../qemuxml2xmloutdata/disk-error-policy.xml  |   1 +
 tests/qemuxml2xmloutdata/disk-floppy.xml      |   1 +
 tests/qemuxml2xmloutdata/disk-fmt-qcow.xml    |   1 +
 .../disk-metadata-cache.x86_64-latest.xml     |   1 +
 .../qemuxml2xmloutdata/disk-mirror-active.xml |   1 +
 .../disk-mirror-inactive.xml                  |   1 +
 .../disk-mirror-old-active.xml                |   1 +
 .../disk-mirror-old-inactive.xml              |   1 +
 .../disk-network-gluster.xml                  |   1 +
 .../disk-network-http.x86_64-latest.xml       |   1 +
 .../qemuxml2xmloutdata/disk-network-iscsi.xml |   1 +
 tests/qemuxml2xmloutdata/disk-network-nbd.xml |   1 +
 ...isk-network-nfs-inactive.x86_64-latest.xml |   1 +
 .../disk-network-nfs.x86_64-latest.xml        |   1 +
 tests/qemuxml2xmloutdata/disk-network-rbd.xml |   1 +
 .../disk-network-sheepdog.xml                 |   1 +
 .../disk-network-source-auth.xml              |   1 +
 .../disk-network-tlsx509-nbd.xml              |   1 +
 .../disk-network-tlsx509-vxhs.xml             |   1 +
 .../qemuxml2xmloutdata/disk-network-vxhs.xml  |   1 +
 .../disk-scsi-device-auto.xml                 |   1 +
 .../qemuxml2xmloutdata/disk-scsi-disk-vpd.xml |   1 +
 .../disk-scsi-lun-passthrough-sgio.xml        |   1 +
 .../disk-scsi.x86_64-latest.xml               |   1 +
 tests/qemuxml2xmloutdata/disk-serial.xml      |   1 +
 .../disk-slices.x86_64-latest.xml             |   1 +
 .../disk-source-pool-mode.xml                 |   1 +
 tests/qemuxml2xmloutdata/disk-source-pool.xml |   1 +
 tests/qemuxml2xmloutdata/disk-usb-device.xml  |   1 +
 .../disk-vhostuser.x86_64-latest.xml          |   1 +
 .../disk-virtio-s390-zpci.xml                 |   1 +
 tests/qemuxml2xmloutdata/disk-virtio.xml      |   1 +
 tests/qemuxml2xmloutdata/encrypted-disk.xml   |   1 +
 tests/qemuxml2xmloutdata/eoi-disabled.xml     |   1 +
 tests/qemuxml2xmloutdata/eoi-enabled.xml      |   1 +
 tests/qemuxml2xmloutdata/event_idx.xml        |   1 +
 tests/qemuxml2xmloutdata/floppy-drive-fat.xml |   1 +
 .../genid-active.x86_64-latest.xml            |   1 +
 .../genid-auto-active.x86_64-latest.xml       |   1 +
 .../genid-auto-inactive.x86_64-latest.xml     |   1 +
 .../genid-inactive.x86_64-latest.xml          |   1 +
 .../graphics-listen-network.xml               |   1 +
 .../graphics-listen-network2.xml              |   1 +
 .../graphics-spice-auto-socket-cfg.xml        |   1 +
 .../graphics-spice-auto-socket.xml            |   1 +
 .../graphics-spice-compression.xml            |   1 +
 .../graphics-spice-egl-headless.xml           |   1 +
 .../graphics-spice-qxl-vga.xml                |   1 +
 .../graphics-spice-socket.xml                 |   1 +
 .../graphics-spice-timeout.xml                |   1 +
 tests/qemuxml2xmloutdata/graphics-spice.xml   |   1 +
 .../graphics-vnc-auto-socket-cfg.xml          |   1 +
 .../graphics-vnc-auto-socket.xml              |   1 +
 .../graphics-vnc-egl-headless.xml             |   1 +
 .../graphics-vnc-no-listen-attr.xml           |   1 +
 ...ics-vnc-remove-generated-socket-active.xml |   1 +
 ...s-vnc-remove-generated-socket-inactive.xml |   1 +
 .../qemuxml2xmloutdata/graphics-vnc-sasl.xml  |   1 +
 .../graphics-vnc-socket.xml                   |   1 +
 tests/qemuxml2xmloutdata/graphics-vnc-tls.xml |   1 +
 .../graphics-vnc-websocket.xml                |   1 +
 tests/qemuxml2xmloutdata/graphics-vnc.xml     |   1 +
 ...stdev-mdev-display-ramfb.x86_64-latest.xml |   1 +
 .../hostdev-mdev-display.xml                  |   1 +
 .../hostdev-mdev-precreated.xml               |   1 +
 .../hostdev-pci-address-unassigned.xml        |   1 +
 .../hostdev-pci-address.xml                   |   1 +
 .../hostdev-pci-multifunction.xml             |   1 +
 .../hostdev-scsi-autogen-address.xml          |   1 +
 .../hostdev-scsi-large-unit.xml               |   1 +
 tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml |   1 +
 .../qemuxml2xmloutdata/hostdev-scsi-rawio.xml |   1 +
 .../qemuxml2xmloutdata/hostdev-scsi-sgio.xml  |   1 +
 .../hostdev-scsi-shareable.xml                |   1 +
 .../hostdev-scsi-vhost-scsi-ccw.xml           |   1 +
 .../hostdev-scsi-vhost-scsi-pci.xml           |   1 +
 .../hostdev-scsi-vhost-scsi-pcie.xml          |   1 +
 .../hostdev-scsi-virtio-scsi.xml              |   1 +
 .../hostdev-subsys-mdev-vfio-ap.xml           |   1 +
 ...subsys-mdev-vfio-ccw-boot.s390x-latest.xml |   1 +
 .../hostdev-subsys-mdev-vfio-ccw.xml          |   1 +
 .../hostdev-usb-address.xml                   |   1 +
 .../hostdev-vfio-zpci-autogenerate-fids.xml   |   1 +
 .../hostdev-vfio-zpci-autogenerate-uids.xml   |   1 +
 .../hostdev-vfio-zpci-autogenerate.xml        |   1 +
 .../hostdev-vfio-zpci-boundaries.xml          |   1 +
 .../hostdev-vfio-zpci-ccw-memballoon.xml      |   1 +
 .../hostdev-vfio-zpci-multidomain-many.xml    |   1 +
 .../qemuxml2xmloutdata/hostdev-vfio-zpci.xml  |   1 +
 tests/qemuxml2xmloutdata/hostdev-vfio.xml     |   1 +
 .../qemuxml2xmloutdata/hugepages-default.xml  |   1 +
 .../qemuxml2xmloutdata/hugepages-nodeset.xml  |   1 +
 .../hugepages-numa-default-2M.xml             |   1 +
 .../hugepages-numa-nodeset-part.xml           |   1 +
 .../hugepages-numa-nodeset.xml                |   1 +
 tests/qemuxml2xmloutdata/hugepages-shared.xml |   1 +
 tests/qemuxml2xmloutdata/hyperv-off.xml       |   1 +
 tests/qemuxml2xmloutdata/hyperv-panic.xml     |   1 +
 .../hyperv-stimer-direct.xml                  |   1 +
 tests/qemuxml2xmloutdata/hyperv.xml           |   1 +
 tests/qemuxml2xmloutdata/input-usbmouse.xml   |   1 +
 tests/qemuxml2xmloutdata/input-usbtablet.xml  |   1 +
 tests/qemuxml2xmloutdata/input-virtio-ccw.xml |   1 +
 .../intel-iommu.x86_64-2.6.0.xml              |   1 +
 tests/qemuxml2xmloutdata/interface-driver.xml |   1 +
 tests/qemuxml2xmloutdata/interface-server.xml |   1 +
 .../iommu-smmuv3.aarch64-latest.xml           |   1 +
 .../iothreads-disk-virtio-ccw.xml             |   1 +
 tests/qemuxml2xmloutdata/iothreads-disk.xml   |   1 +
 .../iothreads-ids-partial.xml                 |   1 +
 tests/qemuxml2xmloutdata/iothreads-ids.xml    |   1 +
 .../iothreads-virtio-scsi-ccw.xml             |   1 +
 .../iothreads-virtio-scsi-pci.xml             |   1 +
 tests/qemuxml2xmloutdata/iothreads.xml        |   1 +
 tests/qemuxml2xmloutdata/kvm-features-off.xml |   1 +
 tests/qemuxml2xmloutdata/kvm-features.xml     |   1 +
 tests/qemuxml2xmloutdata/kvmclock.xml         |   1 +
 tests/qemuxml2xmloutdata/lease.xml            |   1 +
 .../luks-disks-source-qcow2.x86_64-latest.xml |   1 +
 .../qemuxml2xmloutdata/luks-disks-source.xml  |   1 +
 .../mach-virt-console-virtio.xml              |   1 +
 .../mach-virt-serial-compat.xml               |   1 +
 .../mach-virt-serial-pci.xml                  |   1 +
 .../mach-virt-serial-usb.xml                  |   1 +
 tests/qemuxml2xmloutdata/machine-core-off.xml |   1 +
 tests/qemuxml2xmloutdata/machine-core-on.xml  |   1 +
 ...hine-loadparm-multiple-disks-nets-s390.xml |   1 +
 .../memory-hotplug-dimm.xml                   |   1 +
 ...memory-hotplug-nvdimm-ppc64-abi-update.xml |   1 +
 .../memory-hotplug-nvdimm-ppc64.xml           |   1 +
 ...memory-hotplug-ppc64-nonuma-abi-update.xml |   1 +
 tests/qemuxml2xmloutdata/memory-hotplug.xml   |   1 +
 .../qemuxml2xmloutdata/memorybacking-set.xml  |   1 +
 .../memorybacking-unset.xml                   |   1 +
 .../qemuxml2xmloutdata/memtune-unlimited.xml  |   1 +
 tests/qemuxml2xmloutdata/memtune.xml          |   1 +
 .../qemuxml2xmloutdata/metadata-duplicate.xml |   1 +
 tests/qemuxml2xmloutdata/metadata.xml         |   1 +
 tests/qemuxml2xmloutdata/migrate.xml          |   1 +
 tests/qemuxml2xmloutdata/minimal.xml          |   1 +
 tests/qemuxml2xmloutdata/misc-acpi.xml        |   1 +
 tests/qemuxml2xmloutdata/misc-disable-s3.xml  |   1 +
 .../misc-disable-suspends.xml                 |   1 +
 tests/qemuxml2xmloutdata/misc-enable-s4.xml   |   1 +
 tests/qemuxml2xmloutdata/misc-no-reboot.xml   |   1 +
 tests/qemuxml2xmloutdata/misc-uuid.xml        |   1 +
 tests/qemuxml2xmloutdata/net-bandwidth.xml    |   1 +
 tests/qemuxml2xmloutdata/net-bandwidth2.xml   |   1 +
 tests/qemuxml2xmloutdata/net-coalesce.xml     |   1 +
 tests/qemuxml2xmloutdata/net-eth-hostip.xml   |   1 +
 tests/qemuxml2xmloutdata/net-eth-ifname.xml   |   1 +
 .../net-eth-unmanaged-tap.xml                 |   1 +
 tests/qemuxml2xmloutdata/net-eth.xml          |   1 +
 .../net-hostdev-bootorder.xml                 |   1 +
 tests/qemuxml2xmloutdata/net-hostdev-vfio.xml |   1 +
 tests/qemuxml2xmloutdata/net-hostdev.xml      |   1 +
 .../net-isolated-port.x86_64-latest.xml       |   1 +
 tests/qemuxml2xmloutdata/net-many-models.xml  |   1 +
 tests/qemuxml2xmloutdata/net-midonet.xml      |   1 +
 tests/qemuxml2xmloutdata/net-mtu.xml          |   1 +
 tests/qemuxml2xmloutdata/net-openvswitch.xml  |   1 +
 tests/qemuxml2xmloutdata/net-udp.xml          |   1 +
 tests/qemuxml2xmloutdata/net-user.xml         |   1 +
 tests/qemuxml2xmloutdata/net-vdpa.xml         |   1 +
 tests/qemuxml2xmloutdata/net-vhostuser.xml    |   1 +
 .../qemuxml2xmloutdata/net-virtio-device.xml  |   1 +
 .../net-virtio-disable-offloads.xml           |   1 +
 .../net-virtio-network-portgroup.xml          |   1 +
 .../net-virtio-rxtxqueuesize.xml              |   1 +
 .../net-virtio-teaming-network.xml            |   1 +
 .../qemuxml2xmloutdata/net-virtio-teaming.xml |   1 +
 tests/qemuxml2xmloutdata/net-virtio.xml       |   1 +
 tests/qemuxml2xmloutdata/nosharepages.xml     |   1 +
 .../numad-auto-memory-vcpu-cpuset.xml         |   1 +
 ...to-memory-vcpu-no-cpuset-and-placement.xml |   1 +
 .../numad-auto-vcpu-no-numatune.xml           |   1 +
 .../numad-static-vcpu-no-numatune.xml         |   1 +
 .../numatune-auto-prefer.xml                  |   1 +
 .../qemuxml2xmloutdata/numatune-distances.xml |   1 +
 .../numatune-memnode-no-memory.xml            |   1 +
 tests/qemuxml2xmloutdata/numatune-memnode.xml |   1 +
 ...avcpus-topology-mismatch.x86_64-latest.xml |   1 +
 .../os-firmware-bios.x86_64-latest.xml        |   1 +
 .../os-firmware-efi-secboot.x86_64-latest.xml |   1 +
 .../os-firmware-efi.x86_64-latest.xml         |   1 +
 tests/qemuxml2xmloutdata/panic-double.xml     |   1 +
 tests/qemuxml2xmloutdata/panic-isa.xml        |   1 +
 tests/qemuxml2xmloutdata/panic-no-address.xml |   1 +
 tests/qemuxml2xmloutdata/panic-pseries.xml    |   1 +
 tests/qemuxml2xmloutdata/panic.xml            |   1 +
 tests/qemuxml2xmloutdata/pci-autoadd-addr.xml |   1 +
 tests/qemuxml2xmloutdata/pci-autoadd-idx.xml  |   1 +
 .../qemuxml2xmloutdata/pci-autofill-addr.xml  |   1 +
 .../pci-bridge-many-disks.xml                 |   1 +
 tests/qemuxml2xmloutdata/pci-bridge.xml       |   1 +
 tests/qemuxml2xmloutdata/pci-expander-bus.xml |   1 +
 tests/qemuxml2xmloutdata/pci-many.xml         |   1 +
 .../pci-rom-disabled-invalid.xml              |   1 +
 tests/qemuxml2xmloutdata/pci-rom-disabled.xml |   1 +
 tests/qemuxml2xmloutdata/pci-rom.xml          |   1 +
 .../pci-serial-dev-chardev.xml                |   1 +
 .../qemuxml2xmloutdata/pcie-expander-bus.xml  |   1 +
 .../pcie-root-port-model-generic.xml          |   1 +
 .../pcie-root-port-model-ioh3420.xml          |   1 +
 ...pcie-root-port-nohotplug.x86_64-latest.xml |   1 +
 tests/qemuxml2xmloutdata/pcie-root-port.xml   |   1 +
 tests/qemuxml2xmloutdata/pcie-root.xml        |   1 +
 .../pcie-switch-downstream-port.xml           |   1 +
 .../pcie-switch-upstream-port.xml             |   1 +
 tests/qemuxml2xmloutdata/pcihole64-gib.xml    |   1 +
 tests/qemuxml2xmloutdata/pcihole64-none.xml   |   1 +
 tests/qemuxml2xmloutdata/pcihole64-q35.xml    |   1 +
 tests/qemuxml2xmloutdata/pcihole64.xml        |   1 +
 tests/qemuxml2xmloutdata/pmu-feature-off.xml  |   1 +
 tests/qemuxml2xmloutdata/pmu-feature.xml      |   1 +
 ...fault-cpu-kvm-pseries-2.7.ppc64-latest.xml |   1 +
 ...fault-cpu-kvm-pseries-3.1.ppc64-latest.xml |   1 +
 ...fault-cpu-kvm-pseries-4.2.ppc64-latest.xml |   1 +
 ...fault-cpu-tcg-pseries-2.7.ppc64-latest.xml |   1 +
 ...fault-cpu-tcg-pseries-3.1.ppc64-latest.xml |   1 +
 ...fault-cpu-tcg-pseries-4.2.ppc64-latest.xml |   1 +
 .../ppc64-pseries-graphics.ppc64-latest.xml   |   1 +
 .../ppc64-pseries-headless.ppc64-latest.xml   |   1 +
 .../ppc64-tpmproxy-single.ppc64-latest.xml    |   1 +
 .../ppc64-tpmproxy-with-tpm.ppc64-latest.xml  |   1 +
 .../ppc64-usb-controller-legacy.xml           |   1 +
 .../ppc64-usb-controller.xml                  |   1 +
 .../pseries-console-virtio.xml                |   1 +
 .../pseries-cpu-compat-power9.xml             |   1 +
 .../qemuxml2xmloutdata/pseries-cpu-compat.xml |   1 +
 .../qemuxml2xmloutdata/pseries-cpu-exact.xml  |   1 +
 tests/qemuxml2xmloutdata/pseries-features.xml |   1 +
 .../qemuxml2xmloutdata/pseries-hostdevs-1.xml |   1 +
 .../qemuxml2xmloutdata/pseries-hostdevs-2.xml |   1 +
 .../qemuxml2xmloutdata/pseries-hostdevs-3.xml |   1 +
 .../pseries-many-buses-1.xml                  |   1 +
 .../pseries-many-buses-2.xml                  |   1 +
 .../pseries-many-devices.xml                  |   1 +
 tests/qemuxml2xmloutdata/pseries-nvram.xml    |   1 +
 .../pseries-panic-missing.xml                 |   1 +
 .../pseries-panic-no-address.xml              |   1 +
 .../pseries-phb-default-missing.xml           |   1 +
 .../pseries-phb-numa-node.xml                 |   1 +
 .../qemuxml2xmloutdata/pseries-phb-simple.xml |   1 +
 .../pseries-serial-native.xml                 |   1 +
 .../qemuxml2xmloutdata/pseries-serial-pci.xml |   1 +
 .../qemuxml2xmloutdata/pseries-serial-usb.xml |   1 +
 .../pv-spinlock-disabled.xml                  |   1 +
 .../pv-spinlock-enabled.xml                   |   1 +
 .../q35-default-devices-only.xml              |   1 +
 .../qemuxml2xmloutdata/q35-multifunction.xml  |   1 +
 .../q35-pci-force-address.xml                 |   1 +
 tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml |   1 +
 tests/qemuxml2xmloutdata/q35-pcie.xml         |   1 +
 tests/qemuxml2xmloutdata/q35-usb2-multi.xml   |   1 +
 tests/qemuxml2xmloutdata/q35-usb2-reorder.xml |   1 +
 tests/qemuxml2xmloutdata/q35-usb2.xml         |   1 +
 .../q35-virt-manager-basic.xml                |   1 +
 tests/qemuxml2xmloutdata/q35-virtio-pci.xml   |   1 +
 tests/qemuxml2xmloutdata/q35.xml              |   1 +
 tests/qemuxml2xmloutdata/qemu-ns-no-env.xml   |   1 +
 .../reboot-timeout-disabled.xml               |   1 +
 .../reboot-timeout-enabled.xml                |   1 +
 tests/qemuxml2xmloutdata/restore-v2.xml       |   1 +
 .../riscv64-virt-graphics.riscv64-latest.xml  |   1 +
 .../riscv64-virt-headless.riscv64-latest.xml  |   1 +
 tests/qemuxml2xmloutdata/riscv64-virt-pci.xml |   1 +
 tests/qemuxml2xmloutdata/riscv64-virt.xml     |   1 +
 ...lt-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml |   1 +
 ...lt-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml |   1 +
 ...lt-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml |   1 +
 ...lt-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml |   1 +
 .../s390-defaultconsole.xml                   |   1 +
 .../qemuxml2xmloutdata/s390-panic-missing.xml |   1 +
 .../s390-panic-no-address.xml                 |   1 +
 tests/qemuxml2xmloutdata/s390-panic.xml       |   1 +
 tests/qemuxml2xmloutdata/s390-serial-2.xml    |   1 +
 .../s390-serial-console.xml                   |   1 +
 tests/qemuxml2xmloutdata/s390-serial.xml      |   1 +
 .../s390x-ccw-graphics.s390x-latest.xml       |   1 +
 .../s390x-ccw-headless.s390x-latest.xml       |   1 +
 .../qemuxml2xmloutdata/seclabel-dac-none.xml  |   1 +
 .../seclabel-device-multiple.xml              |   1 +
 .../seclabel-dynamic-baselabel-inactive.xml   |   1 +
 .../seclabel-dynamic-labelskip-inactive.xml   |   1 +
 ...seclabel-dynamic-none-relabel-inactive.xml |   1 +
 .../seclabel-dynamic-none.xml                 |   1 +
 .../seclabel-dynamic-override-inactive.xml    |   1 +
 .../seclabel-dynamic-relabel-inactive.xml     |   1 +
 tests/qemuxml2xmloutdata/seclabel-none.xml    |   1 +
 .../seclabel-static-labelskip-active.xml      |   1 +
 .../seclabel-static-labelskip-inactive.xml    |   1 +
 tests/qemuxml2xmloutdata/seclabel-static.xml  |   1 +
 .../serial-spiceport-nospice.xml              |   1 +
 tests/qemuxml2xmloutdata/serial-spiceport.xml |   1 +
 .../serial-target-port-auto.xml               |   1 +
 .../serial-tcp-tlsx509-chardev.xml            |   1 +
 .../shmem-plain-doorbell.xml                  |   1 +
 tests/qemuxml2xmloutdata/shmem.xml            |   1 +
 .../smartcard-controller.xml                  |   1 +
 .../smartcard-host-certificates-database.xml  |   1 +
 .../smartcard-host-certificates.xml           |   1 +
 tests/qemuxml2xmloutdata/smartcard-host.xml   |   1 +
 .../smartcard-passthrough-spicevmc.xml        |   1 +
 .../smartcard-passthrough-tcp.xml             |   1 +
 .../smbios-multiple-type2.xml                 |   1 +
 tests/qemuxml2xmloutdata/smbios.xml           |   1 +
 tests/qemuxml2xmloutdata/smp.xml              |   1 +
 tests/qemuxml2xmloutdata/sound-device.xml     |   1 +
 tests/qemuxml2xmloutdata/sound.xml            |   1 +
 .../tap-vhost-incorrect.xml                   |   1 +
 tests/qemuxml2xmloutdata/tap-vhost.xml        |   1 +
 .../tpm-emulator-tpm2-enc.x86_64-latest.xml   |   1 +
 ...tpm-emulator-tpm2-pstate.x86_64-latest.xml |   1 +
 .../tpm-emulator-tpm2.x86_64-latest.xml       |   1 +
 .../tpm-emulator.x86_64-latest.xml            |   1 +
 .../tpm-passthrough-crb.x86_64-latest.xml     |   1 +
 .../tpm-passthrough.x86_64-latest.xml         |   1 +
 .../qemuxml2xmloutdata/tseg-explicit-size.xml |   1 +
 .../usb-controller-default-q35.xml            |   1 +
 .../usb-controller-explicit-q35.xml           |   1 +
 tests/qemuxml2xmloutdata/usb-controller.xml   |   1 +
 .../qemuxml2xmloutdata/usb-ich9-ehci-addr.xml |   1 +
 tests/qemuxml2xmloutdata/usb-none.xml         |   1 +
 .../usb-piix3-controller.xml                  |   1 +
 tests/qemuxml2xmloutdata/usb-port-missing.xml |   1 +
 .../usb-redir-filter-version.xml              |   1 +
 tests/qemuxml2xmloutdata/usb-redir-filter.xml |   1 +
 tests/qemuxml2xmloutdata/usb-redir.xml        |   1 +
 tests/qemuxml2xmloutdata/vhost-vsock-auto.xml |   1 +
 .../vhost-vsock-ccw-auto.xml                  |   1 +
 tests/qemuxml2xmloutdata/vhost_queues.xml     |   1 +
 .../video-device-pciaddr-default.xml          |   1 +
 .../qemuxml2xmloutdata/video-none-device.xml  |   1 +
 tests/qemuxml2xmloutdata/video-qxl-heads.xml  |   1 +
 .../qemuxml2xmloutdata/video-qxl-noheads.xml  |   1 +
 .../video-virtio-gpu-ccw-auto.xml             |   1 +
 .../video-virtio-gpu-ccw.xml                  |   1 +
 .../video-virtio-gpu-device.xml               |   1 +
 .../video-virtio-gpu-secondary.xml            |   1 +
 .../video-virtio-gpu-spice-gl.xml             |   1 +
 .../video-virtio-gpu-virgl.xml                |   1 +
 .../virtio-9p-createmode.x86_64-latest.xml    |   1 +
 .../virtio-9p-multidevs.x86_64-latest.xml     |   1 +
 .../virtio-input-passthrough.xml              |   1 +
 tests/qemuxml2xmloutdata/virtio-input.xml     |   1 +
 tests/qemuxml2xmloutdata/virtio-lun.xml       |   1 +
 .../virtio-non-transitional.x86_64-latest.xml |   1 +
 .../virtio-rng-builtin.x86_64-latest.xml      |   1 +
 tests/qemuxml2xmloutdata/virtio-rng-egd.xml   |   1 +
 .../qemuxml2xmloutdata/virtio-rng-random.xml  |   1 +
 .../virtio-transitional.x86_64-latest.xml     |   1 +
 tests/qemuxml2xmloutdata/vmcoreinfo.xml       |   1 +
 tests/qemuxml2xmloutdata/watchdog.xml         |   1 +
 ...4-default-cpu-kvm-pc-4.2.x86_64-latest.xml |   1 +
 ...-default-cpu-kvm-q35-4.2.x86_64-latest.xml |   1 +
 ...4-default-cpu-tcg-pc-4.2.x86_64-latest.xml |   1 +
 ...-default-cpu-tcg-q35-4.2.x86_64-latest.xml |   1 +
 .../x86_64-pc-graphics.x86_64-latest.xml      |   1 +
 .../x86_64-pc-headless.x86_64-latest.xml      |   1 +
 .../x86_64-q35-graphics.x86_64-latest.xml     |   1 +
 .../x86_64-q35-headless.x86_64-latest.xml     |   1 +
 tests/qemuxml2xmltest.c                       |  22 ++++
 612 files changed, 1181 insertions(+), 49 deletions(-)
 create mode 100644 tests/qemuxml2argvdata/audio-default-nographics.args
 create mode 100644 tests/qemuxml2argvdata/audio-default-nographics.xml
 create mode 100644 tests/qemuxml2argvdata/audio-default-sdl.args
 create mode 100644 tests/qemuxml2argvdata/audio-default-sdl.xml
 create mode 100644 tests/qemuxml2argvdata/audio-default-spice.args
 create mode 100644 tests/qemuxml2argvdata/audio-default-spice.xml
 create mode 100644 tests/qemuxml2argvdata/audio-default-vnc.args
 create mode 100644 tests/qemuxml2argvdata/audio-default-vnc.xml
 create mode 100644 tests/qemuxml2xmloutdata/audio-default-nographics.x86_64-latest.xml
 create mode 120000 tests/qemuxml2xmloutdata/audio-default-nographics.xml
 create mode 100644 tests/qemuxml2xmloutdata/audio-default-sdl.x86_64-latest.xml
 create mode 120000 tests/qemuxml2xmloutdata/audio-default-sdl.xml
 create mode 100644 tests/qemuxml2xmloutdata/audio-default-spice.x86_64-latest.xml
 create mode 120000 tests/qemuxml2xmloutdata/audio-default-spice.xml
 create mode 100644 tests/qemuxml2xmloutdata/audio-default-vnc.x86_64-latest.xml
 create mode 120000 tests/qemuxml2xmloutdata/audio-default-vnc.xml

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index abbf4bc8cd..51d74e89af 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7642,7 +7642,6 @@ static int
 qemuBuildGraphicsSDLCommandLine(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
                                 virCommandPtr cmd,
                                 virQEMUCapsPtr qemuCaps G_GNUC_UNUSED,
-                                virDomainDefPtr def,
                                 virDomainGraphicsDefPtr graphics)
 {
     g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER;
@@ -7654,15 +7653,6 @@ qemuBuildGraphicsSDLCommandLine(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
     if (graphics->data.sdl.fullscreen)
         virCommandAddArg(cmd, "-full-screen");
 
-    if (def->naudios == 0) {
-        /* If using SDL for video, then we should just let it
-         * use QEMU's host audio drivers, possibly SDL too
-         * User can set these two before starting libvirtd
-         */
-        virCommandAddEnvPass(cmd, "QEMU_AUDIO_DRV");
-        virCommandAddEnvPass(cmd, "SDL_AUDIODRIVER");
-    }
-
     virCommandAddArg(cmd, "-display");
     virBufferAddLit(&opt, "sdl");
 
@@ -7680,7 +7670,6 @@ static int
 qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
                                 virCommandPtr cmd,
                                 virQEMUCapsPtr qemuCaps,
-                                virDomainDefPtr def,
                                 virDomainGraphicsDefPtr graphics)
 {
     g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER;
@@ -7807,17 +7796,6 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
     if (graphics->data.vnc.keymap)
         virCommandAddArgList(cmd, "-k", graphics->data.vnc.keymap, NULL);
 
-    if (def->naudios == 0) {
-        /* Unless user requested it, set the audio backend to none, to
-         * prevent it opening the host OS audio devices, since that causes
-         * security issues and might not work when using VNC.
-         */
-        if (cfg->vncAllowHostAudio)
-            virCommandAddEnvPass(cmd, "QEMU_AUDIO_DRV");
-        else
-            virCommandAddEnvString(cmd, "QEMU_AUDIO_DRV=none");
-    }
-
     return 0;
 }
 
@@ -7825,7 +7803,6 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
 static int
 qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
                                   virCommandPtr cmd,
-                                  virDomainDefPtr def,
                                   virDomainGraphicsDefPtr graphics)
 {
     g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER;
@@ -8024,13 +8001,6 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
         virCommandAddArgList(cmd, "-k",
                              graphics->data.spice.keymap, NULL);
 
-    if (def->naudios == 0) {
-        /* SPICE includes native support for tunnelling audio, so we
-         * set the audio backend to point at SPICE's own driver
-         */
-        virCommandAddEnvString(cmd, "QEMU_AUDIO_DRV=spice");
-    }
-
     return 0;
 }
 
@@ -8071,19 +8041,19 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg,
         switch (graphics->type) {
         case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
             if (qemuBuildGraphicsSDLCommandLine(cfg, cmd,
-                                                qemuCaps, def, graphics) < 0)
+                                                qemuCaps, graphics) < 0)
                 return -1;
 
             break;
         case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
             if (qemuBuildGraphicsVNCCommandLine(cfg, cmd,
-                                                qemuCaps, def, graphics) < 0)
+                                                qemuCaps, graphics) < 0)
                 return -1;
 
             break;
         case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
             if (qemuBuildGraphicsSPICECommandLine(cfg, cmd,
-                                                  def, graphics) < 0)
+                                                  graphics) < 0)
                 return -1;
 
             break;
@@ -10081,13 +10051,6 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
     if (!def->ngraphics) {
         virCommandAddArg(cmd, "-display");
         virCommandAddArg(cmd, "none");
-
-        if (def->naudios == 0) {
-            if (cfg->nogfxAllowHostAudio)
-                virCommandAddEnvPass(cmd, "QEMU_AUDIO_DRV");
-            else
-                virCommandAddEnvString(cmd, "QEMU_AUDIO_DRV=none");
-        }
     }
 
     /* Disable global config files and default devices */
diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
index 73e2473dce..df332ad870 100644
--- a/src/qemu/qemu_domain.c
+++ b/src/qemu/qemu_domain.c
@@ -3573,9 +3573,112 @@ qemuDomainDefAddImplicitInputDevice(virDomainDef *def)
     return 0;
 }
 
+static int
+qemuDomainDefAddDefaultAudioBackend(virQEMUDriverPtr driver,
+                                    virDomainDefPtr def)
+{
+    size_t i;
+    bool addAudio = false;
+    bool audioPassthrough = false;
+    int audioBackend = VIR_DOMAIN_AUDIO_TYPE_NONE;
+    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
+
+    if (def->naudios > 0) {
+        return 0;
+    }
+
+    for (i = 0; i < def->ngraphics; i++) {
+        virDomainGraphicsDefPtr graph = def->graphics[i];
+
+        switch ((virDomainGraphicsType)graph->type) {
+        case VIR_DOMAIN_GRAPHICS_TYPE_VNC:
+            if (cfg->vncAllowHostAudio) {
+                audioPassthrough = true;
+            } else {
+                audioPassthrough = false;
+                audioBackend = VIR_DOMAIN_AUDIO_TYPE_NONE;
+            }
+            addAudio = true;
+            break;
+        case VIR_DOMAIN_GRAPHICS_TYPE_SPICE:
+            audioPassthrough = false;
+            audioBackend = VIR_DOMAIN_AUDIO_TYPE_SPICE;
+            addAudio = true;
+            break;
+        case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
+            audioPassthrough = true;
+            addAudio = true;
+            break;
+
+        case VIR_DOMAIN_GRAPHICS_TYPE_RDP:
+        case VIR_DOMAIN_GRAPHICS_TYPE_DESKTOP:
+        case VIR_DOMAIN_GRAPHICS_TYPE_EGL_HEADLESS:
+            break;
+        case VIR_DOMAIN_GRAPHICS_TYPE_LAST:
+        default:
+            virReportEnumRangeError(virDomainGraphicsType, graph->type);
+            return -1;
+        }
+    }
+
+    if (!def->ngraphics) {
+        if (cfg->nogfxAllowHostAudio) {
+            audioPassthrough = true;
+        } else {
+            audioPassthrough = false;
+            audioBackend = VIR_DOMAIN_AUDIO_TYPE_NONE;
+        }
+        addAudio = true;
+    }
+
+    if (addAudio && audioPassthrough) {
+        const char *audioenv = g_getenv("QEMU_AUDIO_DRV");
+        if (audioenv == NULL) {
+            addAudio = false;
+        } else {
+            /*
+             * QEMU audio driver names are mostly the same as
+             * libvirt XML audio backend names
+             */
+            if (STREQ(audioenv, "pa")) {
+                audioBackend = VIR_DOMAIN_AUDIO_TYPE_PULSEAUDIO;
+            } else {
+                if ((audioBackend = virDomainAudioTypeTypeFromString(audioenv)) < 0) {
+                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                                   _("unknown QEMU_AUDIO_DRV setting %s"), audioenv);
+                    return -1;
+                }
+            }
+        }
+    }
+    if (addAudio) {
+        virDomainAudioDefPtr audio = g_new0(virDomainAudioDef, 1);
+
+        audio->type = audioBackend;
+        audio->id = 1;
+
+        def->naudios = 1;
+        def->audios = g_new0(virDomainAudioDefPtr, def->naudios);
+        def->audios[0] = audio;
+
+        if (audioBackend == VIR_DOMAIN_AUDIO_TYPE_SDL) {
+            const char *sdldriver = g_getenv("SDL_AUDIODRIVER");
+            if (sdldriver != NULL &&
+                ((audio->backend.sdl.driver =
+                  virDomainAudioSDLDriverTypeFromString(sdldriver)) <= 0)) {
+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+                               _("unknown SDL_AUDIODRIVER setting %s"), sdldriver);
+                return -1;
+            }
+        }
+    }
+
+    return 0;
+}
 
 static int
-qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
+qemuDomainDefAddDefaultDevices(virQEMUDriverPtr driver,
+                               virDomainDefPtr def,
                                virQEMUCapsPtr qemuCaps)
 {
     bool addDefaultUSB = true;
@@ -3827,6 +3930,9 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
         }
     }
 
+    if (qemuDomainDefAddDefaultAudioBackend(driver, def) < 0)
+        return -1;
+
     return 0;
 }
 
@@ -4419,7 +4525,7 @@ qemuDomainDefPostParse(virDomainDefPtr def,
 
     qemuDomainNVRAMPathGenerate(cfg, def);
 
-    if (qemuDomainDefAddDefaultDevices(def, qemuCaps) < 0)
+    if (qemuDomainDefAddDefaultDevices(driver, def, qemuCaps) < 0)
         return -1;
 
     if (qemuCanonicalizeMachine(def, qemuCaps) < 0)
diff --git a/tests/qemudomaincheckpointxml2xmlout/redefine.xml b/tests/qemudomaincheckpointxml2xmlout/redefine.xml
index 524360fb4c..b7c9d9dc6c 100644
--- a/tests/qemudomaincheckpointxml2xmlout/redefine.xml
+++ b/tests/qemudomaincheckpointxml2xmlout/redefine.xml
@@ -57,6 +57,7 @@
       <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/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml
index 12bc6d953e..24b41ba7c5 100644
--- a/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml
+++ b/tests/qemudomainsnapshotxml2xmlout/disk_snapshot_redefine.xml
@@ -85,6 +85,7 @@
       <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='virtio'>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
       </memballoon>
diff --git a/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml b/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml
index c165e1f81d..eae4691c1c 100644
--- a/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml
+++ b/tests/qemudomainsnapshotxml2xmlout/external_vm_redefine.xml
@@ -45,6 +45,7 @@
       <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='virtio'>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
       </memballoon>
diff --git a/tests/qemudomainsnapshotxml2xmlout/full_domain.xml b/tests/qemudomainsnapshotxml2xmlout/full_domain.xml
index 080f6d50a3..1ddaa2a9aa 100644
--- a/tests/qemudomainsnapshotxml2xmlout/full_domain.xml
+++ b/tests/qemudomainsnapshotxml2xmlout/full_domain.xml
@@ -38,6 +38,7 @@
       <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='virtio'>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
       </memballoon>
diff --git a/tests/qemudomainsnapshotxml2xmlout/metadata.xml b/tests/qemudomainsnapshotxml2xmlout/metadata.xml
index e5fa60819c..4b14c9efde 100644
--- a/tests/qemudomainsnapshotxml2xmlout/metadata.xml
+++ b/tests/qemudomainsnapshotxml2xmlout/metadata.xml
@@ -42,6 +42,7 @@
       <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='virtio'>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
       </memballoon>
diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
index f80c4367df..690c85cf85 100644
--- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
@@ -57,6 +57,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
index 7998b978fb..58e156203f 100644
--- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
@@ -64,6 +64,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <alias name='balloon0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
index 2a48a97eef..d1e6329812 100644
--- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
@@ -57,6 +57,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
index 90518d1fa9..a119ae44d5 100644
--- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
@@ -64,6 +64,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <alias name='balloon0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
index 0d622fc8ae..a0358df432 100644
--- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
@@ -33,6 +33,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
index ed9deaea4a..a6c6c33a4b 100644
--- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
@@ -40,6 +40,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <alias name='balloon0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
index 342f172108..d16832b116 100644
--- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
@@ -33,6 +33,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
index b8341c74e5..5edb601297 100644
--- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
@@ -40,6 +40,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <alias name='balloon0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
index 29da89f5bc..0c675c3db9 100644
--- a/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
@@ -23,6 +23,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml b/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
index f81194db5b..5aca6ea5c5 100644
--- a/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
+++ b/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
@@ -30,6 +30,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <alias name='balloon0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
index 59c969e0f2..44f41c6ddd 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live+ccw-virtio.xml
@@ -44,6 +44,7 @@
       <alias name='virtio-serial0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='s390'/>
   </devices>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
index 6eadbdcd18..0988f8681c 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio+ccw-virtio-1-reverse.xml
@@ -54,6 +54,7 @@
       <alias name='virtio-serial0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='s390'/>
   </devices>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
index 68561b50a3..b0151cd690 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-2-ccw-virtio.xml
@@ -44,6 +44,7 @@
       <alias name='virtio-serial0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='s390'/>
   </devices>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
index 0900f3c8e3..0e8075caf6 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2-explicit.xml
@@ -53,6 +53,7 @@
       <alias name='virtio-serial0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='s390'/>
   </devices>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
index 0900f3c8e3..0e8075caf6 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio+ccw-virtio-2.xml
@@ -53,6 +53,7 @@
       <alias name='virtio-serial0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='s390'/>
   </devices>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
index 31979c40f0..240dda4c72 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live-with-ccw-virtio.xml
@@ -43,6 +43,7 @@
       <alias name='virtio-serial0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='s390'/>
   </devices>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
index 844b951940..9a650e340e 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-ccw-live.xml
@@ -34,6 +34,7 @@
       <alias name='virtio-serial0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='s390'/>
   </devices>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-multipath.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-multipath.xml
index 40af064d10..caf1c06c2f 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-multipath.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-multipath.xml
@@ -56,6 +56,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
   <seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml
index 035ec25304..ba99d0c2e4 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi-wwn+disk-scsi-duplicate-wwn.xml
@@ -66,6 +66,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
   <seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml
index dd65a48057..66302b3872 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-scsi.xml
@@ -54,6 +54,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
   <seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml
index c161e5b289..b462ad48e4 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-usb.xml
@@ -54,6 +54,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
   <seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
index 299d595d6e..5b573f1915 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+disk-virtio.xml
@@ -54,6 +54,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
   <seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+guestfwd.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+guestfwd.xml
index 8d7294123b..3bf64326c5 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+guestfwd.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+guestfwd.xml
@@ -49,6 +49,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
   <seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+hostdev-pci.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+hostdev-pci.xml
index 40dcc33595..62366bee05 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+hostdev-pci.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+hostdev-pci.xml
@@ -44,6 +44,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
       <source>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+interface-vdpa.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+interface-vdpa.xml
index 066180bb3c..54e5dabdfa 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+interface-vdpa.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+interface-vdpa.xml
@@ -51,6 +51,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
   <seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml
index 8013264989..86b6ebe19a 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-doorbell.xml
@@ -44,6 +44,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <shmem name='shmem0' role='peer'>
       <model type='ivshmem-plain'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml
index 0490310760..3a208a8244 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+ivshmem-plain.xml
@@ -44,6 +44,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <shmem name='shmem0' role='peer'>
       <model type='ivshmem-plain'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml
index b1ba51b2d8..a0d7e3c704 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+qemu-agent.xml
@@ -50,6 +50,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
   <seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml
index 1fddd68a27..31bafb0814 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog-user-alias.xml
@@ -44,6 +44,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <watchdog model='i6300esb' action='poweroff'>
       <alias name='ua-UserWatchdog'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml
index 76b573f25c..c9a2e90433 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live+watchdog.xml
@@ -44,6 +44,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <watchdog model='i6300esb' action='poweroff'>
       <alias name='watchdog0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml
index d46e20fa58..a02bc39663 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-live.xml
@@ -44,6 +44,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
   <seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml
index 5ee6ea25c3..0a04e2ac04 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-with-scsi-controller-live.xml
@@ -48,6 +48,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
   <seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
index 72b5174825..f553229a31 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-base-without-scsi-controller-live+disk-scsi-2.xml
@@ -58,6 +58,7 @@
     <input type='keyboard' bus='ps2'>
       <alias name='input1'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
   <seclabel type='none' model='none'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live+console-virtio.xml b/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live+console-virtio.xml
index abe68a0a07..5d688e7748 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live+console-virtio.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live+console-virtio.xml
@@ -119,6 +119,7 @@
       <alias name='sound0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </sound>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <alias name='video0'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml
index 45161e1e2d..b916f30412 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-console-compat-2-live.xml
@@ -114,6 +114,7 @@
       <alias name='sound0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </sound>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <alias name='video0'/>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live+hostdev-pci.xml b/tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live+hostdev-pci.xml
index 483cb5d8f0..6a60a388a9 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live+hostdev-pci.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live+hostdev-pci.xml
@@ -36,6 +36,7 @@
       <alias name='input1'/>
       <address type='usb' bus='0' port='2'/>
     </input>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
       <source>
diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live.xml b/tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live.xml
index 1dcc35f626..e9b89a7acc 100644
--- a/tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live.xml
+++ b/tests/qemuhotplugtestdomains/qemuhotplug-pseries-base-live.xml
@@ -36,6 +36,7 @@
       <alias name='input1'/>
       <address type='usb' bus='0' port='2'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemumigrationcookiexmldata/full-xml2xml-out.xml b/tests/qemumigrationcookiexmldata/full-xml2xml-out.xml
index a07dd1f147..013cfb1eb2 100644
--- a/tests/qemumigrationcookiexmldata/full-xml2xml-out.xml
+++ b/tests/qemumigrationcookiexmldata/full-xml2xml-out.xml
@@ -142,6 +142,7 @@
       <sound model='ich6'>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
       </sound>
+      <audio id='1' type='spice'/>
       <video>
         <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemustatusxml2xmldata/backup-pull-in.xml b/tests/qemustatusxml2xmldata/backup-pull-in.xml
index bb322f94d3..95afd3a51f 100644
--- a/tests/qemustatusxml2xmldata/backup-pull-in.xml
+++ b/tests/qemustatusxml2xmldata/backup-pull-in.xml
@@ -594,6 +594,7 @@
         <listen type='address' address='127.0.0.1' fromConfig='1' autoGenerated='no'/>
         <image compression='off'/>
       </graphics>
+      <audio id='1' type='spice'/>
       <video>
         <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
         <alias name='video0'/>
diff --git a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml
index c70742418b..52024f242c 100644
--- a/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml
+++ b/tests/qemustatusxml2xmldata/blockjob-blockdev-in.xml
@@ -694,6 +694,7 @@
         <listen type='address' address='127.0.0.1' fromConfig='1' autoGenerated='no'/>
         <image compression='off'/>
       </graphics>
+      <audio id='1' type='spice'/>
       <video>
         <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
         <alias name='video0'/>
diff --git a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
index bcef338fda..00c8e69adc 100644
--- a/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
+++ b/tests/qemustatusxml2xmldata/blockjob-mirror-in.xml
@@ -103,6 +103,7 @@
       <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='virtio'>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
       </memballoon>
diff --git a/tests/qemustatusxml2xmldata/migration-in-params-in.xml b/tests/qemustatusxml2xmldata/migration-in-params-in.xml
index 93450c38d5..f4bc5753c4 100644
--- a/tests/qemustatusxml2xmldata/migration-in-params-in.xml
+++ b/tests/qemustatusxml2xmldata/migration-in-params-in.xml
@@ -375,6 +375,7 @@
         <listen type='address' address='0.0.0.0' fromConfig='1' autoGenerated='no'/>
         <image compression='off'/>
       </graphics>
+      <audio id='1' type='spice'/>
       <video>
         <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
         <alias name='video0'/>
diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml
index b3d24eda98..c88996f923 100644
--- a/tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-nbd-bitmaps-in.xml
@@ -539,6 +539,7 @@
         <alias name='sound0'/>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
       </sound>
+      <audio id='1' type='spice'/>
       <video>
         <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
         <alias name='video0'/>
diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml
index 304fb1b77f..039dcacc58 100644
--- a/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-nbd-out.xml
@@ -420,6 +420,7 @@
         <alias name='sound0'/>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
       </sound>
+      <audio id='1' type='spice'/>
       <video>
         <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
         <alias name='video0'/>
diff --git a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
index d69796e029..3d1ddd5771 100644
--- a/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-nbd-tls-out.xml
@@ -457,6 +457,7 @@
         <alias name='sound0'/>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
       </sound>
+      <audio id='1' type='spice'/>
       <video>
         <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
         <alias name='video0'/>
diff --git a/tests/qemustatusxml2xmldata/migration-out-params-in.xml b/tests/qemustatusxml2xmldata/migration-out-params-in.xml
index c1daab4dee..cd9dbccd3a 100644
--- a/tests/qemustatusxml2xmldata/migration-out-params-in.xml
+++ b/tests/qemustatusxml2xmldata/migration-out-params-in.xml
@@ -389,6 +389,7 @@
         <listen type='address' address='0.0.0.0' fromConfig='1' autoGenerated='no'/>
         <image compression='off'/>
       </graphics>
+      <audio id='1' type='spice'/>
       <video>
         <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
         <alias name='video0'/>
diff --git a/tests/qemustatusxml2xmldata/modern-in.xml b/tests/qemustatusxml2xmldata/modern-in.xml
index 5a5d5b8983..ba0858a4ff 100644
--- a/tests/qemustatusxml2xmldata/modern-in.xml
+++ b/tests/qemustatusxml2xmldata/modern-in.xml
@@ -454,6 +454,7 @@
         <alias name='sound0'/>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
       </sound>
+      <audio id='1' type='spice'/>
       <video>
         <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
         <alias name='video0'/>
diff --git a/tests/qemustatusxml2xmldata/upgrade-out.xml b/tests/qemustatusxml2xmldata/upgrade-out.xml
index 962d25ce2e..f9476731f6 100644
--- a/tests/qemustatusxml2xmldata/upgrade-out.xml
+++ b/tests/qemustatusxml2xmldata/upgrade-out.xml
@@ -509,6 +509,7 @@
         <alias name='sound0'/>
         <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
       </sound>
+      <audio id='1' type='spice'/>
       <video>
         <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
         <alias name='video0'/>
diff --git a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml
index be48c55fe0..7f0208453f 100644
--- a/tests/qemustatusxml2xmldata/vcpus-multi-in.xml
+++ b/tests/qemustatusxml2xmldata/vcpus-multi-in.xml
@@ -335,6 +335,7 @@
       </controller>
       <input type='mouse' bus='ps2'/>
       <input type='keyboard' bus='ps2'/>
+      <audio id='1' type='none'/>
       <memballoon model='none'/>
       <iommu model='intel'>
         <driver intremap='on' eim='on'/>
diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.xml b/tests/qemuxml2argvdata/aarch64-gic-host.xml
index 561f6edc6c..0598473318 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-host.xml
+++ b/tests/qemuxml2argvdata/aarch64-gic-host.xml
@@ -19,6 +19,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <controller type='usb' index='0' model='none'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.xml b/tests/qemuxml2argvdata/aarch64-gic-v2.xml
index f451c87b71..474e641ccd 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v2.xml
+++ b/tests/qemuxml2argvdata/aarch64-gic-v2.xml
@@ -19,6 +19,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <controller type='usb' index='0' model='none'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.xml b/tests/qemuxml2argvdata/aarch64-gic-v3.xml
index f3a6b9283a..247d6025f7 100644
--- a/tests/qemuxml2argvdata/aarch64-gic-v3.xml
+++ b/tests/qemuxml2argvdata/aarch64-gic-v3.xml
@@ -19,6 +19,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <controller type='usb' index='0' model='none'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/audio-default-nographics.args b/tests/qemuxml2argvdata/audio-default-nographics.args
new file mode 100644
index 0000000000..01fe6e2beb
--- /dev/null
+++ b/tests/qemuxml2argvdata/audio-default-nographics.args
@@ -0,0 +1,29 @@
+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=alsa \
+/usr/bin/qemu-system-i386 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
+-m 214 \
+-realtime mlock=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,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
+server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-usb \
+-drive file=/dev/cdrom,format=raw,if=none,id=drive-ide0-1-0,readonly=on \
+-device ide-cd,bus=ide.1,unit=0,drive=drive-ide0-1-0,id=ide0-1-0,bootindex=1
diff --git a/tests/qemuxml2argvdata/audio-default-nographics.xml b/tests/qemuxml2argvdata/audio-default-nographics.xml
new file mode 100644
index 0000000000..374c8c38ce
--- /dev/null
+++ b/tests/qemuxml2argvdata/audio-default-nographics.xml
@@ -0,0 +1,31 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219100</memory>
+  <currentMemory unit='KiB'>219100</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='cdrom'/>
+  </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-i386</emulator>
+    <disk type='block' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source dev='/dev/cdrom'/>
+      <target dev='hdc' bus='ide'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
+    </disk>
+    <controller type='usb' index='0'/>
+    <controller type='ide' index='0'/>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/audio-default-sdl.args b/tests/qemuxml2argvdata/audio-default-sdl.args
new file mode 100644
index 0000000000..8793e9ce19
--- /dev/null
+++ b/tests/qemuxml2argvdata/audio-default-sdl.args
@@ -0,0 +1,31 @@
+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=sdl \
+SDL_AUDIODRIVER=esd \
+/usr/bin/qemu-system-i386 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
+-m 214 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
+server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-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 \
+-display sdl \
+-vga cirrus
diff --git a/tests/qemuxml2argvdata/audio-default-sdl.xml b/tests/qemuxml2argvdata/audio-default-sdl.xml
new file mode 100644
index 0000000000..4a7e5ab259
--- /dev/null
+++ b/tests/qemuxml2argvdata/audio-default-sdl.xml
@@ -0,0 +1,35 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219100</memory>
+  <currentMemory unit='KiB'>219100</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='cdrom'/>
+  </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-i386</emulator>
+    <disk type='block' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source dev='/dev/cdrom'/>
+      <target dev='hdc' bus='ide'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
+    </disk>
+    <controller type='usb' index='0'/>
+    <controller type='ide' index='0'/>
+    <controller type='pci' index='0' model='pci-root'/>
+    <graphics type='sdl'/>
+    <video>
+      <model type='cirrus'/>
+    </video>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/audio-default-spice.args b/tests/qemuxml2argvdata/audio-default-spice.args
new file mode 100644
index 0000000000..91a95d2050
--- /dev/null
+++ b/tests/qemuxml2argvdata/audio-default-spice.args
@@ -0,0 +1,30 @@
+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=spice \
+/usr/bin/qemu-system-i386 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
+-m 214 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
+server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-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 \
+-spice port=0,seamless-migration=on \
+-vga cirrus
diff --git a/tests/qemuxml2argvdata/audio-default-spice.xml b/tests/qemuxml2argvdata/audio-default-spice.xml
new file mode 100644
index 0000000000..93c91376a7
--- /dev/null
+++ b/tests/qemuxml2argvdata/audio-default-spice.xml
@@ -0,0 +1,35 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219100</memory>
+  <currentMemory unit='KiB'>219100</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='cdrom'/>
+  </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-i386</emulator>
+    <disk type='block' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source dev='/dev/cdrom'/>
+      <target dev='hdc' bus='ide'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
+    </disk>
+    <controller type='usb' index='0'/>
+    <controller type='ide' index='0'/>
+    <controller type='pci' index='0' model='pci-root'/>
+    <graphics type='spice'/>
+    <video>
+      <model type='cirrus'/>
+    </video>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/audio-default-vnc.args b/tests/qemuxml2argvdata/audio-default-vnc.args
new file mode 100644
index 0000000000..addff1c94b
--- /dev/null
+++ b/tests/qemuxml2argvdata/audio-default-vnc.args
@@ -0,0 +1,30 @@
+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=alsa \
+/usr/bin/qemu-system-i386 \
+-name QEMUGuest1 \
+-S \
+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
+-m 214 \
+-realtime mlock=off \
+-smp 1,sockets=1,cores=1,threads=1 \
+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+-no-user-config \
+-nodefaults \
+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
+server=on,wait=off \
+-mon chardev=charmonitor,id=monitor,mode=control \
+-rtc base=utc \
+-no-shutdown \
+-no-acpi \
+-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 \
+-vga cirrus
diff --git a/tests/qemuxml2argvdata/audio-default-vnc.xml b/tests/qemuxml2argvdata/audio-default-vnc.xml
new file mode 100644
index 0000000000..89f1d77554
--- /dev/null
+++ b/tests/qemuxml2argvdata/audio-default-vnc.xml
@@ -0,0 +1,35 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219100</memory>
+  <currentMemory unit='KiB'>219100</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='cdrom'/>
+  </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-i386</emulator>
+    <disk type='block' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source dev='/dev/cdrom'/>
+      <target dev='hdc' bus='ide'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
+    </disk>
+    <controller type='usb' index='0'/>
+    <controller type='ide' index='0'/>
+    <controller type='pci' index='0' model='pci-root'/>
+    <graphics type='vnc'/>
+    <video>
+      <model type='cirrus'/>
+    </video>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.xml b/tests/qemuxml2argvdata/blkdeviotune-group-num.xml
index 7b43bfea87..374ef6cc7f 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-group-num.xml
+++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.xml
@@ -57,6 +57,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.xml b/tests/qemuxml2argvdata/blkdeviotune-max-length.xml
index f891d15a81..fb6d28558e 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-max-length.xml
+++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.xml
@@ -61,6 +61,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.xml b/tests/qemuxml2argvdata/blkdeviotune-max.xml
index 912f22e6cb..7616dbd9b5 100644
--- a/tests/qemuxml2argvdata/blkdeviotune-max.xml
+++ b/tests/qemuxml2argvdata/blkdeviotune-max.xml
@@ -55,6 +55,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.xml b/tests/qemuxml2argvdata/boot-floppy-q35.xml
index af685d9c98..2cececf340 100644
--- a/tests/qemuxml2argvdata/boot-floppy-q35.xml
+++ b/tests/qemuxml2argvdata/boot-floppy-q35.xml
@@ -27,6 +27,7 @@
     <controller type='fdc' index='0'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.args
index 54015426c8..ae6f4b41e2 100644
--- a/tests/qemuxml2argvdata/clock-france.args
+++ b/tests/qemuxml2argvdata/clock-france.args
@@ -6,8 +6,8 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-QEMU_AUDIO_DRV=none \
 TZ=Europe/Paris \
+QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
diff --git a/tests/qemuxml2argvdata/clock-realtime.xml b/tests/qemuxml2argvdata/clock-realtime.xml
index 3ba6b4cb54..2fc6f3df9e 100644
--- a/tests/qemuxml2argvdata/clock-realtime.xml
+++ b/tests/qemuxml2argvdata/clock-realtime.xml
@@ -31,6 +31,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.xml b/tests/qemuxml2argvdata/clock-timer-armvtimer.xml
index 295ab64d75..56c5c933f7 100644
--- a/tests/qemuxml2argvdata/clock-timer-armvtimer.xml
+++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.xml
@@ -22,6 +22,7 @@
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <controller type='usb' index='0' model='none'/>
     <controller type='pci' index='0' model='pcie-root'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.xml b/tests/qemuxml2argvdata/disk-detect-zeroes.xml
index 851077545e..ca3732c391 100644
--- a/tests/qemuxml2argvdata/disk-detect-zeroes.xml
+++ b/tests/qemuxml2argvdata/disk-detect-zeroes.xml
@@ -41,6 +41,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/disk-nvme.xml b/tests/qemuxml2argvdata/disk-nvme.xml
index 4f4f8b917e..1ccbbfd598 100644
--- a/tests/qemuxml2argvdata/disk-nvme.xml
+++ b/tests/qemuxml2argvdata/disk-nvme.xml
@@ -58,6 +58,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.xml b/tests/qemuxml2argvdata/disk-virtio-queues.xml
index 641204e71f..c758d21894 100644
--- a/tests/qemuxml2argvdata/disk-virtio-queues.xml
+++ b/tests/qemuxml2argvdata/disk-virtio-queues.xml
@@ -29,6 +29,7 @@
     <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/qemuxml2argvdata/disk-virtio-scsi-reservations.xml b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
index 590cb2cae5..eec608db0d 100644
--- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.xml
@@ -42,6 +42,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/downscript.xml b/tests/qemuxml2argvdata/downscript.xml
index 4d0fb1beab..5bf74e3020 100644
--- a/tests/qemuxml2argvdata/downscript.xml
+++ b/tests/qemuxml2argvdata/downscript.xml
@@ -53,6 +53,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.xml b/tests/qemuxml2argvdata/encrypted-disk-usage.xml
index 9e9f757380..7c2da9ee83 100644
--- a/tests/qemuxml2argvdata/encrypted-disk-usage.xml
+++ b/tests/qemuxml2argvdata/encrypted-disk-usage.xml
@@ -29,6 +29,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
index 0749952750..cf90ae9f3f 100644
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
@@ -28,6 +28,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
index 05ea164abc..8bc0a68ed4 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
@@ -31,6 +31,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
index 904e64f0cc..d054963eb8 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
@@ -32,6 +32,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
index 9785609c16..139bdfd871 100644
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
@@ -33,6 +33,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args b/tests/qemuxml2argvdata/graphics-spice-sasl.args
index 024b775afd..229188856d 100644
--- a/tests/qemuxml2argvdata/graphics-spice-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args
@@ -6,8 +6,8 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
 QEMU_AUDIO_DRV=spice \
+SASL_CONF_PATH=/root/.sasl2 \
 /usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.args b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
index a915a857cb..1f16e05ae2 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
@@ -6,8 +6,8 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
 QEMU_AUDIO_DRV=none \
+SASL_CONF_PATH=/root/.sasl2 \
 /usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
index c16e3e3ef4..ab106d4a7d 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
@@ -6,8 +6,8 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
 QEMU_AUDIO_DRV=none \
+SASL_CONF_PATH=/root/.sasl2 \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args b/tests/qemuxml2argvdata/graphics-vnc-tls.args
index 896ff60e53..2427733426 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.args
@@ -6,8 +6,8 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
 QEMU_AUDIO_DRV=none \
+SASL_CONF_PATH=/root/.sasl2 \
 /usr/bin/qemu-system-i386 \
 -name QEMUGuest1 \
 -S \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
index 78a47f1d30..201248c567 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
@@ -6,8 +6,8 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
 QEMU_AUDIO_DRV=none \
+SASL_CONF_PATH=/root/.sasl2 \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
index 31112ce85d..0b30273d99 100644
--- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
@@ -6,8 +6,8 @@ LOGNAME=test \
 XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
 XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-SASL_CONF_PATH=/root/.sasl2 \
 QEMU_AUDIO_DRV=none \
+SASL_CONF_PATH=/root/.sasl2 \
 /usr/bin/qemu-system-i386 \
 -name guest=QEMUGuest1,debug-threads=on \
 -S \
diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.xml b/tests/qemuxml2argvdata/hugepages-default-2M.xml
index ce67853f26..fd3666c149 100644
--- a/tests/qemuxml2argvdata/hugepages-default-2M.xml
+++ b/tests/qemuxml2argvdata/hugepages-default-2M.xml
@@ -25,6 +25,7 @@
     <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/qemuxml2argvdata/hugepages-default-system-size.xml b/tests/qemuxml2argvdata/hugepages-default-system-size.xml
index 5beeffed9c..ac34623ed9 100644
--- a/tests/qemuxml2argvdata/hugepages-default-system-size.xml
+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.xml
@@ -25,6 +25,7 @@
     <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/qemuxml2argvdata/hugepages-memaccess.xml b/tests/qemuxml2argvdata/hugepages-memaccess.xml
index 68ef572616..e09a8af8af 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess.xml
+++ b/tests/qemuxml2argvdata/hugepages-memaccess.xml
@@ -49,6 +49,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.xml b/tests/qemuxml2argvdata/hugepages-memaccess2.xml
index c7652847fa..714f70b31d 100644
--- a/tests/qemuxml2argvdata/hugepages-memaccess2.xml
+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.xml
@@ -49,6 +49,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml
index 14a3368678..51768334d2 100644
--- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml
+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.xml
@@ -29,6 +29,7 @@
     <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'/>
     <memory model='dimm'>
       <source>
diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.xml b/tests/qemuxml2argvdata/hugepages-nvdimm.xml
index 144d02b56e..73cbd4f7c1 100644
--- a/tests/qemuxml2argvdata/hugepages-nvdimm.xml
+++ b/tests/qemuxml2argvdata/hugepages-nvdimm.xml
@@ -33,6 +33,7 @@
     <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'/>
     <memory model='nvdimm'>
       <source>
diff --git a/tests/qemuxml2argvdata/intel-iommu-aw-bits.xml b/tests/qemuxml2argvdata/intel-iommu-aw-bits.xml
index 23e3ef5816..b4eb81ff5d 100644
--- a/tests/qemuxml2argvdata/intel-iommu-aw-bits.xml
+++ b/tests/qemuxml2argvdata/intel-iommu-aw-bits.xml
@@ -27,6 +27,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <iommu model='intel'>
       <driver intremap='on' aw_bits='48'/>
diff --git a/tests/qemuxml2argvdata/intel-iommu-caching-mode.xml b/tests/qemuxml2argvdata/intel-iommu-caching-mode.xml
index ad2ce73aa6..4aa4bacf5b 100644
--- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.xml
+++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.xml
@@ -27,6 +27,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <iommu model='intel'>
       <driver intremap='on' caching_mode='on'/>
diff --git a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.xml b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.xml
index 1b5b3f04e9..e106737e6a 100644
--- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.xml
+++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.xml
@@ -27,6 +27,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <iommu model='intel'>
       <driver intremap='on' iotlb='on'/>
diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.xml b/tests/qemuxml2argvdata/intel-iommu-eim.xml
index 81b1769c48..c4942e4c79 100644
--- a/tests/qemuxml2argvdata/intel-iommu-eim.xml
+++ b/tests/qemuxml2argvdata/intel-iommu-eim.xml
@@ -27,6 +27,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <iommu model='intel'>
       <driver intremap='on' eim='on'/>
diff --git a/tests/qemuxml2argvdata/intel-iommu.xml b/tests/qemuxml2argvdata/intel-iommu.xml
index d8812ca81d..8badf6c970 100644
--- a/tests/qemuxml2argvdata/intel-iommu.xml
+++ b/tests/qemuxml2argvdata/intel-iommu.xml
@@ -24,6 +24,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <iommu model='intel'/>
   </devices>
diff --git a/tests/qemuxml2argvdata/luks-disks.xml b/tests/qemuxml2argvdata/luks-disks.xml
index c84af442a6..ae6d3d996c 100644
--- a/tests/qemuxml2argvdata/luks-disks.xml
+++ b/tests/qemuxml2argvdata/luks-disks.xml
@@ -38,6 +38,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml
index 69d27efbe1..6e2f83c8a9 100644
--- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml
+++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml
@@ -35,6 +35,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.xml b/tests/qemuxml2argvdata/memfd-memory-numa.xml
index e3d5d92393..3f448790a6 100644
--- a/tests/qemuxml2argvdata/memfd-memory-numa.xml
+++ b/tests/qemuxml2argvdata/memfd-memory-numa.xml
@@ -37,6 +37,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
index a1cc1264eb..565a47dac0 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
@@ -40,6 +40,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
index 018a693aaf..af55370d2f 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
@@ -40,6 +40,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
index c9d54a6088..0da48f3920 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
@@ -40,6 +40,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
index 391d70f20e..e72a59b2c0 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
@@ -40,6 +40,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
index 09b2c5c833..d9e91dc653 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
@@ -40,6 +40,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
index a32474da06..0ca70535ac 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
@@ -40,6 +40,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml
index a0806c4b54..0623fde6ee 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.xml
@@ -20,6 +20,7 @@
       <model name='spapr-pci-host-bridge'/>
       <target index='0'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
     <memory model='dimm'>
diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml
index 23729ed799..5c99c8ace1 100644
--- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml
@@ -37,6 +37,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/net-user-addr.xml b/tests/qemuxml2argvdata/net-user-addr.xml
index f20f820eaa..45e024d627 100644
--- a/tests/qemuxml2argvdata/net-user-addr.xml
+++ b/tests/qemuxml2argvdata/net-user-addr.xml
@@ -36,6 +36,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml
index a7edab63bd..ed1d4c8c05 100644
--- a/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml
+++ b/tests/qemuxml2argvdata/net-virtio-teaming-hostdev.xml
@@ -43,6 +43,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <source>
         <address domain='0x0000' bus='0x03' slot='0x07' function='0x1'/>
diff --git a/tests/qemuxml2argvdata/numatune-hmat.xml b/tests/qemuxml2argvdata/numatune-hmat.xml
index 83f0b56c9b..51ff3c3425 100644
--- a/tests/qemuxml2argvdata/numatune-hmat.xml
+++ b/tests/qemuxml2argvdata/numatune-hmat.xml
@@ -45,6 +45,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/numatune-no-vcpu.xml b/tests/qemuxml2argvdata/numatune-no-vcpu.xml
index f25a07d7ed..7d2627997c 100644
--- a/tests/qemuxml2argvdata/numatune-no-vcpu.xml
+++ b/tests/qemuxml2argvdata/numatune-no-vcpu.xml
@@ -35,6 +35,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.xml b/tests/qemuxml2argvdata/pages-dimm-discard.xml
index 3d233687e1..75aa21f0c7 100644
--- a/tests/qemuxml2argvdata/pages-dimm-discard.xml
+++ b/tests/qemuxml2argvdata/pages-dimm-discard.xml
@@ -26,6 +26,7 @@
     <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'/>
     <memory model='dimm' discard='no'>
       <source>
diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.xml b/tests/qemuxml2argvdata/pages-discard-hugepages.xml
index ae294c8f41..953d0c5d20 100644
--- a/tests/qemuxml2argvdata/pages-discard-hugepages.xml
+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.xml
@@ -29,6 +29,7 @@
     <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/qemuxml2argvdata/pages-discard.xml b/tests/qemuxml2argvdata/pages-discard.xml
index adb718887a..58a59a370c 100644
--- a/tests/qemuxml2argvdata/pages-discard.xml
+++ b/tests/qemuxml2argvdata/pages-discard.xml
@@ -31,6 +31,7 @@
     <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/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
index 7a834f83a2..9b0b8b3e73 100644
--- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.xml
@@ -48,6 +48,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/smbios-type-fwcfg.xml b/tests/qemuxml2argvdata/smbios-type-fwcfg.xml
index 72da0fe045..dcec9d2e0d 100644
--- a/tests/qemuxml2argvdata/smbios-type-fwcfg.xml
+++ b/tests/qemuxml2argvdata/smbios-type-fwcfg.xml
@@ -56,6 +56,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/user-aliases.xml b/tests/qemuxml2argvdata/user-aliases.xml
index 98b4845e52..47bfc56e73 100644
--- a/tests/qemuxml2argvdata/user-aliases.xml
+++ b/tests/qemuxml2argvdata/user-aliases.xml
@@ -146,6 +146,7 @@
     <sound model='ich6'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </sound>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.xml b/tests/qemuxml2argvdata/vcpu-placement-static.xml
index a777f50f86..ffdd6cc10a 100644
--- a/tests/qemuxml2argvdata/vcpu-placement-static.xml
+++ b/tests/qemuxml2argvdata/vcpu-placement-static.xml
@@ -28,6 +28,7 @@
     <controller type='pci' index='0' model='pcie-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/qemuxml2argvdata/vhost-user-fs-fd-memory.xml b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml
index f6bb663e97..2277850c2c 100644
--- a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml
+++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.xml
@@ -38,6 +38,7 @@
     </filesystem>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
index 3f130dd152..018611996d 100644
--- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
+++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.xml
@@ -71,6 +71,7 @@
     </filesystem>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml
index dbfe082a6f..cc299dcba9 100644
--- a/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-iommu.xml
@@ -24,6 +24,7 @@
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
     </disk>
     <controller type='pci' index='0' model='pci-root'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.xml b/tests/qemuxml2argvdata/vhost-vsock-ccw.xml
index 083061c6cc..1362523bed 100644
--- a/tests/qemuxml2argvdata/vhost-vsock-ccw.xml
+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.xml
@@ -20,6 +20,7 @@
       <target dev='hda' bus='virtio'/>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
     </disk>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
     </memballoon>
diff --git a/tests/qemuxml2argvdata/vhost-vsock.xml b/tests/qemuxml2argvdata/vhost-vsock.xml
index 10de1fa2f2..68eab38319 100644
--- a/tests/qemuxml2argvdata/vhost-vsock.xml
+++ b/tests/qemuxml2argvdata/vhost-vsock.xml
@@ -27,6 +27,7 @@
     <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'/>
     <vsock model='virtio'>
       <cid auto='no' address='4'/>
diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.xml b/tests/qemuxml2argvdata/video-qxl-resolution.xml
index e693cbce47..020c2a3fe8 100644
--- a/tests/qemuxml2argvdata/video-qxl-resolution.xml
+++ b/tests/qemuxml2argvdata/video-qxl-resolution.xml
@@ -29,6 +29,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='65536' vgamem='8192' heads='1' primary='yes'>
         <resolution x='1280' y='720'/>
diff --git a/tests/qemuxml2argvdata/virtio-options.xml b/tests/qemuxml2argvdata/virtio-options.xml
index ba1bf7c036..9c9b80d5c4 100644
--- a/tests/qemuxml2argvdata/virtio-options.xml
+++ b/tests/qemuxml2argvdata/virtio-options.xml
@@ -75,6 +75,7 @@
     </input>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <driver iommu='on' ats='on' packed='on' name='vhostuser'/>
       <model type='virtio' heads='1' primary='yes'>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index c90bd341a9..c27880ae7f 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1061,6 +1061,27 @@ mymain(void)
     /* Multiple backends not supported with ENV */
     DO_TEST_PARSE_ERROR("audio-many-backends", NONE);
 
+    /* Validate auto-creation of <audio> for legacy compat */
+    g_setenv("QEMU_AUDIO_DRV", "sdl", TRUE);
+    g_setenv("SDL_AUDIODRIVER", "esd", TRUE);
+    DO_TEST("audio-default-sdl", QEMU_CAPS_DEVICE_CIRRUS_VGA);
+    g_unsetenv("QEMU_AUDIO_DRV");
+    g_unsetenv("SDL_AUDIODRIVER");
+
+    g_setenv("QEMU_AUDIO_DRV", "alsa", TRUE);
+    driver.config->vncAllowHostAudio = true;
+    DO_TEST("audio-default-vnc",  QEMU_CAPS_VNC, QEMU_CAPS_DEVICE_CIRRUS_VGA);
+    driver.config->vncAllowHostAudio = false;
+    g_unsetenv("QEMU_AUDIO_DRV");
+
+    DO_TEST("audio-default-spice",  QEMU_CAPS_SPICE, QEMU_CAPS_DEVICE_CIRRUS_VGA);
+
+    g_setenv("QEMU_AUDIO_DRV", "alsa", TRUE);
+    driver.config->nogfxAllowHostAudio = true;
+    DO_TEST("audio-default-nographics", NONE);
+    driver.config->nogfxAllowHostAudio = false;
+    g_unsetenv("QEMU_AUDIO_DRV");
+
     DO_TEST("reboot-timeout-disabled", QEMU_CAPS_REBOOT_TIMEOUT);
     DO_TEST("reboot-timeout-enabled", QEMU_CAPS_REBOOT_TIMEOUT);
     DO_TEST_PARSE_ERROR("reboot-timeout-enabled", NONE);
diff --git a/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml b/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml
index c30690e7bc..f3eab7b59e 100644
--- a/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-aavmf-virtio-mmio.xml
@@ -43,6 +43,7 @@
     <console type='pty'>
       <target type='virtio' port='0'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='virtio-mmio'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.xml
index efbe726758..6738c5cd61 100644
--- a/tests/qemuxml2xmloutdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-default-cpu-kvm-virt-4.2.aarch64-latest.xml
@@ -34,5 +34,6 @@
       <target chassis='2' port='0x9'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
+    <audio id='1' type='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml
index c0aa2f39ee..1b4edaff5f 100644
--- a/tests/qemuxml2xmloutdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-default-cpu-tcg-virt-4.2.aarch64-latest.xml
@@ -37,5 +37,6 @@
       <target chassis='2' port='0x9'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
     </controller>
+    <audio id='1' type='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-features-sve.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-features-sve.aarch64-latest.xml
index 914cc7957a..9482828a0c 100644
--- a/tests/qemuxml2xmloutdata/aarch64-features-sve.aarch64-latest.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-features-sve.aarch64-latest.xml
@@ -26,6 +26,7 @@
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <controller type='usb' index='0' model='none'/>
     <controller type='pci' index='0' model='pcie-root'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml b/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml
index b978439707..c71b1cde62 100644
--- a/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-gic-none-tcg.xml
@@ -21,6 +21,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <controller type='usb' index='0' model='none'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml
index 1e51d55305..627e285ae1 100644
--- a/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-os-firmware-efi.aarch64-latest.xml
@@ -28,5 +28,6 @@
   <devices>
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <controller type='pci' index='0' model='pcie-root'/>
+    <audio id='1' type='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-pci-serial.xml b/tests/qemuxml2xmloutdata/aarch64-pci-serial.xml
index b02a5a7db6..5d69c1cffa 100644
--- a/tests/qemuxml2xmloutdata/aarch64-pci-serial.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-pci-serial.xml
@@ -39,5 +39,6 @@
       </target>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
     </serial>
+    <audio id='1' type='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-traditional-pci.xml b/tests/qemuxml2xmloutdata/aarch64-traditional-pci.xml
index e0807308d9..7b2eea7ac7 100644
--- a/tests/qemuxml2xmloutdata/aarch64-traditional-pci.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-traditional-pci.xml
@@ -38,6 +38,7 @@
       </target>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
     </serial>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/aarch64-video-default.xml b/tests/qemuxml2xmloutdata/aarch64-video-default.xml
index 47b46d0d06..13ac217b60 100644
--- a/tests/qemuxml2xmloutdata/aarch64-video-default.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-video-default.xml
@@ -38,6 +38,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='virtio' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/aarch64-video-virtio-gpu-pci.xml b/tests/qemuxml2xmloutdata/aarch64-video-virtio-gpu-pci.xml
index c5240a0c48..a3e3375f07 100644
--- a/tests/qemuxml2xmloutdata/aarch64-video-virtio-gpu-pci.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-video-virtio-gpu-pci.xml
@@ -36,6 +36,7 @@
       <boot order='1'/>
       <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
     </interface>
+    <audio id='1' type='none'/>
     <video>
       <model type='virtio' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml
index 3a343941bc..a3571c62d7 100644
--- a/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-virt-graphics.aarch64-latest.xml
@@ -103,6 +103,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='virtio' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x07' slot='0x00' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml b/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml
index dad8e605e5..4f1e9cc18b 100644
--- a/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-virt-headless.aarch64-latest.xml
@@ -93,6 +93,7 @@
       <target type='virtio' name='org.qemu.guest_agent.0'/>
       <address type='virtio-serial' controller='0' bus='0' port='1'/>
     </channel>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml
index c569a2886d..e49ecc4e15 100644
--- a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-default.xml
@@ -82,6 +82,7 @@
     <console type='pty'>
       <target type='virtio' port='1'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x04' slot='0x00' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml
index b28e644844..7c90f21f39 100644
--- a/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml
+++ b/tests/qemuxml2xmloutdata/aarch64-virtio-pci-manual-addresses.xml
@@ -60,5 +60,6 @@
       <model type='virtio'/>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
     </interface>
+    <audio id='1' type='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/acpi-table.xml b/tests/qemuxml2xmloutdata/acpi-table.xml
index 0933d8c664..5a6c859bad 100644
--- a/tests/qemuxml2xmloutdata/acpi-table.xml
+++ b/tests/qemuxml2xmloutdata/acpi-table.xml
@@ -29,6 +29,7 @@
     <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/qemuxml2xmloutdata/audio-default-nographics.x86_64-latest.xml b/tests/qemuxml2xmloutdata/audio-default-nographics.x86_64-latest.xml
new file mode 100644
index 0000000000..d9cadb1e45
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-default-nographics.x86_64-latest.xml
@@ -0,0 +1,39 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219100</memory>
+  <currentMemory unit='KiB'>219100</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='cdrom'/>
+  </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <disk type='block' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source dev='/dev/cdrom'/>
+      <target dev='hdc' bus='ide'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
+    </disk>
+    <controller type='usb' index='0' model='piix3-uhci'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='ide' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='alsa'/>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-default-nographics.xml b/tests/qemuxml2xmloutdata/audio-default-nographics.xml
new file mode 120000
index 0000000000..9103458c39
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-default-nographics.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/audio-default-nographics.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-default-sdl.x86_64-latest.xml b/tests/qemuxml2xmloutdata/audio-default-sdl.x86_64-latest.xml
new file mode 100644
index 0000000000..f02f1fff0c
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-default-sdl.x86_64-latest.xml
@@ -0,0 +1,44 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219100</memory>
+  <currentMemory unit='KiB'>219100</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='cdrom'/>
+  </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <disk type='block' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source dev='/dev/cdrom'/>
+      <target dev='hdc' bus='ide'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
+    </disk>
+    <controller type='usb' index='0' model='piix3-uhci'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='ide' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <graphics type='sdl'/>
+    <audio id='1' type='sdl' driver='esd'/>
+    <video>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </video>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-default-sdl.xml b/tests/qemuxml2xmloutdata/audio-default-sdl.xml
new file mode 120000
index 0000000000..b0e06aa348
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-default-sdl.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/audio-default-sdl.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-default-spice.x86_64-latest.xml b/tests/qemuxml2xmloutdata/audio-default-spice.x86_64-latest.xml
new file mode 100644
index 0000000000..0ea615e4b1
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-default-spice.x86_64-latest.xml
@@ -0,0 +1,46 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219100</memory>
+  <currentMemory unit='KiB'>219100</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='cdrom'/>
+  </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <disk type='block' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source dev='/dev/cdrom'/>
+      <target dev='hdc' bus='ide'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
+    </disk>
+    <controller type='usb' index='0' model='piix3-uhci'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='ide' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <graphics type='spice'>
+      <listen type='none'/>
+    </graphics>
+    <audio id='1' type='spice'/>
+    <video>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </video>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-default-spice.xml b/tests/qemuxml2xmloutdata/audio-default-spice.xml
new file mode 120000
index 0000000000..93945463ef
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-default-spice.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/audio-default-spice.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/audio-default-vnc.x86_64-latest.xml b/tests/qemuxml2xmloutdata/audio-default-vnc.x86_64-latest.xml
new file mode 100644
index 0000000000..c898f4004f
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-default-vnc.x86_64-latest.xml
@@ -0,0 +1,46 @@
+<domain type='qemu'>
+  <name>QEMUGuest1</name>
+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
+  <memory unit='KiB'>219100</memory>
+  <currentMemory unit='KiB'>219100</currentMemory>
+  <vcpu placement='static'>1</vcpu>
+  <os>
+    <type arch='i686' machine='pc'>hvm</type>
+    <boot dev='cdrom'/>
+  </os>
+  <cpu mode='custom' match='exact' check='none'>
+    <model fallback='forbid'>qemu64</model>
+  </cpu>
+  <clock offset='utc'/>
+  <on_poweroff>destroy</on_poweroff>
+  <on_reboot>restart</on_reboot>
+  <on_crash>destroy</on_crash>
+  <devices>
+    <emulator>/usr/bin/qemu-system-i386</emulator>
+    <disk type='block' device='cdrom'>
+      <driver name='qemu' type='raw'/>
+      <source dev='/dev/cdrom'/>
+      <target dev='hdc' bus='ide'/>
+      <readonly/>
+      <address type='drive' controller='0' bus='1' target='0' unit='0'/>
+    </disk>
+    <controller type='usb' index='0' model='piix3-uhci'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
+    </controller>
+    <controller type='ide' index='0'>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
+    </controller>
+    <controller type='pci' index='0' model='pci-root'/>
+    <input type='mouse' bus='ps2'/>
+    <input type='keyboard' bus='ps2'/>
+    <graphics type='vnc' port='-1' autoport='yes'>
+      <listen type='address'/>
+    </graphics>
+    <audio id='1' type='alsa'/>
+    <video>
+      <model type='cirrus' vram='16384' heads='1' primary='yes'/>
+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
+    </video>
+    <memballoon model='none'/>
+  </devices>
+</domain>
diff --git a/tests/qemuxml2xmloutdata/audio-default-vnc.xml b/tests/qemuxml2xmloutdata/audio-default-vnc.xml
new file mode 120000
index 0000000000..3fdbfb6df4
--- /dev/null
+++ b/tests/qemuxml2xmloutdata/audio-default-vnc.xml
@@ -0,0 +1 @@
+../qemuxml2argvdata/audio-default-vnc.xml
\ No newline at end of file
diff --git a/tests/qemuxml2xmloutdata/autoindex.xml b/tests/qemuxml2xmloutdata/autoindex.xml
index 382dc73f1c..3e1c2889cb 100644
--- a/tests/qemuxml2xmloutdata/autoindex.xml
+++ b/tests/qemuxml2xmloutdata/autoindex.xml
@@ -149,6 +149,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/balloon-device-auto.xml b/tests/qemuxml2xmloutdata/balloon-device-auto.xml
index 974f94ed20..094ecb38db 100644
--- a/tests/qemuxml2xmloutdata/balloon-device-auto.xml
+++ b/tests/qemuxml2xmloutdata/balloon-device-auto.xml
@@ -29,6 +29,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/balloon-device-period.xml b/tests/qemuxml2xmloutdata/balloon-device-period.xml
index bebb93071f..a6c6d6db67 100644
--- a/tests/qemuxml2xmloutdata/balloon-device-period.xml
+++ b/tests/qemuxml2xmloutdata/balloon-device-period.xml
@@ -29,6 +29,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <stats period='10'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x12' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml b/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
index dfa496a215..e5ee451722 100644
--- a/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
+++ b/tests/qemuxml2xmloutdata/bios-nvram-os-interleave.xml
@@ -44,6 +44,7 @@
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/bios-nvram.xml b/tests/qemuxml2xmloutdata/bios-nvram.xml
index eabbf717f9..294e65cd13 100644
--- a/tests/qemuxml2xmloutdata/bios-nvram.xml
+++ b/tests/qemuxml2xmloutdata/bios-nvram.xml
@@ -36,6 +36,7 @@
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/blkdeviotune.x86_64-latest.xml b/tests/qemuxml2xmloutdata/blkdeviotune.x86_64-latest.xml
index e27f61f2fd..a1032019d6 100644
--- a/tests/qemuxml2xmloutdata/blkdeviotune.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/blkdeviotune.x86_64-latest.xml
@@ -47,6 +47,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/blkiotune-device.xml b/tests/qemuxml2xmloutdata/blkiotune-device.xml
index c1fa4579c5..46b534d2c7 100644
--- a/tests/qemuxml2xmloutdata/blkiotune-device.xml
+++ b/tests/qemuxml2xmloutdata/blkiotune-device.xml
@@ -48,6 +48,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/blkiotune.xml b/tests/qemuxml2xmloutdata/blkiotune.xml
index 8a80c8c15f..2f4d3f29d3 100644
--- a/tests/qemuxml2xmloutdata/blkiotune.xml
+++ b/tests/qemuxml2xmloutdata/blkiotune.xml
@@ -32,6 +32,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/boot-cdrom.xml b/tests/qemuxml2xmloutdata/boot-cdrom.xml
index 5778f5da41..4729edaa63 100644
--- a/tests/qemuxml2xmloutdata/boot-cdrom.xml
+++ b/tests/qemuxml2xmloutdata/boot-cdrom.xml
@@ -30,6 +30,7 @@
     <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/qemuxml2xmloutdata/boot-floppy.xml b/tests/qemuxml2xmloutdata/boot-floppy.xml
index 5af9ebb4b8..0bf53f50f1 100644
--- a/tests/qemuxml2xmloutdata/boot-floppy.xml
+++ b/tests/qemuxml2xmloutdata/boot-floppy.xml
@@ -36,6 +36,7 @@
     <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/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
index fc9b2df8ce..631df4bbb4 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable-with-timeout.xml
@@ -31,6 +31,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-disable.xml b/tests/qemuxml2xmloutdata/boot-menu-disable.xml
index fc9b2df8ce..631df4bbb4 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-disable.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-disable.xml
@@ -31,6 +31,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
index 654b8fec27..b6775d3a47 100644
--- a/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
+++ b/tests/qemuxml2xmloutdata/boot-menu-enable-with-timeout.xml
@@ -31,6 +31,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/boot-multi.xml b/tests/qemuxml2xmloutdata/boot-multi.xml
index 34f810c928..ebcbcb7e62 100644
--- a/tests/qemuxml2xmloutdata/boot-multi.xml
+++ b/tests/qemuxml2xmloutdata/boot-multi.xml
@@ -34,6 +34,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/boot-network.xml b/tests/qemuxml2xmloutdata/boot-network.xml
index 4ac5309ce1..7df0512077 100644
--- a/tests/qemuxml2xmloutdata/boot-network.xml
+++ b/tests/qemuxml2xmloutdata/boot-network.xml
@@ -29,6 +29,7 @@
     <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/qemuxml2xmloutdata/boot-order.xml b/tests/qemuxml2xmloutdata/boot-order.xml
index fee34a4cea..bdd7e1b16f 100644
--- a/tests/qemuxml2xmloutdata/boot-order.xml
+++ b/tests/qemuxml2xmloutdata/boot-order.xml
@@ -59,6 +59,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/channel-guestfwd.xml b/tests/qemuxml2xmloutdata/channel-guestfwd.xml
index 6a5a63eacf..baf99c58cc 100644
--- a/tests/qemuxml2xmloutdata/channel-guestfwd.xml
+++ b/tests/qemuxml2xmloutdata/channel-guestfwd.xml
@@ -33,6 +33,7 @@
     </channel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml b/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml
index 4c2a02b49a..2917ed292a 100644
--- a/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml
+++ b/tests/qemuxml2xmloutdata/channel-unix-source-path-active.xml
@@ -43,6 +43,7 @@
     </channel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml b/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml
index 2d8fa1e3ac..c5d219183e 100644
--- a/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml
+++ b/tests/qemuxml2xmloutdata/channel-unix-source-path-inactive.xml
@@ -40,6 +40,7 @@
     </channel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
index 38eccce8d3..94b0eaf34e 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-auto.xml
@@ -62,6 +62,7 @@
     </channel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
index 9a28e4f012..351a99b4c8 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-state-active.xml
@@ -44,6 +44,7 @@
     </channel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
index 24925cc89a..18b799f066 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio-state-inactive.xml
@@ -44,6 +44,7 @@
     </channel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/channel-virtio.xml b/tests/qemuxml2xmloutdata/channel-virtio.xml
index 3125261484..22e5f01db6 100644
--- a/tests/qemuxml2xmloutdata/channel-virtio.xml
+++ b/tests/qemuxml2xmloutdata/channel-virtio.xml
@@ -36,6 +36,7 @@
     </channel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/chardev-label.xml b/tests/qemuxml2xmloutdata/chardev-label.xml
index 7d5bbdd0ab..e90f7c2b25 100644
--- a/tests/qemuxml2xmloutdata/chardev-label.xml
+++ b/tests/qemuxml2xmloutdata/chardev-label.xml
@@ -45,6 +45,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/clock-catchup.xml b/tests/qemuxml2xmloutdata/clock-catchup.xml
index 0468b9129b..2b7633db12 100644
--- a/tests/qemuxml2xmloutdata/clock-catchup.xml
+++ b/tests/qemuxml2xmloutdata/clock-catchup.xml
@@ -39,6 +39,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/clock-localtime.xml b/tests/qemuxml2xmloutdata/clock-localtime.xml
index 7a01365de8..1360343b3e 100644
--- a/tests/qemuxml2xmloutdata/clock-localtime.xml
+++ b/tests/qemuxml2xmloutdata/clock-localtime.xml
@@ -29,6 +29,7 @@
     <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/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
index e166eb4417..fc2a5efdcb 100644
--- a/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
+++ b/tests/qemuxml2xmloutdata/clock-timer-hyperv-rtc.xml
@@ -25,6 +25,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/clock-utc.xml b/tests/qemuxml2xmloutdata/clock-utc.xml
index f8051b7607..95f886d23b 100644
--- a/tests/qemuxml2xmloutdata/clock-utc.xml
+++ b/tests/qemuxml2xmloutdata/clock-utc.xml
@@ -29,6 +29,7 @@
     <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/qemuxml2xmloutdata/console-compat-auto.xml b/tests/qemuxml2xmloutdata/console-compat-auto.xml
index ea9c6449fe..eebef5aa15 100644
--- a/tests/qemuxml2xmloutdata/console-compat-auto.xml
+++ b/tests/qemuxml2xmloutdata/console-compat-auto.xml
@@ -37,6 +37,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/console-compat.xml b/tests/qemuxml2xmloutdata/console-compat.xml
index 06c4b0f6bc..ee731bf1da 100644
--- a/tests/qemuxml2xmloutdata/console-compat.xml
+++ b/tests/qemuxml2xmloutdata/console-compat.xml
@@ -37,6 +37,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/console-compat2.xml b/tests/qemuxml2xmloutdata/console-compat2.xml
index e97f9cef31..b8f710abf6 100644
--- a/tests/qemuxml2xmloutdata/console-compat2.xml
+++ b/tests/qemuxml2xmloutdata/console-compat2.xml
@@ -43,6 +43,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/console-virtio-many.xml b/tests/qemuxml2xmloutdata/console-virtio-many.xml
index 0bb429c2de..a2d72269b2 100644
--- a/tests/qemuxml2xmloutdata/console-virtio-many.xml
+++ b/tests/qemuxml2xmloutdata/console-virtio-many.xml
@@ -49,6 +49,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/console-virtio.xml b/tests/qemuxml2xmloutdata/console-virtio.xml
index 23983f67ed..d540b81a4e 100644
--- a/tests/qemuxml2xmloutdata/console-virtio.xml
+++ b/tests/qemuxml2xmloutdata/console-virtio.xml
@@ -35,6 +35,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/controller-usb-order.xml b/tests/qemuxml2xmloutdata/controller-usb-order.xml
index 31b79eab35..cb4d8a1e6e 100644
--- a/tests/qemuxml2xmloutdata/controller-usb-order.xml
+++ b/tests/qemuxml2xmloutdata/controller-usb-order.xml
@@ -31,6 +31,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
index 6a9f0963ca..207bc87cf5 100644
--- a/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
+++ b/tests/qemuxml2xmloutdata/controller-virtio-scsi.xml
@@ -69,6 +69,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml b/tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml
index 3cb295e713..0a2d113339 100644
--- a/tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml
+++ b/tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-3.1.0.xml
@@ -24,6 +24,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-latest.xml
index 77e5d66f88..f94c0b6d65 100644
--- a/tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/cpu-Icelake-Server-pconfig.x86_64-latest.xml
@@ -24,6 +24,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-none.xml b/tests/qemuxml2xmloutdata/cpu-check-default-none.xml
index 9f6b043f2c..473fb7e6f1 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-none.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-none.xml
@@ -21,6 +21,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml b/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
index 483d219134..e87bf64416 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-none2.xml
@@ -23,6 +23,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml b/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
index b64a1f0ef7..2856fd4f43 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-partial.xml
@@ -21,6 +21,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml b/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
index 381e951a17..1423620aa8 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-default-partial2.xml
@@ -23,6 +23,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-full.xml b/tests/qemuxml2xmloutdata/cpu-check-full.xml
index 9d180d745f..a978f70135 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-full.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-full.xml
@@ -23,6 +23,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-none.xml b/tests/qemuxml2xmloutdata/cpu-check-none.xml
index 67994f67ba..c4ea77cdf9 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-none.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-none.xml
@@ -23,6 +23,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-check-partial.xml b/tests/qemuxml2xmloutdata/cpu-check-partial.xml
index 381e951a17..1423620aa8 100644
--- a/tests/qemuxml2xmloutdata/cpu-check-partial.xml
+++ b/tests/qemuxml2xmloutdata/cpu-check-partial.xml
@@ -23,6 +23,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-empty.xml b/tests/qemuxml2xmloutdata/cpu-empty.xml
index c398a3b9c0..394588b8f5 100644
--- a/tests/qemuxml2xmloutdata/cpu-empty.xml
+++ b/tests/qemuxml2xmloutdata/cpu-empty.xml
@@ -20,6 +20,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
index f528efa8db..176c7c3cbf 100644
--- a/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-disabled.xml
@@ -28,6 +28,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
index 0353b72c02..84cd2106eb 100644
--- a/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
+++ b/tests/qemuxml2xmloutdata/cpu-eoi-enabled.xml
@@ -28,6 +28,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml b/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
index 9414c41c7a..40148c3686 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-kvmclock.xml
@@ -23,6 +23,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-features.xml b/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
index 635811ecbd..be51410d53 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-features.xml
@@ -33,6 +33,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml b/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
index 2a7d0246cc..670c171ebc 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-model-vendor.xml
@@ -23,6 +23,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
index bd1e50ef6a..cc217f41a1 100644
--- a/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
+++ b/tests/qemuxml2xmloutdata/cpu-host-passthrough-features.xml
@@ -39,6 +39,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-kvmclock.xml b/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
index 3f89c8fec7..090fff2d10 100644
--- a/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/cpu-kvmclock.xml
@@ -25,6 +25,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
index d7f5372fbc..8219c16939 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
@@ -27,6 +27,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml b/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
index 487ced1008..dd15201aad 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
@@ -28,6 +28,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml b/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
index f472bffec3..0c53679827 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
@@ -27,6 +27,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
index 2ef7f84646..99269812d9 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
@@ -27,6 +27,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa1.xml b/tests/qemuxml2xmloutdata/cpu-numa1.xml
index 2ef7f84646..99269812d9 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa1.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa1.xml
@@ -27,6 +27,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cpu-numa2.xml b/tests/qemuxml2xmloutdata/cpu-numa2.xml
index 2ef7f84646..99269812d9 100644
--- a/tests/qemuxml2xmloutdata/cpu-numa2.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa2.xml
@@ -27,6 +27,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cputune-cpuset-big-id.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cputune-cpuset-big-id.x86_64-latest.xml
index 8405829bb6..8ef58393fe 100644
--- a/tests/qemuxml2xmloutdata/cputune-cpuset-big-id.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/cputune-cpuset-big-id.x86_64-latest.xml
@@ -36,6 +36,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cputune-iothreads.xml b/tests/qemuxml2xmloutdata/cputune-iothreads.xml
index 57649745f0..cc7b7a112f 100644
--- a/tests/qemuxml2xmloutdata/cputune-iothreads.xml
+++ b/tests/qemuxml2xmloutdata/cputune-iothreads.xml
@@ -40,6 +40,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
index 694723d261..e4491a9eee 100644
--- a/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
+++ b/tests/qemuxml2xmloutdata/cputune-iothreadsched-zeropriority.xml
@@ -43,6 +43,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml b/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
index 6103531ed1..da5f10ff64 100644
--- a/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
+++ b/tests/qemuxml2xmloutdata/cputune-iothreadsched.xml
@@ -43,6 +43,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cputune-numatune.xml b/tests/qemuxml2xmloutdata/cputune-numatune.xml
index ff987e7d59..7a2a9d643f 100644
--- a/tests/qemuxml2xmloutdata/cputune-numatune.xml
+++ b/tests/qemuxml2xmloutdata/cputune-numatune.xml
@@ -28,6 +28,7 @@
     <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/qemuxml2xmloutdata/cputune-zero-shares.xml b/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
index 8837b69eb3..ce53f17cc9 100644
--- a/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
+++ b/tests/qemuxml2xmloutdata/cputune-zero-shares.xml
@@ -37,6 +37,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/cputune.xml b/tests/qemuxml2xmloutdata/cputune.xml
index ee789cdc85..2f4ef68679 100644
--- a/tests/qemuxml2xmloutdata/cputune.xml
+++ b/tests/qemuxml2xmloutdata/cputune.xml
@@ -41,6 +41,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml b/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
index a1af050430..756d3967cd 100644
--- a/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
+++ b/tests/qemuxml2xmloutdata/default-kvm-host-arch.xml
@@ -20,6 +20,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml b/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
index 5f433fc047..f392bc40ae 100644
--- a/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
+++ b/tests/qemuxml2xmloutdata/default-qemu-host-arch.xml
@@ -20,6 +20,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/default-video-type-aarch64.aarch64-latest.xml b/tests/qemuxml2xmloutdata/default-video-type-aarch64.aarch64-latest.xml
index a47435163f..e8fb758a71 100644
--- a/tests/qemuxml2xmloutdata/default-video-type-aarch64.aarch64-latest.xml
+++ b/tests/qemuxml2xmloutdata/default-video-type-aarch64.aarch64-latest.xml
@@ -32,6 +32,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='virtio' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/default-video-type-ppc64.ppc64-latest.xml b/tests/qemuxml2xmloutdata/default-video-type-ppc64.ppc64-latest.xml
index 52bf8a1590..4646c1366d 100644
--- a/tests/qemuxml2xmloutdata/default-video-type-ppc64.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/default-video-type-ppc64.ppc64-latest.xml
@@ -27,6 +27,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='vga' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/default-video-type-riscv64.riscv64-latest.xml b/tests/qemuxml2xmloutdata/default-video-type-riscv64.riscv64-latest.xml
index 56d4b34ab7..61d6e19972 100644
--- a/tests/qemuxml2xmloutdata/default-video-type-riscv64.riscv64-latest.xml
+++ b/tests/qemuxml2xmloutdata/default-video-type-riscv64.riscv64-latest.xml
@@ -29,6 +29,7 @@
     <graphics type='spice'>
       <listen type='none'/>
     </graphics>
+    <audio id='1' type='spice'/>
     <video>
       <model type='virtio' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/default-video-type-s390x.s390x-latest.xml b/tests/qemuxml2xmloutdata/default-video-type-s390x.s390x-latest.xml
index bbc3b0586f..c8aac8f1bf 100644
--- a/tests/qemuxml2xmloutdata/default-video-type-s390x.s390x-latest.xml
+++ b/tests/qemuxml2xmloutdata/default-video-type-s390x.s390x-latest.xml
@@ -20,6 +20,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='virtio' heads='1' primary='yes'/>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
diff --git a/tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-0.xml b/tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-0.xml
index 47b2c7cbc9..596364f7a2 100644
--- a/tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-0.xml
+++ b/tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-0.xml
@@ -21,6 +21,7 @@
     <graphics type='spice'>
       <listen type='none'/>
     </graphics>
+    <audio id='1' type='spice'/>
     <video>
       <model type='vga' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-1.xml b/tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-1.xml
index 340cfef56f..a86f785b44 100644
--- a/tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-1.xml
+++ b/tests/qemuxml2xmloutdata/default-video-type-x86_64-caps-test-1.xml
@@ -21,6 +21,7 @@
     <graphics type='spice'>
       <listen type='none'/>
     </graphics>
+    <audio id='1' type='spice'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml b/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
index 739941b470..010ab9fce0 100644
--- a/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-active-commit-active.xml
@@ -38,6 +38,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
index 5488e15b84..5479e8edfc 100644
--- a/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-active-commit-inactive.xml
@@ -34,6 +34,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-aio-io_uring.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-aio-io_uring.x86_64-latest.xml
index 5b691e1c35..0e0ef77eae 100644
--- a/tests/qemuxml2xmloutdata/disk-aio-io_uring.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-aio-io_uring.x86_64-latest.xml
@@ -32,6 +32,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-aio.xml b/tests/qemuxml2xmloutdata/disk-aio.xml
index 01c1468b09..8d6f8b5263 100644
--- a/tests/qemuxml2xmloutdata/disk-aio.xml
+++ b/tests/qemuxml2xmloutdata/disk-aio.xml
@@ -36,6 +36,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml b/tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml
index 024db53ffb..7b07c8d3d7 100644
--- a/tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-arm-virtio-sd.aarch64-latest.xml
@@ -37,5 +37,6 @@
       <target dev='vda' bus='virtio'/>
       <address type='virtio-mmio'/>
     </disk>
+    <audio id='1' type='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
index 866bd9ca7e..ba23787ad0 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-active.xml
@@ -102,6 +102,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
index 0d5ca917d3..e4a8209bf3 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-inactive.xml
@@ -102,6 +102,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
index 2569185ddf..e5d0d73999 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-index-active.xml
@@ -149,6 +149,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
index a1c0fb4620..cc02b15991 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-index-inactive.xml
@@ -149,6 +149,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml b/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
index a1c0fb4620..cc02b15991 100644
--- a/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
+++ b/tests/qemuxml2xmloutdata/disk-backing-chains-noindex.xml
@@ -149,6 +149,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-boot-cdrom.xml b/tests/qemuxml2xmloutdata/disk-boot-cdrom.xml
index 3c6b557e1f..fabd953ca3 100644
--- a/tests/qemuxml2xmloutdata/disk-boot-cdrom.xml
+++ b/tests/qemuxml2xmloutdata/disk-boot-cdrom.xml
@@ -36,6 +36,7 @@
     <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/qemuxml2xmloutdata/disk-boot-disk.xml b/tests/qemuxml2xmloutdata/disk-boot-disk.xml
index 86f3c878a8..62e19edb3d 100644
--- a/tests/qemuxml2xmloutdata/disk-boot-disk.xml
+++ b/tests/qemuxml2xmloutdata/disk-boot-disk.xml
@@ -36,6 +36,7 @@
     <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/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml b/tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml
index 749b931e42..a57c2cd5d0 100644
--- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml
+++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-1.5.3.xml
@@ -55,6 +55,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml
index dc45c829d1..7c835918af 100644
--- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml
+++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.12.0.xml
@@ -55,6 +55,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
index ab86e3d787..e499c7b5a9 100644
--- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
+++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.6.0.xml
@@ -55,6 +55,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
index 6e76fa6251..3bf5792c60 100644
--- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
+++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-2.7.0.xml
@@ -55,6 +55,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml
index 8ede745da4..708bc0bb88 100644
--- a/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-cache.x86_64-latest.xml
@@ -58,6 +58,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml b/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml
index ec86d19f1d..76621e1c1c 100644
--- a/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml
+++ b/tests/qemuxml2xmloutdata/disk-cdrom-bus-other.xml
@@ -35,6 +35,7 @@
     <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/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
index 34267e4d1d..1c8daede3c 100644
--- a/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-cdrom-empty-network-invalid.x86_64-latest.xml
@@ -32,6 +32,7 @@
     <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/qemuxml2xmloutdata/disk-cdrom.xml b/tests/qemuxml2xmloutdata/disk-cdrom.xml
index 3a8c34761d..c3ae560809 100644
--- a/tests/qemuxml2xmloutdata/disk-cdrom.xml
+++ b/tests/qemuxml2xmloutdata/disk-cdrom.xml
@@ -49,6 +49,7 @@
     <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/qemuxml2xmloutdata/disk-copy_on_read.xml b/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
index 5d19f3251d..074d41b72e 100644
--- a/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
+++ b/tests/qemuxml2xmloutdata/disk-copy_on_read.xml
@@ -47,6 +47,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-discard.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-discard.x86_64-latest.xml
index e55c5bf6d3..047b11f8fd 100644
--- a/tests/qemuxml2xmloutdata/disk-discard.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-discard.x86_64-latest.xml
@@ -41,6 +41,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-error-policy.xml b/tests/qemuxml2xmloutdata/disk-error-policy.xml
index 2a091eb2db..03a093fe40 100644
--- a/tests/qemuxml2xmloutdata/disk-error-policy.xml
+++ b/tests/qemuxml2xmloutdata/disk-error-policy.xml
@@ -41,6 +41,7 @@
     <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/qemuxml2xmloutdata/disk-floppy.xml b/tests/qemuxml2xmloutdata/disk-floppy.xml
index 2c2402a671..2242b38272 100644
--- a/tests/qemuxml2xmloutdata/disk-floppy.xml
+++ b/tests/qemuxml2xmloutdata/disk-floppy.xml
@@ -42,6 +42,7 @@
     <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/qemuxml2xmloutdata/disk-fmt-qcow.xml b/tests/qemuxml2xmloutdata/disk-fmt-qcow.xml
index e10748ffce..7c0023f748 100644
--- a/tests/qemuxml2xmloutdata/disk-fmt-qcow.xml
+++ b/tests/qemuxml2xmloutdata/disk-fmt-qcow.xml
@@ -36,6 +36,7 @@
     <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/qemuxml2xmloutdata/disk-metadata-cache.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-metadata-cache.x86_64-latest.xml
index 7104151a10..64fc4f69e1 100644
--- a/tests/qemuxml2xmloutdata/disk-metadata-cache.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-metadata-cache.x86_64-latest.xml
@@ -51,6 +51,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-active.xml b/tests/qemuxml2xmloutdata/disk-mirror-active.xml
index 0e2669398c..dca166d7f1 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-active.xml
@@ -86,6 +86,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
index 6c7f92c1cc..ba47bbad1a 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-inactive.xml
@@ -59,6 +59,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml b/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
index 14d4ed3522..7e54cae592 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-old-active.xml
@@ -60,6 +60,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
index 157ffcf6b2..5aec616002 100644
--- a/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
+++ b/tests/qemuxml2xmloutdata/disk-mirror-old-inactive.xml
@@ -52,6 +52,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-network-gluster.xml b/tests/qemuxml2xmloutdata/disk-network-gluster.xml
index 0b596df987..c4763fa78f 100644
--- a/tests/qemuxml2xmloutdata/disk-network-gluster.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-gluster.xml
@@ -46,6 +46,7 @@
     <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/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml
index aaae21c5af..2c2ed4f17d 100644
--- a/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-http.x86_64-latest.xml
@@ -66,6 +66,7 @@
     <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/qemuxml2xmloutdata/disk-network-iscsi.xml b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
index 757b9b7b52..cbf26754cd 100644
--- a/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-iscsi.xml
@@ -69,6 +69,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/disk-network-nbd.xml b/tests/qemuxml2xmloutdata/disk-network-nbd.xml
index 0f169ca537..db088e0f85 100644
--- a/tests/qemuxml2xmloutdata/disk-network-nbd.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-nbd.xml
@@ -63,6 +63,7 @@
     <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/qemuxml2xmloutdata/disk-network-nfs-inactive.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-network-nfs-inactive.x86_64-latest.xml
index 87e341411a..aeb073dc3b 100644
--- a/tests/qemuxml2xmloutdata/disk-network-nfs-inactive.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-nfs-inactive.x86_64-latest.xml
@@ -49,6 +49,7 @@
     <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/qemuxml2xmloutdata/disk-network-nfs.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-network-nfs.x86_64-latest.xml
index d920d46adf..2916df8e0a 100644
--- a/tests/qemuxml2xmloutdata/disk-network-nfs.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-nfs.x86_64-latest.xml
@@ -49,6 +49,7 @@
     <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/qemuxml2xmloutdata/disk-network-rbd.xml b/tests/qemuxml2xmloutdata/disk-network-rbd.xml
index 7c74604f43..01b1d66ece 100644
--- a/tests/qemuxml2xmloutdata/disk-network-rbd.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-rbd.xml
@@ -85,6 +85,7 @@
     <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/qemuxml2xmloutdata/disk-network-sheepdog.xml b/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
index bbe3998e88..c1862e5a54 100644
--- a/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-sheepdog.xml
@@ -37,6 +37,7 @@
     <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/qemuxml2xmloutdata/disk-network-source-auth.xml b/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
index d9c85c478d..59258733bd 100644
--- a/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-source-auth.xml
@@ -57,6 +57,7 @@
     <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/qemuxml2xmloutdata/disk-network-tlsx509-nbd.xml b/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.xml
index c4521aac1b..dc2412c988 100644
--- a/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-tlsx509-nbd.xml
@@ -28,6 +28,7 @@
     <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/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.xml b/tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.xml
index 7053affd17..d6a3a8e61d 100644
--- a/tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-tlsx509-vxhs.xml
@@ -47,6 +47,7 @@
     <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/qemuxml2xmloutdata/disk-network-vxhs.xml b/tests/qemuxml2xmloutdata/disk-network-vxhs.xml
index 160ed8d5f4..fe93a953d2 100644
--- a/tests/qemuxml2xmloutdata/disk-network-vxhs.xml
+++ b/tests/qemuxml2xmloutdata/disk-network-vxhs.xml
@@ -29,6 +29,7 @@
     <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/qemuxml2xmloutdata/disk-scsi-device-auto.xml b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
index d02db8fb0d..41bfcbaaf4 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-device-auto.xml
@@ -38,6 +38,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
index 080d20d0df..80fbf927af 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-disk-vpd.xml
@@ -44,6 +44,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
index 99bbd119eb..eb0c192d80 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi-lun-passthrough-sgio.xml
@@ -38,6 +38,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-scsi.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-scsi.x86_64-latest.xml
index ff93277835..0fa36082e7 100644
--- a/tests/qemuxml2xmloutdata/disk-scsi.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-scsi.x86_64-latest.xml
@@ -79,6 +79,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-serial.xml b/tests/qemuxml2xmloutdata/disk-serial.xml
index e29cefe0e8..b4092eae24 100644
--- a/tests/qemuxml2xmloutdata/disk-serial.xml
+++ b/tests/qemuxml2xmloutdata/disk-serial.xml
@@ -42,6 +42,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml
index a02820a104..5c200ad31c 100644
--- a/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-slices.x86_64-latest.xml
@@ -88,6 +88,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml b/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
index 35ffadc26c..046665f713 100644
--- a/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
+++ b/tests/qemuxml2xmloutdata/disk-source-pool-mode.xml
@@ -65,6 +65,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-source-pool.xml b/tests/qemuxml2xmloutdata/disk-source-pool.xml
index d7d9457452..3f5aa73e55 100644
--- a/tests/qemuxml2xmloutdata/disk-source-pool.xml
+++ b/tests/qemuxml2xmloutdata/disk-source-pool.xml
@@ -60,6 +60,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-usb-device.xml b/tests/qemuxml2xmloutdata/disk-usb-device.xml
index 60342112b3..ee19c37d9b 100644
--- a/tests/qemuxml2xmloutdata/disk-usb-device.xml
+++ b/tests/qemuxml2xmloutdata/disk-usb-device.xml
@@ -34,6 +34,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml
index 87f5ec46ac..b1df51570d 100644
--- a/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml
@@ -41,6 +41,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml b/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml
index 37684c82b1..bf1fe681be 100644
--- a/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml
+++ b/tests/qemuxml2xmloutdata/disk-virtio-s390-zpci.xml
@@ -23,6 +23,7 @@
       </address>
     </disk>
     <controller type='pci' index='0' model='pci-root'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/disk-virtio.xml b/tests/qemuxml2xmloutdata/disk-virtio.xml
index 884f7aadb4..d7abf57e4a 100644
--- a/tests/qemuxml2xmloutdata/disk-virtio.xml
+++ b/tests/qemuxml2xmloutdata/disk-virtio.xml
@@ -48,6 +48,7 @@
     <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/qemuxml2xmloutdata/encrypted-disk.xml b/tests/qemuxml2xmloutdata/encrypted-disk.xml
index dbde16dbe3..59cae921fc 100644
--- a/tests/qemuxml2xmloutdata/encrypted-disk.xml
+++ b/tests/qemuxml2xmloutdata/encrypted-disk.xml
@@ -29,6 +29,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/eoi-disabled.xml b/tests/qemuxml2xmloutdata/eoi-disabled.xml
index 6bea44a47c..eedab82972 100644
--- a/tests/qemuxml2xmloutdata/eoi-disabled.xml
+++ b/tests/qemuxml2xmloutdata/eoi-disabled.xml
@@ -25,6 +25,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/eoi-enabled.xml b/tests/qemuxml2xmloutdata/eoi-enabled.xml
index b416894d88..3c42a3c1c0 100644
--- a/tests/qemuxml2xmloutdata/eoi-enabled.xml
+++ b/tests/qemuxml2xmloutdata/eoi-enabled.xml
@@ -25,6 +25,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/event_idx.xml b/tests/qemuxml2xmloutdata/event_idx.xml
index 5ba208e367..a8990cd639 100644
--- a/tests/qemuxml2xmloutdata/event_idx.xml
+++ b/tests/qemuxml2xmloutdata/event_idx.xml
@@ -47,6 +47,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/floppy-drive-fat.xml b/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
index 7e573d31d2..ff489ade6d 100644
--- a/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
+++ b/tests/qemuxml2xmloutdata/floppy-drive-fat.xml
@@ -31,6 +31,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/genid-active.x86_64-latest.xml b/tests/qemuxml2xmloutdata/genid-active.x86_64-latest.xml
index 84b988e5bb..06a01bb688 100644
--- a/tests/qemuxml2xmloutdata/genid-active.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/genid-active.x86_64-latest.xml
@@ -30,6 +30,7 @@
     <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/qemuxml2xmloutdata/genid-auto-active.x86_64-latest.xml b/tests/qemuxml2xmloutdata/genid-auto-active.x86_64-latest.xml
index ded700d247..ce3af24282 100644
--- a/tests/qemuxml2xmloutdata/genid-auto-active.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/genid-auto-active.x86_64-latest.xml
@@ -30,6 +30,7 @@
     <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/qemuxml2xmloutdata/genid-auto-inactive.x86_64-latest.xml b/tests/qemuxml2xmloutdata/genid-auto-inactive.x86_64-latest.xml
index aedf32e239..a0b9e156b7 100644
--- a/tests/qemuxml2xmloutdata/genid-auto-inactive.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/genid-auto-inactive.x86_64-latest.xml
@@ -30,6 +30,7 @@
     <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/qemuxml2xmloutdata/genid-inactive.x86_64-latest.xml b/tests/qemuxml2xmloutdata/genid-inactive.x86_64-latest.xml
index 6c64ce74a8..9406c6e48a 100644
--- a/tests/qemuxml2xmloutdata/genid-inactive.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/genid-inactive.x86_64-latest.xml
@@ -30,6 +30,7 @@
     <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/qemuxml2xmloutdata/graphics-listen-network.xml b/tests/qemuxml2xmloutdata/graphics-listen-network.xml
index 4df676b10e..e6ee05d97a 100644
--- a/tests/qemuxml2xmloutdata/graphics-listen-network.xml
+++ b/tests/qemuxml2xmloutdata/graphics-listen-network.xml
@@ -32,6 +32,7 @@
     <graphics type='vnc' port='5903' autoport='no'>
       <listen type='network' network='Bobsnetwork'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-listen-network2.xml b/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
index a4a9ccea2e..cf01ea5d8b 100644
--- a/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
+++ b/tests/qemuxml2xmloutdata/graphics-listen-network2.xml
@@ -33,6 +33,7 @@
       <listen type='address' address='1.2.3.4'/>
       <listen type='network' network='Bobsnetwork'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml
index 03bf7cf107..f55c4b28a0 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket-cfg.xml
@@ -26,6 +26,7 @@
     <graphics type='spice' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='spice'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml
index e8534d961a..a2d6688ffe 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-auto-socket.xml
@@ -26,6 +26,7 @@
     <graphics type='spice'>
       <listen type='socket'/>
     </graphics>
+    <audio id='1' type='spice'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml b/tests/qemuxml2xmloutdata/graphics-spice-compression.xml
index 83d656e4f0..8772cd3343 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-compression.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-compression.xml
@@ -37,6 +37,7 @@
       <playback compression='on'/>
       <streaming mode='filter'/>
     </graphics>
+    <audio id='1' type='spice'/>
     <video>
       <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml b/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml
index cf3119ae8d..eee55cbeeb 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-egl-headless.xml
@@ -33,6 +33,7 @@
       <listen type='address' address='127.0.0.1'/>
     </graphics>
     <graphics type='egl-headless'/>
+    <audio id='1' type='spice'/>
     <video>
       <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml
index 9e311d8f2e..35038d128f 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-qxl-vga.xml
@@ -34,6 +34,7 @@
       <channel name='main' mode='secure'/>
       <channel name='inputs' mode='insecure'/>
     </graphics>
+    <audio id='1' type='spice'/>
     <video>
       <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-socket.xml b/tests/qemuxml2xmloutdata/graphics-spice-socket.xml
index 2dd9beb37f..dc429d3953 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-socket.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-socket.xml
@@ -26,6 +26,7 @@
     <graphics type='spice'>
       <listen type='socket' socket='/tmp/spice.sock'/>
     </graphics>
+    <audio id='1' type='spice'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
index 6e23652448..63eba26668 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
@@ -77,6 +77,7 @@
     <sound model='ac97'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </sound>
+    <audio id='1' type='spice'/>
     <video>
       <model type='vga' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-spice.xml b/tests/qemuxml2xmloutdata/graphics-spice.xml
index c45c825644..81115dc4b5 100644
--- a/tests/qemuxml2xmloutdata/graphics-spice.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice.xml
@@ -41,6 +41,7 @@
       <clipboard copypaste='no'/>
       <filetransfer enable='no'/>
     </graphics>
+    <audio id='1' type='spice'/>
     <video>
       <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml
index 9a70bd510c..6d2fd39994 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket-cfg.xml
@@ -32,6 +32,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml
index 57fe2ee0e6..ef63f11faf 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-auto-socket.xml
@@ -26,6 +26,7 @@
     <graphics type='vnc'>
       <listen type='socket'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml b/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml
index 0376383722..e4e5b70ac2 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-egl-headless.xml
@@ -33,6 +33,7 @@
       <listen type='address' address='2001:1:2:3:4:5:1234:1234'/>
     </graphics>
     <graphics type='egl-headless'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml b/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml
index cc83ca4b79..ef49c61c06 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-no-listen-attr.xml
@@ -32,6 +32,7 @@
     <graphics type='vnc' port='5903' autoport='no' listen='2001:1:2:3:4:5:1234:1234'>
       <listen type='address' address='2001:1:2:3:4:5:1234:1234'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml
index 4415aa9253..c3cd451bb5 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-active.xml
@@ -32,6 +32,7 @@
     <graphics type='vnc' socket='/tmp/lib/domain-99-QEMUGuest1/delete.this.socket'>
       <listen type='socket' socket='/tmp/lib/domain-99-QEMUGuest1/delete.this.socket'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml
index 9a70bd510c..6d2fd39994 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-remove-generated-socket-inactive.xml
@@ -32,6 +32,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml b/tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml
index d46a2c4542..b2e6fa9961 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-sasl.xml
@@ -32,6 +32,7 @@
     <graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-socket.xml b/tests/qemuxml2xmloutdata/graphics-vnc-socket.xml
index 314fa84372..ec4c08f627 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-socket.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-socket.xml
@@ -26,6 +26,7 @@
     <graphics type='vnc' socket='/tmp/vnc.sock'>
       <listen type='socket' socket='/tmp/vnc.sock'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml b/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
index 42d1adceb8..7e4248c54d 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-tls.xml
@@ -26,6 +26,7 @@
     <graphics type='vnc' port='5903' autoport='no' listen='127.0.0.1'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml b/tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml
index ddc4c67302..cf0650496f 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc-websocket.xml
@@ -23,6 +23,7 @@
     <graphics type='vnc' port='5900' autoport='no' websocket='5700' listen='127.0.0.1'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/graphics-vnc.xml b/tests/qemuxml2xmloutdata/graphics-vnc.xml
index cc83ca4b79..ef49c61c06 100644
--- a/tests/qemuxml2xmloutdata/graphics-vnc.xml
+++ b/tests/qemuxml2xmloutdata/graphics-vnc.xml
@@ -32,6 +32,7 @@
     <graphics type='vnc' port='5903' autoport='no' listen='2001:1:2:3:4:5:1234:1234'>
       <listen type='address' address='2001:1:2:3:4:5:1234:1234'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml
index c134400486..a60317d811 100644
--- a/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml
@@ -29,6 +29,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
index d8a71e1f25..48a1c87cae 100644
--- a/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display.xml
@@ -26,6 +26,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
index 2d66ebaac6..42286eeebf 100644
--- a/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-precreated.xml
@@ -23,6 +23,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-pci'>
       <source>
         <address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml b/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml
index 2341e8432b..136481411e 100644
--- a/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-address-unassigned.xml
@@ -23,6 +23,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
       <source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-address.xml b/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
index e923b50b05..6539069e09 100644
--- a/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-address.xml
@@ -29,6 +29,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <source>
         <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml b/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml
index 52ed86e305..1e5a2ca532 100644
--- a/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-pci-multifunction.xml
@@ -23,6 +23,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
       <source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
index e23d3d3901..474cc88d32 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-autogen-address.xml
@@ -35,6 +35,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='scsi' managed='yes'>
       <source>
         <adapter name='scsi_host0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
index 6c76c5c592..575f9e778a 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-large-unit.xml
@@ -32,6 +32,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='scsi' managed='yes'>
       <source>
         <adapter name='scsi_host0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
index 9cefc3471c..640f7ac9c7 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-lsi.xml
@@ -32,6 +32,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='scsi' managed='yes'>
       <source>
         <adapter name='scsi_host0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
index 16b27e72bf..d62652a27e 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-rawio.xml
@@ -32,6 +32,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='scsi' managed='yes' sgio='unfiltered' rawio='yes'>
       <source>
         <adapter name='scsi_host0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
index 1513429773..32790c8f3b 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-sgio.xml
@@ -32,6 +32,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='scsi' managed='yes' sgio='unfiltered'>
       <source>
         <adapter name='scsi_host0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
index f8f4389cd6..c1bf0bbc98 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-shareable.xml
@@ -32,6 +32,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='scsi' managed='yes'>
       <source>
         <adapter name='scsi_host0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
index 3723bd0a98..ee42e03f07 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-ccw.xml
@@ -23,6 +23,7 @@
     <controller type='scsi' index='0' model='virtio-scsi'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
     </controller>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='scsi_host' managed='no'>
       <source protocol='vhost' wwpn='naa.5123456789abcde0'/>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
index 2d2bdbf0b6..23ec57651e 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pci.xml
@@ -32,6 +32,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='scsi_host' managed='no'>
       <source protocol='vhost' wwpn='naa.5123456789abcde0'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
index ef48d81231..98c96605fb 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-vhost-scsi-pcie.xml
@@ -31,6 +31,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='scsi_host' managed='no'>
       <source protocol='vhost' wwpn='naa.5123456789abcde0'/>
       <address type='pci' domain='0x0000' bus='0x01' slot='0x00' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
index 3e2e21dc55..95cc6a4b79 100644
--- a/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-scsi-virtio-scsi.xml
@@ -32,6 +32,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='scsi' managed='yes'>
       <source>
         <adapter name='scsi_host0'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.xml b/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.xml
index afaa9c3e43..d8a3043718 100644
--- a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ap.xml
@@ -14,6 +14,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-ap'>
       <source>
         <address uuid='90c6c135-ad44-41d0-b1b7-bae47de48627'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.xml b/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.xml
index 0342217cd0..f2ae0b7d09 100644
--- a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.xml
@@ -17,6 +17,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-ccw'>
       <source>
         <address uuid='90c6c135-ad44-41d0-b1b7-bae47de48627'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml b/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml
index a14ab05caa..37f8385717 100644
--- a/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-subsys-mdev-vfio-ccw.xml
@@ -14,6 +14,7 @@
   <on_crash>destroy</on_crash>
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-ccw'>
       <source>
         <address uuid='90c6c135-ad44-41d0-b1b7-bae47de48627'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-usb-address.xml b/tests/qemuxml2xmloutdata/hostdev-usb-address.xml
index 4a2d7f6439..e4a1f798b2 100644
--- a/tests/qemuxml2xmloutdata/hostdev-usb-address.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-usb-address.xml
@@ -29,6 +29,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='usb' managed='no'>
       <source>
         <address bus='14' device='6'/>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml
index 846b809e63..594be6a6b7 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-fids.xml
@@ -15,6 +15,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
       <driver name='vfio'/>
       <source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml
index 01647550a1..b0ec9850ee 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate-uids.xml
@@ -15,6 +15,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
       <driver name='vfio'/>
       <source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml
index e94e63bd0a..3cf7ada929 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-autogenerate.xml
@@ -15,6 +15,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
       <driver name='vfio'/>
       <source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml
index 81d2146188..094d6f1ce4 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-boundaries.xml
@@ -20,6 +20,7 @@
       <target chassisNr='1'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </controller>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
       <driver name='vfio'/>
       <source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.xml
index 0d18e2d686..276c9f3e69 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-ccw-memballoon.xml
@@ -15,6 +15,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
       <driver name='vfio'/>
       <source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml
index e56106d103..759589242d 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci-multidomain-many.xml
@@ -15,6 +15,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
       <driver name='vfio'/>
       <source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml
index fc8c38ab66..3b41c4e0c0 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio-zpci.xml
@@ -15,6 +15,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='no'>
       <driver name='vfio'/>
       <source>
diff --git a/tests/qemuxml2xmloutdata/hostdev-vfio.xml b/tests/qemuxml2xmloutdata/hostdev-vfio.xml
index aa17a3e212..d04ad74215 100644
--- a/tests/qemuxml2xmloutdata/hostdev-vfio.xml
+++ b/tests/qemuxml2xmloutdata/hostdev-vfio.xml
@@ -29,6 +29,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
       <source>
diff --git a/tests/qemuxml2xmloutdata/hugepages-default.xml b/tests/qemuxml2xmloutdata/hugepages-default.xml
index 89916f4581..18e6d13a84 100644
--- a/tests/qemuxml2xmloutdata/hugepages-default.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-default.xml
@@ -26,6 +26,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
index ce67853f26..fd3666c149 100644
--- a/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-nodeset.xml
@@ -25,6 +25,7 @@
     <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/qemuxml2xmloutdata/hugepages-numa-default-2M.xml b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
index b320f69a2d..b12b9735c8 100644
--- a/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-numa-default-2M.xml
@@ -31,6 +31,7 @@
     <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/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml
index 977f5ccd19..3ca5a1fcaf 100644
--- a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset-part.xml
@@ -31,6 +31,7 @@
     <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/qemuxml2xmloutdata/hugepages-numa-nodeset.xml b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml
index e57bb55449..2122f76aee 100644
--- a/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-numa-nodeset.xml
@@ -34,6 +34,7 @@
     <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/qemuxml2xmloutdata/hugepages-shared.xml b/tests/qemuxml2xmloutdata/hugepages-shared.xml
index 0382614c30..01ea3f0545 100644
--- a/tests/qemuxml2xmloutdata/hugepages-shared.xml
+++ b/tests/qemuxml2xmloutdata/hugepages-shared.xml
@@ -47,6 +47,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/hyperv-off.xml b/tests/qemuxml2xmloutdata/hyperv-off.xml
index 7fd8748c6f..46eea5fe2f 100644
--- a/tests/qemuxml2xmloutdata/hyperv-off.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-off.xml
@@ -39,6 +39,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/hyperv-panic.xml b/tests/qemuxml2xmloutdata/hyperv-panic.xml
index c96a7506df..0455937d51 100644
--- a/tests/qemuxml2xmloutdata/hyperv-panic.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-panic.xml
@@ -23,6 +23,7 @@
     <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'/>
     <panic model='hyperv'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml b/tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml
index a04e80e575..d49eb75b12 100644
--- a/tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml
+++ b/tests/qemuxml2xmloutdata/hyperv-stimer-direct.xml
@@ -30,6 +30,7 @@
     <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/qemuxml2xmloutdata/hyperv.xml b/tests/qemuxml2xmloutdata/hyperv.xml
index 07cfcce320..00af005671 100644
--- a/tests/qemuxml2xmloutdata/hyperv.xml
+++ b/tests/qemuxml2xmloutdata/hyperv.xml
@@ -39,6 +39,7 @@
     <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/qemuxml2xmloutdata/input-usbmouse.xml b/tests/qemuxml2xmloutdata/input-usbmouse.xml
index 3dbb0eee9e..d7646efce2 100644
--- a/tests/qemuxml2xmloutdata/input-usbmouse.xml
+++ b/tests/qemuxml2xmloutdata/input-usbmouse.xml
@@ -30,6 +30,7 @@
     <input type='mouse' bus='usb'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/input-usbtablet.xml b/tests/qemuxml2xmloutdata/input-usbtablet.xml
index 5b5b7bd77a..add2908f82 100644
--- a/tests/qemuxml2xmloutdata/input-usbtablet.xml
+++ b/tests/qemuxml2xmloutdata/input-usbtablet.xml
@@ -30,6 +30,7 @@
     <input type='tablet' bus='usb'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/input-virtio-ccw.xml b/tests/qemuxml2xmloutdata/input-virtio-ccw.xml
index 20aed31f3f..3a4fcadda6 100644
--- a/tests/qemuxml2xmloutdata/input-virtio-ccw.xml
+++ b/tests/qemuxml2xmloutdata/input-virtio-ccw.xml
@@ -29,6 +29,7 @@
     <input type='tablet' bus='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0004'/>
     </input>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml b/tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml
index ea3576a52d..735f21be97 100644
--- a/tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml
+++ b/tests/qemuxml2xmloutdata/intel-iommu.x86_64-2.6.0.xml
@@ -24,6 +24,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <iommu model='intel'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/interface-driver.xml b/tests/qemuxml2xmloutdata/interface-driver.xml
index 06606b7fbb..eb5d672ea4 100644
--- a/tests/qemuxml2xmloutdata/interface-driver.xml
+++ b/tests/qemuxml2xmloutdata/interface-driver.xml
@@ -56,6 +56,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/interface-server.xml b/tests/qemuxml2xmloutdata/interface-server.xml
index 75b12bf96f..442f64afde 100644
--- a/tests/qemuxml2xmloutdata/interface-server.xml
+++ b/tests/qemuxml2xmloutdata/interface-server.xml
@@ -126,6 +126,7 @@
     <sound model='ich6'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </sound>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/iommu-smmuv3.aarch64-latest.xml b/tests/qemuxml2xmloutdata/iommu-smmuv3.aarch64-latest.xml
index 53edd3f851..0314d06530 100644
--- a/tests/qemuxml2xmloutdata/iommu-smmuv3.aarch64-latest.xml
+++ b/tests/qemuxml2xmloutdata/iommu-smmuv3.aarch64-latest.xml
@@ -22,6 +22,7 @@
     <emulator>/usr/bin/qemu-system-aarch64</emulator>
     <controller type='usb' index='0' model='none'/>
     <controller type='pci' index='0' model='pcie-root'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <iommu model='smmuv3'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml b/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml
index 37d7d429a4..f711b34ffe 100644
--- a/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-disk-virtio-ccw.xml
@@ -28,6 +28,7 @@
       <address type='ccw' cssid='0x0' ssid='0x0' devno='0x0007'/>
     </disk>
     <controller type='usb' index='0' model='none'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x000a'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/iothreads-disk.xml b/tests/qemuxml2xmloutdata/iothreads-disk.xml
index 3eeed00703..0aee306cf2 100644
--- a/tests/qemuxml2xmloutdata/iothreads-disk.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-disk.xml
@@ -42,6 +42,7 @@
     <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/qemuxml2xmloutdata/iothreads-ids-partial.xml b/tests/qemuxml2xmloutdata/iothreads-ids-partial.xml
index fbc4cb3ab9..b6afcf9cbb 100644
--- a/tests/qemuxml2xmloutdata/iothreads-ids-partial.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-ids-partial.xml
@@ -36,6 +36,7 @@
     <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/qemuxml2xmloutdata/iothreads-ids.xml b/tests/qemuxml2xmloutdata/iothreads-ids.xml
index 2b64bc446f..4f73431581 100644
--- a/tests/qemuxml2xmloutdata/iothreads-ids.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-ids.xml
@@ -34,6 +34,7 @@
     <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/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml
index 1b4af03832..11fead6c8b 100644
--- a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-ccw.xml
@@ -32,6 +32,7 @@
       <driver iothread='2'/>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x000a'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml
index 2bdc91501c..39b4b2b61a 100644
--- a/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml
+++ b/tests/qemuxml2xmloutdata/iothreads-virtio-scsi-pci.xml
@@ -46,6 +46,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/iothreads.xml b/tests/qemuxml2xmloutdata/iothreads.xml
index c2fc2e3918..17e5f8bce1 100644
--- a/tests/qemuxml2xmloutdata/iothreads.xml
+++ b/tests/qemuxml2xmloutdata/iothreads.xml
@@ -30,6 +30,7 @@
     <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/qemuxml2xmloutdata/kvm-features-off.xml b/tests/qemuxml2xmloutdata/kvm-features-off.xml
index 2fc9468910..42afbab369 100644
--- a/tests/qemuxml2xmloutdata/kvm-features-off.xml
+++ b/tests/qemuxml2xmloutdata/kvm-features-off.xml
@@ -28,6 +28,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/kvm-features.xml b/tests/qemuxml2xmloutdata/kvm-features.xml
index 458070ac46..88ee48c873 100644
--- a/tests/qemuxml2xmloutdata/kvm-features.xml
+++ b/tests/qemuxml2xmloutdata/kvm-features.xml
@@ -29,6 +29,7 @@
     <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/qemuxml2xmloutdata/kvmclock.xml b/tests/qemuxml2xmloutdata/kvmclock.xml
index 729b4eccd6..0152c59e47 100644
--- a/tests/qemuxml2xmloutdata/kvmclock.xml
+++ b/tests/qemuxml2xmloutdata/kvmclock.xml
@@ -25,6 +25,7 @@
     <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/qemuxml2xmloutdata/lease.xml b/tests/qemuxml2xmloutdata/lease.xml
index 87258c8f7e..8d6c65e7ac 100644
--- a/tests/qemuxml2xmloutdata/lease.xml
+++ b/tests/qemuxml2xmloutdata/lease.xml
@@ -41,6 +41,7 @@
     </lease>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-latest.xml
index 0a21f4544a..5f600f5ba7 100644
--- a/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/luks-disks-source-qcow2.x86_64-latest.xml
@@ -99,6 +99,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/luks-disks-source.xml b/tests/qemuxml2xmloutdata/luks-disks-source.xml
index 1cad3af7a6..fbf01cb52a 100644
--- a/tests/qemuxml2xmloutdata/luks-disks-source.xml
+++ b/tests/qemuxml2xmloutdata/luks-disks-source.xml
@@ -77,6 +77,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml b/tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml
index 84e5c37ad9..6224089879 100644
--- a/tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml
+++ b/tests/qemuxml2xmloutdata/mach-virt-console-virtio.xml
@@ -24,6 +24,7 @@
     <console type='pty'>
       <target type='virtio' port='0'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial-compat.xml b/tests/qemuxml2xmloutdata/mach-virt-serial-compat.xml
index 3d7325a8db..f66fe2916a 100644
--- a/tests/qemuxml2xmloutdata/mach-virt-serial-compat.xml
+++ b/tests/qemuxml2xmloutdata/mach-virt-serial-compat.xml
@@ -26,6 +26,7 @@
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial-pci.xml b/tests/qemuxml2xmloutdata/mach-virt-serial-pci.xml
index 4bcf69a3d1..09478419e2 100644
--- a/tests/qemuxml2xmloutdata/mach-virt-serial-pci.xml
+++ b/tests/qemuxml2xmloutdata/mach-virt-serial-pci.xml
@@ -39,6 +39,7 @@
       </target>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
     </serial>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/mach-virt-serial-usb.xml b/tests/qemuxml2xmloutdata/mach-virt-serial-usb.xml
index 01c2a52555..0578d7ad72 100644
--- a/tests/qemuxml2xmloutdata/mach-virt-serial-usb.xml
+++ b/tests/qemuxml2xmloutdata/mach-virt-serial-usb.xml
@@ -36,6 +36,7 @@
         <model name='usb-serial'/>
       </target>
     </serial>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/machine-core-off.xml b/tests/qemuxml2xmloutdata/machine-core-off.xml
index 2b7a1b4712..faae1accb0 100644
--- a/tests/qemuxml2xmloutdata/machine-core-off.xml
+++ b/tests/qemuxml2xmloutdata/machine-core-off.xml
@@ -29,6 +29,7 @@
     <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/qemuxml2xmloutdata/machine-core-on.xml b/tests/qemuxml2xmloutdata/machine-core-on.xml
index 37508e8782..d3d15a557e 100644
--- a/tests/qemuxml2xmloutdata/machine-core-on.xml
+++ b/tests/qemuxml2xmloutdata/machine-core-on.xml
@@ -29,6 +29,7 @@
     <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/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml b/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml
index c4e08fd440..3ea2c8c1c4 100644
--- a/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml
+++ b/tests/qemuxml2xmloutdata/machine-loadparm-multiple-disks-nets-s390.xml
@@ -38,6 +38,7 @@
       <model type='virtio'/>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0004'/>
     </interface>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
index 326b5c954c..41399ff0d0 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
@@ -40,6 +40,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.xml
index 3999b1a99f..4c9a15da6f 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.xml
@@ -26,6 +26,7 @@
       <model name='spapr-pci-host-bridge'/>
       <target index='0'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
     <memory model='nvdimm'>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.xml
index bf7df9a259..c15db20dad 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.xml
@@ -26,6 +26,7 @@
       <model name='spapr-pci-host-bridge'/>
       <target index='0'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
     <memory model='nvdimm'>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml b/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml
index 4edb786e6f..0590940233 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-ppc64-nonuma-abi-update.xml
@@ -20,6 +20,7 @@
       <model name='spapr-pci-host-bridge'/>
       <target index='0'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
     <memory model='dimm'>
diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.xml b/tests/qemuxml2xmloutdata/memory-hotplug.xml
index 0e5295dcd0..660e45205c 100644
--- a/tests/qemuxml2xmloutdata/memory-hotplug.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug.xml
@@ -36,6 +36,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/memorybacking-set.xml b/tests/qemuxml2xmloutdata/memorybacking-set.xml
index da1ebadfd1..1924f75779 100644
--- a/tests/qemuxml2xmloutdata/memorybacking-set.xml
+++ b/tests/qemuxml2xmloutdata/memorybacking-set.xml
@@ -25,6 +25,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/memorybacking-unset.xml b/tests/qemuxml2xmloutdata/memorybacking-unset.xml
index b90988d3f1..19dfa64f64 100644
--- a/tests/qemuxml2xmloutdata/memorybacking-unset.xml
+++ b/tests/qemuxml2xmloutdata/memorybacking-unset.xml
@@ -25,6 +25,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/memtune-unlimited.xml b/tests/qemuxml2xmloutdata/memtune-unlimited.xml
index 24e5aadcdf..e65d09eb6c 100644
--- a/tests/qemuxml2xmloutdata/memtune-unlimited.xml
+++ b/tests/qemuxml2xmloutdata/memtune-unlimited.xml
@@ -29,6 +29,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/memtune.xml b/tests/qemuxml2xmloutdata/memtune.xml
index 59de8b2c02..afe9468d8e 100644
--- a/tests/qemuxml2xmloutdata/memtune.xml
+++ b/tests/qemuxml2xmloutdata/memtune.xml
@@ -34,6 +34,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/metadata-duplicate.xml b/tests/qemuxml2xmloutdata/metadata-duplicate.xml
index 8955445eb0..bbd77393e7 100644
--- a/tests/qemuxml2xmloutdata/metadata-duplicate.xml
+++ b/tests/qemuxml2xmloutdata/metadata-duplicate.xml
@@ -33,6 +33,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/metadata.xml b/tests/qemuxml2xmloutdata/metadata.xml
index 8955445eb0..bbd77393e7 100644
--- a/tests/qemuxml2xmloutdata/metadata.xml
+++ b/tests/qemuxml2xmloutdata/metadata.xml
@@ -33,6 +33,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/migrate.xml b/tests/qemuxml2xmloutdata/migrate.xml
index 757791af10..7f512929aa 100644
--- a/tests/qemuxml2xmloutdata/migrate.xml
+++ b/tests/qemuxml2xmloutdata/migrate.xml
@@ -29,6 +29,7 @@
     <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/qemuxml2xmloutdata/minimal.xml b/tests/qemuxml2xmloutdata/minimal.xml
index aae7d84719..86a0656c10 100644
--- a/tests/qemuxml2xmloutdata/minimal.xml
+++ b/tests/qemuxml2xmloutdata/minimal.xml
@@ -34,6 +34,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/misc-acpi.xml b/tests/qemuxml2xmloutdata/misc-acpi.xml
index 6114d43b13..5c7a1c7494 100644
--- a/tests/qemuxml2xmloutdata/misc-acpi.xml
+++ b/tests/qemuxml2xmloutdata/misc-acpi.xml
@@ -32,6 +32,7 @@
     <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/qemuxml2xmloutdata/misc-disable-s3.xml b/tests/qemuxml2xmloutdata/misc-disable-s3.xml
index efdcc3bd37..0aa5a98159 100644
--- a/tests/qemuxml2xmloutdata/misc-disable-s3.xml
+++ b/tests/qemuxml2xmloutdata/misc-disable-s3.xml
@@ -32,6 +32,7 @@
     <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/qemuxml2xmloutdata/misc-disable-suspends.xml b/tests/qemuxml2xmloutdata/misc-disable-suspends.xml
index 6e94800d6f..10241eb72f 100644
--- a/tests/qemuxml2xmloutdata/misc-disable-suspends.xml
+++ b/tests/qemuxml2xmloutdata/misc-disable-suspends.xml
@@ -33,6 +33,7 @@
     <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/qemuxml2xmloutdata/misc-enable-s4.xml b/tests/qemuxml2xmloutdata/misc-enable-s4.xml
index e9c5d5e63f..464aa2482e 100644
--- a/tests/qemuxml2xmloutdata/misc-enable-s4.xml
+++ b/tests/qemuxml2xmloutdata/misc-enable-s4.xml
@@ -32,6 +32,7 @@
     <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/qemuxml2xmloutdata/misc-no-reboot.xml b/tests/qemuxml2xmloutdata/misc-no-reboot.xml
index 9f3a4d487a..c597ee4fd6 100644
--- a/tests/qemuxml2xmloutdata/misc-no-reboot.xml
+++ b/tests/qemuxml2xmloutdata/misc-no-reboot.xml
@@ -29,6 +29,7 @@
     <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/qemuxml2xmloutdata/misc-uuid.xml b/tests/qemuxml2xmloutdata/misc-uuid.xml
index 6114d43b13..5c7a1c7494 100644
--- a/tests/qemuxml2xmloutdata/misc-uuid.xml
+++ b/tests/qemuxml2xmloutdata/misc-uuid.xml
@@ -32,6 +32,7 @@
     <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/qemuxml2xmloutdata/net-bandwidth.xml b/tests/qemuxml2xmloutdata/net-bandwidth.xml
index 906081c33d..7d5c552202 100644
--- a/tests/qemuxml2xmloutdata/net-bandwidth.xml
+++ b/tests/qemuxml2xmloutdata/net-bandwidth.xml
@@ -71,6 +71,7 @@
     <sound model='ac97'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </sound>
+    <audio id='1' type='none'/>
     <video>
       <model type='vga' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/net-bandwidth2.xml b/tests/qemuxml2xmloutdata/net-bandwidth2.xml
index e9c8388078..7d5209a64a 100644
--- a/tests/qemuxml2xmloutdata/net-bandwidth2.xml
+++ b/tests/qemuxml2xmloutdata/net-bandwidth2.xml
@@ -60,6 +60,7 @@
     <sound model='ac97'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </sound>
+    <audio id='1' type='none'/>
     <video>
       <model type='vga' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/net-coalesce.xml b/tests/qemuxml2xmloutdata/net-coalesce.xml
index 3a37587dde..146fcaae25 100644
--- a/tests/qemuxml2xmloutdata/net-coalesce.xml
+++ b/tests/qemuxml2xmloutdata/net-coalesce.xml
@@ -66,6 +66,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/net-eth-hostip.xml b/tests/qemuxml2xmloutdata/net-eth-hostip.xml
index 3990dfbdf9..a144b5fc91 100644
--- a/tests/qemuxml2xmloutdata/net-eth-hostip.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-hostip.xml
@@ -39,6 +39,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-eth-ifname.xml b/tests/qemuxml2xmloutdata/net-eth-ifname.xml
index 275f0c9b0c..51b1679012 100644
--- a/tests/qemuxml2xmloutdata/net-eth-ifname.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-ifname.xml
@@ -36,6 +36,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
index 061d1b5954..de176f851b 100644
--- a/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
+++ b/tests/qemuxml2xmloutdata/net-eth-unmanaged-tap.xml
@@ -35,6 +35,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-eth.xml b/tests/qemuxml2xmloutdata/net-eth.xml
index 8e84643c98..3703834d14 100644
--- a/tests/qemuxml2xmloutdata/net-eth.xml
+++ b/tests/qemuxml2xmloutdata/net-eth.xml
@@ -35,6 +35,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
index f6ddad49c0..7caf0c050b 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev-bootorder.xml
@@ -37,6 +37,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
index 324c75e990..65dd69aae2 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev-vfio.xml
@@ -44,6 +44,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/net-hostdev.xml b/tests/qemuxml2xmloutdata/net-hostdev.xml
index 7403bff9a0..47d35d2d08 100644
--- a/tests/qemuxml2xmloutdata/net-hostdev.xml
+++ b/tests/qemuxml2xmloutdata/net-hostdev.xml
@@ -43,6 +43,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/net-isolated-port.x86_64-latest.xml b/tests/qemuxml2xmloutdata/net-isolated-port.x86_64-latest.xml
index d21a5a395b..b2eb8516b8 100644
--- a/tests/qemuxml2xmloutdata/net-isolated-port.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/net-isolated-port.x86_64-latest.xml
@@ -54,6 +54,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/net-many-models.xml b/tests/qemuxml2xmloutdata/net-many-models.xml
index 3f2a642574..e3c1e96c7d 100644
--- a/tests/qemuxml2xmloutdata/net-many-models.xml
+++ b/tests/qemuxml2xmloutdata/net-many-models.xml
@@ -48,6 +48,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-midonet.xml b/tests/qemuxml2xmloutdata/net-midonet.xml
index 61e3ec8919..9410b98f38 100644
--- a/tests/qemuxml2xmloutdata/net-midonet.xml
+++ b/tests/qemuxml2xmloutdata/net-midonet.xml
@@ -38,6 +38,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/net-mtu.xml b/tests/qemuxml2xmloutdata/net-mtu.xml
index e729d5b6fa..3fe5da65b4 100644
--- a/tests/qemuxml2xmloutdata/net-mtu.xml
+++ b/tests/qemuxml2xmloutdata/net-mtu.xml
@@ -63,6 +63,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/net-openvswitch.xml b/tests/qemuxml2xmloutdata/net-openvswitch.xml
index 7b53846a08..0f84b34ce1 100644
--- a/tests/qemuxml2xmloutdata/net-openvswitch.xml
+++ b/tests/qemuxml2xmloutdata/net-openvswitch.xml
@@ -43,6 +43,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/net-udp.xml b/tests/qemuxml2xmloutdata/net-udp.xml
index fedb99f001..8a6654831a 100644
--- a/tests/qemuxml2xmloutdata/net-udp.xml
+++ b/tests/qemuxml2xmloutdata/net-udp.xml
@@ -37,6 +37,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/net-user.xml b/tests/qemuxml2xmloutdata/net-user.xml
index 35283da488..0c52ebf2a4 100644
--- a/tests/qemuxml2xmloutdata/net-user.xml
+++ b/tests/qemuxml2xmloutdata/net-user.xml
@@ -34,6 +34,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-vdpa.xml b/tests/qemuxml2xmloutdata/net-vdpa.xml
index b362405c14..c9de151a08 100644
--- a/tests/qemuxml2xmloutdata/net-vdpa.xml
+++ b/tests/qemuxml2xmloutdata/net-vdpa.xml
@@ -29,6 +29,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-vhostuser.xml b/tests/qemuxml2xmloutdata/net-vhostuser.xml
index e0a5335896..637935b641 100644
--- a/tests/qemuxml2xmloutdata/net-vhostuser.xml
+++ b/tests/qemuxml2xmloutdata/net-vhostuser.xml
@@ -41,6 +41,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-device.xml b/tests/qemuxml2xmloutdata/net-virtio-device.xml
index 9caa289116..dd94a8d6d1 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-device.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-device.xml
@@ -35,6 +35,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
index 15958be87b..40e57db44a 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-disable-offloads.xml
@@ -38,6 +38,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
index d298204250..334745d8f8 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-network-portgroup.xml
@@ -59,6 +59,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
index fce6d083ae..a9dffc0062 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-rxtxqueuesize.xml
@@ -35,6 +35,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml b/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
index e0dbeafe02..72791868e0 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-teaming-network.xml
@@ -44,6 +44,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/net-virtio-teaming.xml b/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
index 5a5695794a..39dd50ade6 100644
--- a/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio-teaming.xml
@@ -59,6 +59,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/net-virtio.xml b/tests/qemuxml2xmloutdata/net-virtio.xml
index 2ed622e923..5e3d407cb0 100644
--- a/tests/qemuxml2xmloutdata/net-virtio.xml
+++ b/tests/qemuxml2xmloutdata/net-virtio.xml
@@ -34,6 +34,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/nosharepages.xml b/tests/qemuxml2xmloutdata/nosharepages.xml
index dd5d24eaee..6610d7df87 100644
--- a/tests/qemuxml2xmloutdata/nosharepages.xml
+++ b/tests/qemuxml2xmloutdata/nosharepages.xml
@@ -32,6 +32,7 @@
     <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/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
index 841ea699a1..fc9ef86568 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
@@ -35,6 +35,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
index 2e3998e155..724112b3a2 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
@@ -35,6 +35,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
index 7c1f18c216..b054099f0a 100644
--- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
@@ -35,6 +35,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
index 3d05790c0e..d0dfb88682 100644
--- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
@@ -32,6 +32,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml b/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
index 8bd3c6e8cb..c289664f93 100644
--- a/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
+++ b/tests/qemuxml2xmloutdata/numatune-auto-prefer.xml
@@ -28,6 +28,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/numatune-distances.xml b/tests/qemuxml2xmloutdata/numatune-distances.xml
index 48f89cb015..ee2d956d7e 100644
--- a/tests/qemuxml2xmloutdata/numatune-distances.xml
+++ b/tests/qemuxml2xmloutdata/numatune-distances.xml
@@ -89,6 +89,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml b/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
index b96436d1b1..880d8e2947 100644
--- a/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
+++ b/tests/qemuxml2xmloutdata/numatune-memnode-no-memory.xml
@@ -29,6 +29,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/numatune-memnode.xml b/tests/qemuxml2xmloutdata/numatune-memnode.xml
index 338d7acb72..297ad6b9c8 100644
--- a/tests/qemuxml2xmloutdata/numatune-memnode.xml
+++ b/tests/qemuxml2xmloutdata/numatune-memnode.xml
@@ -32,6 +32,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/numavcpus-topology-mismatch.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numavcpus-topology-mismatch.x86_64-latest.xml
index 2d2245b10c..fdf7e83587 100644
--- a/tests/qemuxml2xmloutdata/numavcpus-topology-mismatch.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/numavcpus-topology-mismatch.x86_64-latest.xml
@@ -31,6 +31,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml b/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml
index 60d3498765..df6f61421a 100644
--- a/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/os-firmware-bios.x86_64-latest.xml
@@ -64,6 +64,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml b/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml
index 938da73711..c383546cc6 100644
--- a/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/os-firmware-efi-secboot.x86_64-latest.xml
@@ -64,6 +64,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml b/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml
index 97ce8a75c7..04d57860e7 100644
--- a/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/os-firmware-efi.x86_64-latest.xml
@@ -64,6 +64,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/panic-double.xml b/tests/qemuxml2xmloutdata/panic-double.xml
index b3d0f79ee3..9cef24a5d1 100644
--- a/tests/qemuxml2xmloutdata/panic-double.xml
+++ b/tests/qemuxml2xmloutdata/panic-double.xml
@@ -23,6 +23,7 @@
     <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'/>
     <panic model='hyperv'/>
     <panic model='isa'>
diff --git a/tests/qemuxml2xmloutdata/panic-isa.xml b/tests/qemuxml2xmloutdata/panic-isa.xml
index ef75c59046..2efcc47df8 100644
--- a/tests/qemuxml2xmloutdata/panic-isa.xml
+++ b/tests/qemuxml2xmloutdata/panic-isa.xml
@@ -30,6 +30,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/panic-no-address.xml b/tests/qemuxml2xmloutdata/panic-no-address.xml
index 129e66cd99..8093ac85f3 100644
--- a/tests/qemuxml2xmloutdata/panic-no-address.xml
+++ b/tests/qemuxml2xmloutdata/panic-no-address.xml
@@ -30,6 +30,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/panic-pseries.xml b/tests/qemuxml2xmloutdata/panic-pseries.xml
index 484fe4cfa6..cebb977d5a 100644
--- a/tests/qemuxml2xmloutdata/panic-pseries.xml
+++ b/tests/qemuxml2xmloutdata/panic-pseries.xml
@@ -31,6 +31,7 @@
       <target type='serial' port='0'/>
       <address type='spapr-vio' reg='0x30000000'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/panic.xml b/tests/qemuxml2xmloutdata/panic.xml
index ef75c59046..2efcc47df8 100644
--- a/tests/qemuxml2xmloutdata/panic.xml
+++ b/tests/qemuxml2xmloutdata/panic.xml
@@ -30,6 +30,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml b/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
index 33a2344181..cff6b2fa4d 100644
--- a/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
+++ b/tests/qemuxml2xmloutdata/pci-autoadd-addr.xml
@@ -70,6 +70,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml b/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
index c6437391cd..f42c77d219 100644
--- a/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
+++ b/tests/qemuxml2xmloutdata/pci-autoadd-idx.xml
@@ -75,6 +75,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/pci-autofill-addr.xml b/tests/qemuxml2xmloutdata/pci-autofill-addr.xml
index 84cf1043e3..30dc7625ec 100644
--- a/tests/qemuxml2xmloutdata/pci-autofill-addr.xml
+++ b/tests/qemuxml2xmloutdata/pci-autofill-addr.xml
@@ -30,6 +30,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml b/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
index 87077add03..8e31e4e83b 100644
--- a/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
+++ b/tests/qemuxml2xmloutdata/pci-bridge-many-disks.xml
@@ -673,6 +673,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pci-bridge.xml b/tests/qemuxml2xmloutdata/pci-bridge.xml
index 0a1591a0c7..d95660a381 100644
--- a/tests/qemuxml2xmloutdata/pci-bridge.xml
+++ b/tests/qemuxml2xmloutdata/pci-bridge.xml
@@ -208,6 +208,7 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1' keymap='en-us'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/pci-expander-bus.xml b/tests/qemuxml2xmloutdata/pci-expander-bus.xml
index 60e4e4af7f..80dc73edc2 100644
--- a/tests/qemuxml2xmloutdata/pci-expander-bus.xml
+++ b/tests/qemuxml2xmloutdata/pci-expander-bus.xml
@@ -200,6 +200,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/pci-many.xml b/tests/qemuxml2xmloutdata/pci-many.xml
index 08fcedce90..b610e3aa3c 100644
--- a/tests/qemuxml2xmloutdata/pci-many.xml
+++ b/tests/qemuxml2xmloutdata/pci-many.xml
@@ -203,6 +203,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='cirrus' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml b/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
index 745d19d8ad..b26016ecb6 100644
--- a/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom-disabled-invalid.xml
@@ -24,6 +24,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pci-rom-disabled.xml b/tests/qemuxml2xmloutdata/pci-rom-disabled.xml
index 6a95064ebf..cba9199f3f 100644
--- a/tests/qemuxml2xmloutdata/pci-rom-disabled.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom-disabled.xml
@@ -24,6 +24,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pci-rom.xml b/tests/qemuxml2xmloutdata/pci-rom.xml
index 62945054d4..198c2e6ce0 100644
--- a/tests/qemuxml2xmloutdata/pci-rom.xml
+++ b/tests/qemuxml2xmloutdata/pci-rom.xml
@@ -41,6 +41,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <source>
         <address domain='0x0000' bus='0x06' slot='0x12' function='0x5'/>
diff --git a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
index 9fe7fd5cc1..1a1b4f2b70 100644
--- a/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
+++ b/tests/qemuxml2xmloutdata/pci-serial-dev-chardev.xml
@@ -41,6 +41,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml b/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
index 452d476da6..45b03a1fb8 100644
--- a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
+++ b/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
@@ -369,6 +369,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml b/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
index 0de0d3e276..6560d6a84f 100644
--- a/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port-model-generic.xml
@@ -35,6 +35,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml b/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
index 3bbecf7b69..303107514f 100644
--- a/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port-model-ioh3420.xml
@@ -30,6 +30,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.x86_64-latest.xml
index 9e22a4181c..83ae6c91ae 100644
--- a/tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port-nohotplug.x86_64-latest.xml
@@ -65,6 +65,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-root-port.xml b/tests/qemuxml2xmloutdata/pcie-root-port.xml
index 1424b9e22e..45ab6c3080 100644
--- a/tests/qemuxml2xmloutdata/pcie-root-port.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root-port.xml
@@ -36,6 +36,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/pcie-root.xml b/tests/qemuxml2xmloutdata/pcie-root.xml
index 4e3bad7fea..a177902947 100644
--- a/tests/qemuxml2xmloutdata/pcie-root.xml
+++ b/tests/qemuxml2xmloutdata/pcie-root.xml
@@ -20,6 +20,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml b/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
index ca49d04a76..ba63acfe16 100644
--- a/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
+++ b/tests/qemuxml2xmloutdata/pcie-switch-downstream-port.xml
@@ -74,6 +74,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml b/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
index f994957c32..298db1df5e 100644
--- a/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
+++ b/tests/qemuxml2xmloutdata/pcie-switch-upstream-port.xml
@@ -44,6 +44,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/pcihole64-gib.xml b/tests/qemuxml2xmloutdata/pcihole64-gib.xml
index 2018e4329c..239e9e693f 100644
--- a/tests/qemuxml2xmloutdata/pcihole64-gib.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-gib.xml
@@ -22,6 +22,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/pcihole64-none.xml b/tests/qemuxml2xmloutdata/pcihole64-none.xml
index 0fc7262f61..62b6ef9040 100644
--- a/tests/qemuxml2xmloutdata/pcihole64-none.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-none.xml
@@ -22,6 +22,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/pcihole64-q35.xml b/tests/qemuxml2xmloutdata/pcihole64-q35.xml
index b3f591c451..5c3947f7f8 100644
--- a/tests/qemuxml2xmloutdata/pcihole64-q35.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64-q35.xml
@@ -28,6 +28,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/pcihole64.xml b/tests/qemuxml2xmloutdata/pcihole64.xml
index aa626ab88e..be70336738 100644
--- a/tests/qemuxml2xmloutdata/pcihole64.xml
+++ b/tests/qemuxml2xmloutdata/pcihole64.xml
@@ -22,6 +22,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/pmu-feature-off.xml b/tests/qemuxml2xmloutdata/pmu-feature-off.xml
index 9398014694..1aaa377290 100644
--- a/tests/qemuxml2xmloutdata/pmu-feature-off.xml
+++ b/tests/qemuxml2xmloutdata/pmu-feature-off.xml
@@ -24,6 +24,7 @@
     <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/qemuxml2xmloutdata/pmu-feature.xml b/tests/qemuxml2xmloutdata/pmu-feature.xml
index 7fee1ae0ac..bd87c33bd5 100644
--- a/tests/qemuxml2xmloutdata/pmu-feature.xml
+++ b/tests/qemuxml2xmloutdata/pmu-feature.xml
@@ -24,6 +24,7 @@
     <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/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.xml b/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.xml
index 6c401a8060..ceaae0f6c8 100644
--- a/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.xml
@@ -40,6 +40,7 @@
       <target type='serial' port='0'/>
       <address type='spapr-vio' reg='0x30000000'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml b/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml
index 98280d3ec9..695d998f6f 100644
--- a/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.xml
@@ -40,6 +40,7 @@
       <target type='serial' port='0'/>
       <address type='spapr-vio' reg='0x30000000'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml b/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml
index 035013aa44..868dd29a32 100644
--- a/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.xml
@@ -40,6 +40,7 @@
       <target type='serial' port='0'/>
       <address type='spapr-vio' reg='0x30000000'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.xml b/tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.xml
index e76766ff5a..f04ef099a3 100644
--- a/tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.xml
@@ -40,6 +40,7 @@
       <target type='serial' port='0'/>
       <address type='spapr-vio' reg='0x30000000'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.xml b/tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.xml
index c1d619a9cb..a6498da466 100644
--- a/tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.xml
@@ -40,6 +40,7 @@
       <target type='serial' port='0'/>
       <address type='spapr-vio' reg='0x30000000'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.xml b/tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.xml
index 311a7ad9da..fe7fb67d6c 100644
--- a/tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.xml
@@ -40,6 +40,7 @@
       <target type='serial' port='0'/>
       <address type='spapr-vio' reg='0x30000000'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/ppc64-pseries-graphics.ppc64-latest.xml b/tests/qemuxml2xmloutdata/ppc64-pseries-graphics.ppc64-latest.xml
index 052bb34a8a..984a233b07 100644
--- a/tests/qemuxml2xmloutdata/ppc64-pseries-graphics.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-pseries-graphics.ppc64-latest.xml
@@ -62,6 +62,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='vga' vram='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/ppc64-pseries-headless.ppc64-latest.xml b/tests/qemuxml2xmloutdata/ppc64-pseries-headless.ppc64-latest.xml
index aa6f51c7e6..bb45c4e12c 100644
--- a/tests/qemuxml2xmloutdata/ppc64-pseries-headless.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-pseries-headless.ppc64-latest.xml
@@ -57,6 +57,7 @@
       <target type='virtio' name='org.qemu.guest_agent.0'/>
       <address type='virtio-serial' controller='0' bus='0' port='1'/>
     </channel>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/ppc64-tpmproxy-single.ppc64-latest.xml b/tests/qemuxml2xmloutdata/ppc64-tpmproxy-single.ppc64-latest.xml
index 4e0e5f24b8..04d769831c 100644
--- a/tests/qemuxml2xmloutdata/ppc64-tpmproxy-single.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-tpmproxy-single.ppc64-latest.xml
@@ -34,6 +34,7 @@
         <device path='/dev/tpmrm0'/>
       </backend>
     </tpm>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/ppc64-tpmproxy-with-tpm.ppc64-latest.xml b/tests/qemuxml2xmloutdata/ppc64-tpmproxy-with-tpm.ppc64-latest.xml
index 9b64f914f0..067ab07af2 100644
--- a/tests/qemuxml2xmloutdata/ppc64-tpmproxy-with-tpm.ppc64-latest.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-tpmproxy-with-tpm.ppc64-latest.xml
@@ -38,6 +38,7 @@
       <backend type='emulator' version='2.0'/>
       <address type='spapr-vio' reg='0x00004000'/>
     </tpm>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/ppc64-usb-controller-legacy.xml b/tests/qemuxml2xmloutdata/ppc64-usb-controller-legacy.xml
index 673b81dbc9..2caf95d961 100644
--- a/tests/qemuxml2xmloutdata/ppc64-usb-controller-legacy.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-usb-controller-legacy.xml
@@ -26,6 +26,7 @@
       <model name='spapr-pci-host-bridge'/>
       <target index='0'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/ppc64-usb-controller.xml b/tests/qemuxml2xmloutdata/ppc64-usb-controller.xml
index 68995a9ce0..ec50384dd1 100644
--- a/tests/qemuxml2xmloutdata/ppc64-usb-controller.xml
+++ b/tests/qemuxml2xmloutdata/ppc64-usb-controller.xml
@@ -26,6 +26,7 @@
       <model name='spapr-pci-host-bridge'/>
       <target index='0'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/pseries-console-virtio.xml b/tests/qemuxml2xmloutdata/pseries-console-virtio.xml
index 48760f2824..0a44ea36bc 100644
--- a/tests/qemuxml2xmloutdata/pseries-console-virtio.xml
+++ b/tests/qemuxml2xmloutdata/pseries-console-virtio.xml
@@ -25,6 +25,7 @@
     <console type='pty'>
       <target type='virtio' port='0'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.xml b/tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.xml
index 404bb0c768..93d692be0c 100644
--- a/tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.xml
+++ b/tests/qemuxml2xmloutdata/pseries-cpu-compat-power9.xml
@@ -34,6 +34,7 @@
       <target type='serial' port='0'/>
       <address type='spapr-vio' reg='0x30000000'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/pseries-cpu-compat.xml b/tests/qemuxml2xmloutdata/pseries-cpu-compat.xml
index 1891fa5f48..4b880df610 100644
--- a/tests/qemuxml2xmloutdata/pseries-cpu-compat.xml
+++ b/tests/qemuxml2xmloutdata/pseries-cpu-compat.xml
@@ -34,6 +34,7 @@
       <target type='serial' port='0'/>
       <address type='spapr-vio' reg='0x30000000'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/pseries-cpu-exact.xml b/tests/qemuxml2xmloutdata/pseries-cpu-exact.xml
index f08f3e005f..a8e88d012f 100644
--- a/tests/qemuxml2xmloutdata/pseries-cpu-exact.xml
+++ b/tests/qemuxml2xmloutdata/pseries-cpu-exact.xml
@@ -35,6 +35,7 @@
       <target type='serial' port='0'/>
       <address type='spapr-vio' reg='0x30000000'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/pseries-features.xml b/tests/qemuxml2xmloutdata/pseries-features.xml
index e1c1d7306e..94a8f6a66f 100644
--- a/tests/qemuxml2xmloutdata/pseries-features.xml
+++ b/tests/qemuxml2xmloutdata/pseries-features.xml
@@ -30,6 +30,7 @@
       <target index='0'/>
     </controller>
     <controller type='usb' index='0' model='none'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/pseries-hostdevs-1.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-1.xml
index e77a060a38..cff29a97c2 100644
--- a/tests/qemuxml2xmloutdata/pseries-hostdevs-1.xml
+++ b/tests/qemuxml2xmloutdata/pseries-hostdevs-1.xml
@@ -35,6 +35,7 @@
       </source>
       <address type='pci' domain='0x0000' bus='0x01' slot='0x01' function='0x0'/>
     </interface>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
       <source>
diff --git a/tests/qemuxml2xmloutdata/pseries-hostdevs-2.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-2.xml
index cfa395b001..598513d784 100644
--- a/tests/qemuxml2xmloutdata/pseries-hostdevs-2.xml
+++ b/tests/qemuxml2xmloutdata/pseries-hostdevs-2.xml
@@ -30,6 +30,7 @@
       <model name='spapr-pci-host-bridge'/>
       <target index='2'/>
     </controller>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
       <source>
diff --git a/tests/qemuxml2xmloutdata/pseries-hostdevs-3.xml b/tests/qemuxml2xmloutdata/pseries-hostdevs-3.xml
index f91959b805..a1f00ddc7f 100644
--- a/tests/qemuxml2xmloutdata/pseries-hostdevs-3.xml
+++ b/tests/qemuxml2xmloutdata/pseries-hostdevs-3.xml
@@ -27,6 +27,7 @@
       <model name='spapr-pci-host-bridge'/>
       <target index='2'/>
     </controller>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='pci' managed='yes'>
       <driver name='vfio'/>
       <source>
diff --git a/tests/qemuxml2xmloutdata/pseries-many-buses-1.xml b/tests/qemuxml2xmloutdata/pseries-many-buses-1.xml
index eb7bb80541..45521c907a 100644
--- a/tests/qemuxml2xmloutdata/pseries-many-buses-1.xml
+++ b/tests/qemuxml2xmloutdata/pseries-many-buses-1.xml
@@ -26,6 +26,7 @@
       <model name='spapr-pci-host-bridge'/>
       <target index='1'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/pseries-many-buses-2.xml b/tests/qemuxml2xmloutdata/pseries-many-buses-2.xml
index 14f3e36244..0b1f670b3f 100644
--- a/tests/qemuxml2xmloutdata/pseries-many-buses-2.xml
+++ b/tests/qemuxml2xmloutdata/pseries-many-buses-2.xml
@@ -27,6 +27,7 @@
       <model name='spapr-pci-host-bridge'/>
       <target index='2'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/pseries-many-devices.xml b/tests/qemuxml2xmloutdata/pseries-many-devices.xml
index ff7a08fec1..3c23523c60 100644
--- a/tests/qemuxml2xmloutdata/pseries-many-devices.xml
+++ b/tests/qemuxml2xmloutdata/pseries-many-devices.xml
@@ -119,6 +119,7 @@
       <model name='spapr-pci-host-bridge'/>
       <target index='1'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/pseries-nvram.xml b/tests/qemuxml2xmloutdata/pseries-nvram.xml
index fd77c7aa89..278222ddea 100644
--- a/tests/qemuxml2xmloutdata/pseries-nvram.xml
+++ b/tests/qemuxml2xmloutdata/pseries-nvram.xml
@@ -21,6 +21,7 @@
       <model name='spapr-pci-host-bridge'/>
       <target index='0'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <nvram>
       <address type='spapr-vio' reg='0x00004000'/>
diff --git a/tests/qemuxml2xmloutdata/pseries-panic-missing.xml b/tests/qemuxml2xmloutdata/pseries-panic-missing.xml
index 484fe4cfa6..cebb977d5a 100644
--- a/tests/qemuxml2xmloutdata/pseries-panic-missing.xml
+++ b/tests/qemuxml2xmloutdata/pseries-panic-missing.xml
@@ -31,6 +31,7 @@
       <target type='serial' port='0'/>
       <address type='spapr-vio' reg='0x30000000'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/pseries-panic-no-address.xml b/tests/qemuxml2xmloutdata/pseries-panic-no-address.xml
index 484fe4cfa6..cebb977d5a 100644
--- a/tests/qemuxml2xmloutdata/pseries-panic-no-address.xml
+++ b/tests/qemuxml2xmloutdata/pseries-panic-no-address.xml
@@ -31,6 +31,7 @@
       <target type='serial' port='0'/>
       <address type='spapr-vio' reg='0x30000000'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/pseries-phb-default-missing.xml b/tests/qemuxml2xmloutdata/pseries-phb-default-missing.xml
index 62708b4a46..9966c89167 100644
--- a/tests/qemuxml2xmloutdata/pseries-phb-default-missing.xml
+++ b/tests/qemuxml2xmloutdata/pseries-phb-default-missing.xml
@@ -27,6 +27,7 @@
       <model name='spapr-pci-host-bridge'/>
       <target index='0'/>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
index b05ac334a6..56d8ee9f86 100644
--- a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
+++ b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
@@ -46,6 +46,7 @@
         <node>0</node>
       </target>
     </controller>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/pseries-phb-simple.xml b/tests/qemuxml2xmloutdata/pseries-phb-simple.xml
index 2c1e64e88d..9fa36ca3df 100644
--- a/tests/qemuxml2xmloutdata/pseries-phb-simple.xml
+++ b/tests/qemuxml2xmloutdata/pseries-phb-simple.xml
@@ -27,6 +27,7 @@
       <target index='2'/>
     </controller>
     <controller type='usb' index='0' model='none'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/pseries-serial-native.xml b/tests/qemuxml2xmloutdata/pseries-serial-native.xml
index fae7c54d5b..299ae61081 100644
--- a/tests/qemuxml2xmloutdata/pseries-serial-native.xml
+++ b/tests/qemuxml2xmloutdata/pseries-serial-native.xml
@@ -29,6 +29,7 @@
       <target type='serial' port='0'/>
       <address type='spapr-vio' reg='0x30000000'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/pseries-serial-pci.xml b/tests/qemuxml2xmloutdata/pseries-serial-pci.xml
index cba7ea96bb..e7517008ca 100644
--- a/tests/qemuxml2xmloutdata/pseries-serial-pci.xml
+++ b/tests/qemuxml2xmloutdata/pseries-serial-pci.xml
@@ -25,6 +25,7 @@
       </target>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </serial>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/pseries-serial-usb.xml b/tests/qemuxml2xmloutdata/pseries-serial-usb.xml
index 34f651308d..4d5989ef4f 100644
--- a/tests/qemuxml2xmloutdata/pseries-serial-usb.xml
+++ b/tests/qemuxml2xmloutdata/pseries-serial-usb.xml
@@ -26,6 +26,7 @@
         <model name='usb-serial'/>
       </target>
     </serial>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='pseries'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml b/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
index b8f23b070b..a95825e57c 100644
--- a/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
+++ b/tests/qemuxml2xmloutdata/pv-spinlock-disabled.xml
@@ -25,6 +25,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml b/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
index 5d30fa0f10..02e4bf2ccb 100644
--- a/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
+++ b/tests/qemuxml2xmloutdata/pv-spinlock-enabled.xml
@@ -25,6 +25,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/q35-default-devices-only.xml b/tests/qemuxml2xmloutdata/q35-default-devices-only.xml
index ff9252de05..cf8646e833 100644
--- a/tests/qemuxml2xmloutdata/q35-default-devices-only.xml
+++ b/tests/qemuxml2xmloutdata/q35-default-devices-only.xml
@@ -38,6 +38,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/q35-multifunction.xml b/tests/qemuxml2xmloutdata/q35-multifunction.xml
index 4f1e8b44ac..b98405b257 100644
--- a/tests/qemuxml2xmloutdata/q35-multifunction.xml
+++ b/tests/qemuxml2xmloutdata/q35-multifunction.xml
@@ -113,6 +113,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x00' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/q35-pci-force-address.xml b/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
index c5102105ca..425c7dfedd 100644
--- a/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
+++ b/tests/qemuxml2xmloutdata/q35-pci-force-address.xml
@@ -43,6 +43,7 @@
     <sound model='ich6'>
       <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
     </sound>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml b/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml
index 9ce1c317b2..f9131d3e4f 100644
--- a/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml
+++ b/tests/qemuxml2xmloutdata/q35-pcie-autoadd.xml
@@ -133,6 +133,7 @@
     </input>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='virtio' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/q35-pcie.xml b/tests/qemuxml2xmloutdata/q35-pcie.xml
index 75ca42a20e..76dbfd5c8c 100644
--- a/tests/qemuxml2xmloutdata/q35-pcie.xml
+++ b/tests/qemuxml2xmloutdata/q35-pcie.xml
@@ -137,6 +137,7 @@
     </input>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='virtio' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/q35-usb2-multi.xml b/tests/qemuxml2xmloutdata/q35-usb2-multi.xml
index 2ad1ddec21..aadba41023 100644
--- a/tests/qemuxml2xmloutdata/q35-usb2-multi.xml
+++ b/tests/qemuxml2xmloutdata/q35-usb2-multi.xml
@@ -80,6 +80,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml b/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
index 912ae8a890..92f07cade5 100644
--- a/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
+++ b/tests/qemuxml2xmloutdata/q35-usb2-reorder.xml
@@ -80,6 +80,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/q35-usb2.xml b/tests/qemuxml2xmloutdata/q35-usb2.xml
index 3d5407609e..f5e6442008 100644
--- a/tests/qemuxml2xmloutdata/q35-usb2.xml
+++ b/tests/qemuxml2xmloutdata/q35-usb2.xml
@@ -50,6 +50,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml b/tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml
index 2437fdec44..b63da06027 100644
--- a/tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml
+++ b/tests/qemuxml2xmloutdata/q35-virt-manager-basic.xml
@@ -106,6 +106,7 @@
     <sound model='ich9'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x1b' function='0x0'/>
     </sound>
+    <audio id='1' type='spice'/>
     <video>
       <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/q35-virtio-pci.xml b/tests/qemuxml2xmloutdata/q35-virtio-pci.xml
index f534a54c0f..d0f7bdb486 100644
--- a/tests/qemuxml2xmloutdata/q35-virtio-pci.xml
+++ b/tests/qemuxml2xmloutdata/q35-virtio-pci.xml
@@ -137,6 +137,7 @@
     </input>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='virtio' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/q35.xml b/tests/qemuxml2xmloutdata/q35.xml
index fa230ce9b5..3a37173da2 100644
--- a/tests/qemuxml2xmloutdata/q35.xml
+++ b/tests/qemuxml2xmloutdata/q35.xml
@@ -41,6 +41,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='32768' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml b/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
index f4e95d92c0..54a41c5968 100644
--- a/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
+++ b/tests/qemuxml2xmloutdata/qemu-ns-no-env.xml
@@ -29,6 +29,7 @@
     <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>
   <qemu:commandline>
diff --git a/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml b/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
index 5a5e2ffd9d..88f0268b8d 100644
--- a/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
+++ b/tests/qemuxml2xmloutdata/reboot-timeout-disabled.xml
@@ -21,6 +21,7 @@
     <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/qemuxml2xmloutdata/reboot-timeout-enabled.xml b/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
index a2383d57bf..73505cbffd 100644
--- a/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
+++ b/tests/qemuxml2xmloutdata/reboot-timeout-enabled.xml
@@ -21,6 +21,7 @@
     <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/qemuxml2xmloutdata/restore-v2.xml b/tests/qemuxml2xmloutdata/restore-v2.xml
index 757791af10..7f512929aa 100644
--- a/tests/qemuxml2xmloutdata/restore-v2.xml
+++ b/tests/qemuxml2xmloutdata/restore-v2.xml
@@ -29,6 +29,7 @@
     <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/qemuxml2xmloutdata/riscv64-virt-graphics.riscv64-latest.xml b/tests/qemuxml2xmloutdata/riscv64-virt-graphics.riscv64-latest.xml
index c51ddd8f83..4d5afe25bb 100644
--- a/tests/qemuxml2xmloutdata/riscv64-virt-graphics.riscv64-latest.xml
+++ b/tests/qemuxml2xmloutdata/riscv64-virt-graphics.riscv64-latest.xml
@@ -94,6 +94,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='virtio' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x07' slot='0x00' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/riscv64-virt-headless.riscv64-latest.xml b/tests/qemuxml2xmloutdata/riscv64-virt-headless.riscv64-latest.xml
index 5e09ea3c6f..3808cb775b 100644
--- a/tests/qemuxml2xmloutdata/riscv64-virt-headless.riscv64-latest.xml
+++ b/tests/qemuxml2xmloutdata/riscv64-virt-headless.riscv64-latest.xml
@@ -84,6 +84,7 @@
       <target type='virtio' name='org.qemu.guest_agent.0'/>
       <address type='virtio-serial' controller='0' bus='0' port='1'/>
     </channel>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/riscv64-virt-pci.xml b/tests/qemuxml2xmloutdata/riscv64-virt-pci.xml
index 163dc0a530..7eda6081db 100644
--- a/tests/qemuxml2xmloutdata/riscv64-virt-pci.xml
+++ b/tests/qemuxml2xmloutdata/riscv64-virt-pci.xml
@@ -23,6 +23,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
     </disk>
     <controller type='pci' index='0' model='pcie-root'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/riscv64-virt.xml b/tests/qemuxml2xmloutdata/riscv64-virt.xml
index ec41f211c2..8a5c5dd985 100644
--- a/tests/qemuxml2xmloutdata/riscv64-virt.xml
+++ b/tests/qemuxml2xmloutdata/riscv64-virt.xml
@@ -30,6 +30,7 @@
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='virtio-mmio'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml b/tests/qemuxml2xmloutdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml
index 8799584c11..ae39e6277d 100644
--- a/tests/qemuxml2xmloutdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml
+++ b/tests/qemuxml2xmloutdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.xml
@@ -16,6 +16,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml b/tests/qemuxml2xmloutdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml
index 1cc2edd893..4906206ada 100644
--- a/tests/qemuxml2xmloutdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml
+++ b/tests/qemuxml2xmloutdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.xml
@@ -16,6 +16,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml b/tests/qemuxml2xmloutdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml
index 5048b09e15..f4f9e724a9 100644
--- a/tests/qemuxml2xmloutdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml
+++ b/tests/qemuxml2xmloutdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.xml
@@ -18,6 +18,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml b/tests/qemuxml2xmloutdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml
index 8ccd460d01..65dd30a3fb 100644
--- a/tests/qemuxml2xmloutdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml
+++ b/tests/qemuxml2xmloutdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.xml
@@ -18,6 +18,7 @@
   <devices>
     <emulator>/usr/bin/qemu-system-s390x</emulator>
     <controller type='pci' index='0' model='pci-root'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/s390-defaultconsole.xml b/tests/qemuxml2xmloutdata/s390-defaultconsole.xml
index 0f278f2c9d..d34299116c 100644
--- a/tests/qemuxml2xmloutdata/s390-defaultconsole.xml
+++ b/tests/qemuxml2xmloutdata/s390-defaultconsole.xml
@@ -22,6 +22,7 @@
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='s390'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/s390-panic-missing.xml b/tests/qemuxml2xmloutdata/s390-panic-missing.xml
index 886415725f..1929826541 100644
--- a/tests/qemuxml2xmloutdata/s390-panic-missing.xml
+++ b/tests/qemuxml2xmloutdata/s390-panic-missing.xml
@@ -21,6 +21,7 @@
       <target type='virtio' port='0'/>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/s390-panic-no-address.xml b/tests/qemuxml2xmloutdata/s390-panic-no-address.xml
index 3ae36ba675..1610eacdef 100644
--- a/tests/qemuxml2xmloutdata/s390-panic-no-address.xml
+++ b/tests/qemuxml2xmloutdata/s390-panic-no-address.xml
@@ -20,6 +20,7 @@
     <console type='pty'>
       <target type='virtio' port='0'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/s390-panic.xml b/tests/qemuxml2xmloutdata/s390-panic.xml
index b08c40780e..1c31685fb5 100644
--- a/tests/qemuxml2xmloutdata/s390-panic.xml
+++ b/tests/qemuxml2xmloutdata/s390-panic.xml
@@ -20,6 +20,7 @@
     <console type='pty'>
       <target type='virtio' port='0'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/s390-serial-2.xml b/tests/qemuxml2xmloutdata/s390-serial-2.xml
index bb9ca30f1d..2ca82ecf03 100644
--- a/tests/qemuxml2xmloutdata/s390-serial-2.xml
+++ b/tests/qemuxml2xmloutdata/s390-serial-2.xml
@@ -27,6 +27,7 @@
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='s390'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/s390-serial-console.xml b/tests/qemuxml2xmloutdata/s390-serial-console.xml
index 9c9b4dd27a..f29565f5c2 100644
--- a/tests/qemuxml2xmloutdata/s390-serial-console.xml
+++ b/tests/qemuxml2xmloutdata/s390-serial-console.xml
@@ -22,6 +22,7 @@
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='s390'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/s390-serial.xml b/tests/qemuxml2xmloutdata/s390-serial.xml
index 9c9b4dd27a..f29565f5c2 100644
--- a/tests/qemuxml2xmloutdata/s390-serial.xml
+++ b/tests/qemuxml2xmloutdata/s390-serial.xml
@@ -22,6 +22,7 @@
     <console type='pty'>
       <target type='serial' port='0'/>
     </console>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
     <panic model='s390'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/s390x-ccw-graphics.s390x-latest.xml b/tests/qemuxml2xmloutdata/s390x-ccw-graphics.s390x-latest.xml
index 74118349af..c4c4c4cfdb 100644
--- a/tests/qemuxml2xmloutdata/s390x-ccw-graphics.s390x-latest.xml
+++ b/tests/qemuxml2xmloutdata/s390x-ccw-graphics.s390x-latest.xml
@@ -53,6 +53,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='virtio' heads='1' primary='yes'/>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/>
diff --git a/tests/qemuxml2xmloutdata/s390x-ccw-headless.s390x-latest.xml b/tests/qemuxml2xmloutdata/s390x-ccw-headless.s390x-latest.xml
index 6ab1b46c95..48d9cb86f2 100644
--- a/tests/qemuxml2xmloutdata/s390x-ccw-headless.s390x-latest.xml
+++ b/tests/qemuxml2xmloutdata/s390x-ccw-headless.s390x-latest.xml
@@ -44,6 +44,7 @@
       <target type='virtio' name='org.qemu.guest_agent.0'/>
       <address type='virtio-serial' controller='0' bus='0' port='1'/>
     </channel>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0003'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
index a82cdf167f..1e19106341 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dac-none.xml
@@ -29,6 +29,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
index eaec802054..81413fe58f 100644
--- a/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-device-multiple.xml
@@ -34,6 +34,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
index db8d3f3bf9..23e59182f6 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-baselabel-inactive.xml
@@ -29,6 +29,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
index db8d3f3bf9..23e59182f6 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-labelskip-inactive.xml
@@ -29,6 +29,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml
index bfa66b8deb..e232a41500 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none-relabel-inactive.xml
@@ -41,6 +41,7 @@
     <graphics type='spice' autoport='yes' listen='0.0.0.0'>
       <listen type='address' address='0.0.0.0'/>
     </graphics>
+    <audio id='1' type='spice'/>
     <video>
       <model type='cirrus' vram='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
index ce7b409947..b1e477ebe5 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-none.xml
@@ -29,6 +29,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
index aadcf5a516..b074e4f6ca 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-override-inactive.xml
@@ -41,6 +41,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
index ce7b409947..b1e477ebe5 100644
--- a/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-dynamic-relabel-inactive.xml
@@ -29,6 +29,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/seclabel-none.xml b/tests/qemuxml2xmloutdata/seclabel-none.xml
index ce7b409947..b1e477ebe5 100644
--- a/tests/qemuxml2xmloutdata/seclabel-none.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-none.xml
@@ -29,6 +29,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
index 48ffcded63..853ec24ba9 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-active.xml
@@ -32,6 +32,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
index d8d93fe016..fb17c41c1d 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static-labelskip-inactive.xml
@@ -30,6 +30,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/seclabel-static.xml b/tests/qemuxml2xmloutdata/seclabel-static.xml
index b633a9f829..a9af42aa3b 100644
--- a/tests/qemuxml2xmloutdata/seclabel-static.xml
+++ b/tests/qemuxml2xmloutdata/seclabel-static.xml
@@ -29,6 +29,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
index 5ab1ecae7f..76a40b7fa7 100644
--- a/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
+++ b/tests/qemuxml2xmloutdata/serial-spiceport-nospice.xml
@@ -39,6 +39,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/serial-spiceport.xml b/tests/qemuxml2xmloutdata/serial-spiceport.xml
index 5fca7b19c5..ec76a3bff7 100644
--- a/tests/qemuxml2xmloutdata/serial-spiceport.xml
+++ b/tests/qemuxml2xmloutdata/serial-spiceport.xml
@@ -43,6 +43,7 @@
     <graphics type='spice' port='5903' tlsPort='5904' autoport='no' listen='127.0.0.1'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <audio id='1' type='spice'/>
     <video>
       <model type='qxl' ram='65536' vram='65536' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
index 9aae2ac044..5cd283838a 100644
--- a/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
+++ b/tests/qemuxml2xmloutdata/serial-target-port-auto.xml
@@ -47,6 +47,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
index 4823338365..97e793382f 100644
--- a/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
+++ b/tests/qemuxml2xmloutdata/serial-tcp-tlsx509-chardev.xml
@@ -48,6 +48,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
index 64c0a7d753..f244533f4d 100644
--- a/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
+++ b/tests/qemuxml2xmloutdata/shmem-plain-doorbell.xml
@@ -20,6 +20,7 @@
     <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'/>
     <shmem name='shmem0'>
       <model type='ivshmem-plain'/>
diff --git a/tests/qemuxml2xmloutdata/shmem.xml b/tests/qemuxml2xmloutdata/shmem.xml
index 3145b3fc21..d7b02ffa4d 100644
--- a/tests/qemuxml2xmloutdata/shmem.xml
+++ b/tests/qemuxml2xmloutdata/shmem.xml
@@ -20,6 +20,7 @@
     <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'/>
     <shmem name='shmem0'>
       <model type='ivshmem'/>
diff --git a/tests/qemuxml2xmloutdata/smartcard-controller.xml b/tests/qemuxml2xmloutdata/smartcard-controller.xml
index b996c5b3db..2094f3ea7a 100644
--- a/tests/qemuxml2xmloutdata/smartcard-controller.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-controller.xml
@@ -24,6 +24,7 @@
     </smartcard>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
index 6d22110698..c798a3e6a1 100644
--- a/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates-database.xml
@@ -28,6 +28,7 @@
     </smartcard>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml b/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
index d0e545da61..3e7bc87d5d 100644
--- a/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host-certificates.xml
@@ -27,6 +27,7 @@
     </smartcard>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/smartcard-host.xml b/tests/qemuxml2xmloutdata/smartcard-host.xml
index acd5675ff4..088aa4c07b 100644
--- a/tests/qemuxml2xmloutdata/smartcard-host.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-host.xml
@@ -24,6 +24,7 @@
     </smartcard>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
index 0de8c9d270..73cf4733ee 100644
--- a/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-spicevmc.xml
@@ -24,6 +24,7 @@
     </smartcard>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
index c02f1e2526..d6f07fafdb 100644
--- a/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
+++ b/tests/qemuxml2xmloutdata/smartcard-passthrough-tcp.xml
@@ -26,6 +26,7 @@
     </smartcard>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
index 62dcf0d176..2ddc55eced 100644
--- a/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
+++ b/tests/qemuxml2xmloutdata/smbios-multiple-type2.xml
@@ -60,6 +60,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/smbios.xml b/tests/qemuxml2xmloutdata/smbios.xml
index 5385556b39..9e50b5a70e 100644
--- a/tests/qemuxml2xmloutdata/smbios.xml
+++ b/tests/qemuxml2xmloutdata/smbios.xml
@@ -65,6 +65,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/smp.xml b/tests/qemuxml2xmloutdata/smp.xml
index 3e00f578e5..951a30bfd0 100644
--- a/tests/qemuxml2xmloutdata/smp.xml
+++ b/tests/qemuxml2xmloutdata/smp.xml
@@ -32,6 +32,7 @@
     <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/qemuxml2xmloutdata/sound-device.xml b/tests/qemuxml2xmloutdata/sound-device.xml
index 62d658b9cd..598c7711ba 100644
--- a/tests/qemuxml2xmloutdata/sound-device.xml
+++ b/tests/qemuxml2xmloutdata/sound-device.xml
@@ -56,6 +56,7 @@
       <address type='pci' domain='0x0000' bus='0x00' slot='0x08' function='0x0'/>
     </sound>
     <sound model='usb'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x09' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/sound.xml b/tests/qemuxml2xmloutdata/sound.xml
index d1d208322b..3f20a0fd24 100644
--- a/tests/qemuxml2xmloutdata/sound.xml
+++ b/tests/qemuxml2xmloutdata/sound.xml
@@ -37,6 +37,7 @@
     <sound model='ac97'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
     </sound>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml b/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
index b312ea4d15..76289dfb74 100644
--- a/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
+++ b/tests/qemuxml2xmloutdata/tap-vhost-incorrect.xml
@@ -51,6 +51,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/tap-vhost.xml b/tests/qemuxml2xmloutdata/tap-vhost.xml
index 32fe224cf9..6746736443 100644
--- a/tests/qemuxml2xmloutdata/tap-vhost.xml
+++ b/tests/qemuxml2xmloutdata/tap-vhost.xml
@@ -57,6 +57,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml
index 8a842e4d22..9c2279b28b 100644
--- a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-enc.x86_64-latest.xml
@@ -32,6 +32,7 @@
         <encryption secret='32ee7e76-2178-47a1-ab7b-269e6e348015'/>
       </backend>
     </tpm>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml
index 08bc8d690c..42e93cfcbe 100644
--- a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2-pstate.x86_64-latest.xml
@@ -30,6 +30,7 @@
     <tpm model='tpm-tis'>
       <backend type='emulator' version='2.0' persistent_state='yes'/>
     </tpm>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml
index 9143a1dde1..fe4e1aba19 100644
--- a/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/tpm-emulator-tpm2.x86_64-latest.xml
@@ -30,6 +30,7 @@
     <tpm model='tpm-tis'>
       <backend type='emulator' version='2.0'/>
     </tpm>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml
index ff4006b2e3..b98a3693b7 100644
--- a/tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/tpm-emulator.x86_64-latest.xml
@@ -30,6 +30,7 @@
     <tpm model='tpm-tis'>
       <backend type='emulator' version='1.2'/>
     </tpm>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml
index b8be67acfd..47c622bd84 100644
--- a/tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/tpm-passthrough-crb.x86_64-latest.xml
@@ -32,6 +32,7 @@
         <device path='/dev/tpm0'/>
       </backend>
     </tpm>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml b/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml
index 030ab3e605..1555de4e86 100644
--- a/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/tpm-passthrough.x86_64-latest.xml
@@ -32,6 +32,7 @@
         <device path='/dev/tpm0'/>
       </backend>
     </tpm>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/tseg-explicit-size.xml b/tests/qemuxml2xmloutdata/tseg-explicit-size.xml
index e1a6e15b61..6c6abcd33b 100644
--- a/tests/qemuxml2xmloutdata/tseg-explicit-size.xml
+++ b/tests/qemuxml2xmloutdata/tseg-explicit-size.xml
@@ -39,6 +39,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x01' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/usb-controller-default-q35.xml b/tests/qemuxml2xmloutdata/usb-controller-default-q35.xml
index 787bb95554..2122d7ecd9 100644
--- a/tests/qemuxml2xmloutdata/usb-controller-default-q35.xml
+++ b/tests/qemuxml2xmloutdata/usb-controller-default-q35.xml
@@ -23,6 +23,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/usb-controller-explicit-q35.xml b/tests/qemuxml2xmloutdata/usb-controller-explicit-q35.xml
index 394a1f8317..328bcaee9c 100644
--- a/tests/qemuxml2xmloutdata/usb-controller-explicit-q35.xml
+++ b/tests/qemuxml2xmloutdata/usb-controller-explicit-q35.xml
@@ -23,6 +23,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='none'/>
   </devices>
 </domain>
diff --git a/tests/qemuxml2xmloutdata/usb-controller.xml b/tests/qemuxml2xmloutdata/usb-controller.xml
index 2041803aad..192d885210 100644
--- a/tests/qemuxml2xmloutdata/usb-controller.xml
+++ b/tests/qemuxml2xmloutdata/usb-controller.xml
@@ -20,6 +20,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
index da6705fe54..6ce966f1d4 100644
--- a/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
+++ b/tests/qemuxml2xmloutdata/usb-ich9-ehci-addr.xml
@@ -62,6 +62,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/usb-none.xml b/tests/qemuxml2xmloutdata/usb-none.xml
index 4ccaf8d1a0..c3a985cb46 100644
--- a/tests/qemuxml2xmloutdata/usb-none.xml
+++ b/tests/qemuxml2xmloutdata/usb-none.xml
@@ -18,6 +18,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/usb-piix3-controller.xml b/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
index 903cf80e70..8ae380770f 100644
--- a/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
+++ b/tests/qemuxml2xmloutdata/usb-piix3-controller.xml
@@ -20,6 +20,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/usb-port-missing.xml b/tests/qemuxml2xmloutdata/usb-port-missing.xml
index 74f88e6ac1..1621779c03 100644
--- a/tests/qemuxml2xmloutdata/usb-port-missing.xml
+++ b/tests/qemuxml2xmloutdata/usb-port-missing.xml
@@ -23,6 +23,7 @@
     </input>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hub type='usb'>
       <address type='usb' bus='0'/>
     </hub>
diff --git a/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml b/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
index fb2bfd7ad7..e0a424d3be 100644
--- a/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir-filter-version.xml
@@ -20,6 +20,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <redirdev bus='usb' type='spicevmc'>
       <address type='usb' bus='0' port='1'/>
     </redirdev>
diff --git a/tests/qemuxml2xmloutdata/usb-redir-filter.xml b/tests/qemuxml2xmloutdata/usb-redir-filter.xml
index 56cfbac2bc..37a192ded0 100644
--- a/tests/qemuxml2xmloutdata/usb-redir-filter.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir-filter.xml
@@ -32,6 +32,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <redirdev bus='usb' type='spicevmc'>
       <address type='usb' bus='0' port='4'/>
     </redirdev>
diff --git a/tests/qemuxml2xmloutdata/usb-redir.xml b/tests/qemuxml2xmloutdata/usb-redir.xml
index 45c44721f4..e40969cb58 100644
--- a/tests/qemuxml2xmloutdata/usb-redir.xml
+++ b/tests/qemuxml2xmloutdata/usb-redir.xml
@@ -32,6 +32,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <redirdev bus='usb' type='tcp'>
       <source mode='connect' host='localhost' service='4000'/>
       <protocol type='raw'/>
diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-auto.xml b/tests/qemuxml2xmloutdata/vhost-vsock-auto.xml
index ef50065063..bd0602b7fa 100644
--- a/tests/qemuxml2xmloutdata/vhost-vsock-auto.xml
+++ b/tests/qemuxml2xmloutdata/vhost-vsock-auto.xml
@@ -27,6 +27,7 @@
     <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'/>
     <vsock model='virtio'>
       <cid auto='yes'/>
diff --git a/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml
index 38a0fb3808..e2111dc738 100644
--- a/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml
+++ b/tests/qemuxml2xmloutdata/vhost-vsock-ccw-auto.xml
@@ -20,6 +20,7 @@
       <target dev='hda' bus='virtio'/>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0000'/>
     </disk>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/vhost_queues.xml b/tests/qemuxml2xmloutdata/vhost_queues.xml
index 8bfeb5bc89..b940f05dee 100644
--- a/tests/qemuxml2xmloutdata/vhost_queues.xml
+++ b/tests/qemuxml2xmloutdata/vhost_queues.xml
@@ -55,6 +55,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml b/tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml
index b278f2a06d..431661e29d 100644
--- a/tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml
+++ b/tests/qemuxml2xmloutdata/video-device-pciaddr-default.xml
@@ -32,6 +32,7 @@
     <graphics type='vnc' port='-1' autoport='yes' listen='127.0.0.1'>
       <listen type='address' address='127.0.0.1'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/video-none-device.xml b/tests/qemuxml2xmloutdata/video-none-device.xml
index 06d088a94f..841a95a511 100644
--- a/tests/qemuxml2xmloutdata/video-none-device.xml
+++ b/tests/qemuxml2xmloutdata/video-none-device.xml
@@ -32,6 +32,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='none'/>
       <alias name='ua-user-video-alias'/>
diff --git a/tests/qemuxml2xmloutdata/video-qxl-heads.xml b/tests/qemuxml2xmloutdata/video-qxl-heads.xml
index 0dd35c184b..bfe8a9b846 100644
--- a/tests/qemuxml2xmloutdata/video-qxl-heads.xml
+++ b/tests/qemuxml2xmloutdata/video-qxl-heads.xml
@@ -29,6 +29,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='65536' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml b/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
index 293ffe4743..566773d949 100644
--- a/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
+++ b/tests/qemuxml2xmloutdata/video-qxl-noheads.xml
@@ -29,6 +29,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='65536' vgamem='8192' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.xml
index b373275a1c..47c70a9301 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw-auto.xml
@@ -23,6 +23,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='virtio' heads='1' primary='yes'/>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0001'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml
index d34be843e7..ccc58a4a5d 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-ccw.xml
@@ -23,6 +23,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='virtio' heads='1' primary='yes'/>
       <address type='ccw' cssid='0xfe' ssid='0x0' devno='0x0002'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
index 17d826ba69..827ed19153 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-device.xml
@@ -29,6 +29,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='virtio' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.xml
index e546acb293..413296a925 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-secondary.xml
@@ -20,6 +20,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='virtio' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
index b570c535fd..9d8cb40620 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-spice-gl.xml
@@ -33,6 +33,7 @@
       <listen type='none'/>
       <gl enable='yes' rendernode='/dev/dri/foo'/>
     </graphics>
+    <audio id='1' type='spice'/>
     <video>
       <model type='virtio' heads='1' primary='yes'>
         <acceleration accel3d='yes'/>
diff --git a/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml b/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
index c63c450385..c4db021fe4 100644
--- a/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
+++ b/tests/qemuxml2xmloutdata/video-virtio-gpu-virgl.xml
@@ -29,6 +29,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <video>
       <model type='virtio' heads='1' primary='yes'>
         <acceleration accel3d='yes'/>
diff --git a/tests/qemuxml2xmloutdata/virtio-9p-createmode.x86_64-latest.xml b/tests/qemuxml2xmloutdata/virtio-9p-createmode.x86_64-latest.xml
index 7c374ca3a6..06f4074ea1 100644
--- a/tests/qemuxml2xmloutdata/virtio-9p-createmode.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/virtio-9p-createmode.x86_64-latest.xml
@@ -54,6 +54,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/virtio-9p-multidevs.x86_64-latest.xml b/tests/qemuxml2xmloutdata/virtio-9p-multidevs.x86_64-latest.xml
index 4ea75ff8e3..7d5b59c5bd 100644
--- a/tests/qemuxml2xmloutdata/virtio-9p-multidevs.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/virtio-9p-multidevs.x86_64-latest.xml
@@ -49,6 +49,7 @@
     </console>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x0c' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml b/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
index 9778dd3da9..b94b0c8aac 100644
--- a/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
+++ b/tests/qemuxml2xmloutdata/virtio-input-passthrough.xml
@@ -24,6 +24,7 @@
     </input>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/virtio-input.xml b/tests/qemuxml2xmloutdata/virtio-input.xml
index a08d1f741c..9d8db57981 100644
--- a/tests/qemuxml2xmloutdata/virtio-input.xml
+++ b/tests/qemuxml2xmloutdata/virtio-input.xml
@@ -29,6 +29,7 @@
     </input>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/virtio-lun.xml b/tests/qemuxml2xmloutdata/virtio-lun.xml
index 23052cd519..e1e28c33b9 100644
--- a/tests/qemuxml2xmloutdata/virtio-lun.xml
+++ b/tests/qemuxml2xmloutdata/virtio-lun.xml
@@ -46,6 +46,7 @@
     </interface>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest.xml b/tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest.xml
index d84ed2223c..f100819fa9 100644
--- a/tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/virtio-non-transitional.x86_64-latest.xml
@@ -105,6 +105,7 @@
     </input>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='scsi_host' managed='no' model='virtio-non-transitional'>
       <source protocol='vhost' wwpn='naa.5123456789abcde0'/>
       <address type='pci' domain='0x0000' bus='0x06' slot='0x00' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-builtin.x86_64-latest.xml b/tests/qemuxml2xmloutdata/virtio-rng-builtin.x86_64-latest.xml
index 19dd8e85bf..81c0b4d5b5 100644
--- a/tests/qemuxml2xmloutdata/virtio-rng-builtin.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/virtio-rng-builtin.x86_64-latest.xml
@@ -23,6 +23,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-egd.xml b/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
index d7302d0ad9..2658bf8ecc 100644
--- a/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
+++ b/tests/qemuxml2xmloutdata/virtio-rng-egd.xml
@@ -20,6 +20,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/virtio-rng-random.xml b/tests/qemuxml2xmloutdata/virtio-rng-random.xml
index 959d79e6ee..4ba8aa522f 100644
--- a/tests/qemuxml2xmloutdata/virtio-rng-random.xml
+++ b/tests/qemuxml2xmloutdata/virtio-rng-random.xml
@@ -20,6 +20,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/virtio-transitional.x86_64-latest.xml b/tests/qemuxml2xmloutdata/virtio-transitional.x86_64-latest.xml
index af3218a027..8928809e91 100644
--- a/tests/qemuxml2xmloutdata/virtio-transitional.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/virtio-transitional.x86_64-latest.xml
@@ -64,6 +64,7 @@
     </input>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <hostdev mode='subsystem' type='scsi_host' managed='no' model='virtio-transitional'>
       <source protocol='vhost' wwpn='naa.5123456789abcde0'/>
       <address type='pci' domain='0x0000' bus='0x02' slot='0x06' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/vmcoreinfo.xml b/tests/qemuxml2xmloutdata/vmcoreinfo.xml
index ec0f9559dd..6be4d36325 100644
--- a/tests/qemuxml2xmloutdata/vmcoreinfo.xml
+++ b/tests/qemuxml2xmloutdata/vmcoreinfo.xml
@@ -32,6 +32,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/watchdog.xml b/tests/qemuxml2xmloutdata/watchdog.xml
index 657ff5397f..2e89a54dea 100644
--- a/tests/qemuxml2xmloutdata/watchdog.xml
+++ b/tests/qemuxml2xmloutdata/watchdog.xml
@@ -29,6 +29,7 @@
     <controller type='pci' index='0' model='pci-root'/>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <watchdog model='ib700' action='poweroff'/>
     <memballoon model='none'/>
   </devices>
diff --git a/tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.xml
index c7b0f11cf8..3a610ab49f 100644
--- a/tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.xml
@@ -33,6 +33,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.xml
index be211acd29..61b9077597 100644
--- a/tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.xml
@@ -56,6 +56,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.xml
index 159270b83a..634b59efa7 100644
--- a/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.xml
@@ -33,6 +33,7 @@
     <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='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.xml
index b95e146c81..04335f6244 100644
--- a/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.xml
@@ -56,6 +56,7 @@
     </controller>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x03' slot='0x00' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/x86_64-pc-graphics.x86_64-latest.xml b/tests/qemuxml2xmloutdata/x86_64-pc-graphics.x86_64-latest.xml
index 28c23af12a..dd6b07ef1d 100644
--- a/tests/qemuxml2xmloutdata/x86_64-pc-graphics.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/x86_64-pc-graphics.x86_64-latest.xml
@@ -70,6 +70,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/x86_64-pc-headless.x86_64-latest.xml b/tests/qemuxml2xmloutdata/x86_64-pc-headless.x86_64-latest.xml
index cd46399fe6..ca86ec3e09 100644
--- a/tests/qemuxml2xmloutdata/x86_64-pc-headless.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/x86_64-pc-headless.x86_64-latest.xml
@@ -66,6 +66,7 @@
     </channel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x06' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmloutdata/x86_64-q35-graphics.x86_64-latest.xml b/tests/qemuxml2xmloutdata/x86_64-q35-graphics.x86_64-latest.xml
index e14c57d87e..02485adb98 100644
--- a/tests/qemuxml2xmloutdata/x86_64-q35-graphics.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/x86_64-q35-graphics.x86_64-latest.xml
@@ -108,6 +108,7 @@
     <graphics type='vnc' port='-1' autoport='yes'>
       <listen type='address'/>
     </graphics>
+    <audio id='1' type='none'/>
     <video>
       <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
       <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x0'/>
diff --git a/tests/qemuxml2xmloutdata/x86_64-q35-headless.x86_64-latest.xml b/tests/qemuxml2xmloutdata/x86_64-q35-headless.x86_64-latest.xml
index 664a12e1e6..0eedb748dd 100644
--- a/tests/qemuxml2xmloutdata/x86_64-q35-headless.x86_64-latest.xml
+++ b/tests/qemuxml2xmloutdata/x86_64-q35-headless.x86_64-latest.xml
@@ -104,6 +104,7 @@
     </channel>
     <input type='mouse' bus='ps2'/>
     <input type='keyboard' bus='ps2'/>
+    <audio id='1' type='none'/>
     <memballoon model='virtio'>
       <address type='pci' domain='0x0000' bus='0x05' slot='0x00' function='0x0'/>
     </memballoon>
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 03ab424e1a..2188f69281 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -1477,6 +1477,28 @@ mymain(void)
     DO_TEST("audio-oss-best", NONE);
     DO_TEST("audio-sdl-best", NONE);
 
+
+    /* Validate auto-creation of <audio> for legacy compat */
+    g_setenv("QEMU_AUDIO_DRV", "sdl", TRUE);
+    g_setenv("SDL_AUDIODRIVER", "esd", TRUE);
+    DO_TEST_CAPS_LATEST("audio-default-sdl");
+    g_unsetenv("QEMU_AUDIO_DRV");
+    g_unsetenv("SDL_AUDIODRIVER");
+
+    g_setenv("QEMU_AUDIO_DRV", "alsa", TRUE);
+    driver.config->vncAllowHostAudio = true;
+    DO_TEST_CAPS_LATEST("audio-default-vnc");
+    driver.config->vncAllowHostAudio = false;
+    g_unsetenv("QEMU_AUDIO_DRV");
+
+    DO_TEST_CAPS_LATEST("audio-default-spice");
+
+    g_setenv("QEMU_AUDIO_DRV", "alsa", TRUE);
+    driver.config->nogfxAllowHostAudio = true;
+    DO_TEST_CAPS_LATEST("audio-default-nographics");
+    driver.config->nogfxAllowHostAudio = false;
+    g_unsetenv("QEMU_AUDIO_DRV");
+
  cleanup:
     if (getenv("LIBVIRT_SKIP_CLEANUP") == NULL)
         virFileDeleteTree(fakerootdir);