qemu: populate <audio> element with default config

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

@@ -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 */

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)

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>

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>

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>

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>

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>

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>

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'/>

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>

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'/>

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>

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'/>

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>

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'/>

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>

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'/>

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>

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>

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>

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>

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>

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>

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>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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>

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>

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'/>

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'/>

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'/>

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>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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'/>

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>

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>

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>

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

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>

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

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>

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

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>

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

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>

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>

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>

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>

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>

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 \

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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>

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 \

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 \

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 \

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 \

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 \

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 \

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>

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>

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>

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>

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>

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>

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'/>

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'/>

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'/>

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'/>