Merge branch 'spice-vnc-default-audio-backend' into 'master'

src/qemu/qemu_domain.c: Fix overriding audioBackend in qemuDomainDefSuggestDefaultAudioBackend

See merge request libvirt/libvirt!271

docs/images/meson.build

@@ -18,7 +18,8 @@ foreach file : docs_image_files
   # This hack enables us to view the web pages
   # from within the uninstalled build tree
   if meson.version().version_compare('>=0.64.0')
-    fs.copyfile(file)
+    imgfile = fs.copyfile(file)
+    install_web_deps += imgfile
   else
     configure_file(input: file, output: file, copy: true)
   endif

docs/logos/meson.build

@@ -26,7 +26,8 @@ foreach file : docs_logo_files
   # This hack enables us to view the web pages
   # from within the uninstalled build tree
   if meson.version().version_compare('>=0.64.0')
-    fs.copyfile(file)
+    logofile = fs.copyfile(file)
+    install_web_deps += logofile
   else
     configure_file(input: file, output: file, copy: true)
   endif

docs/meson.build

@@ -360,6 +360,7 @@ if tests_enabled[0]
       '--webroot',
       meson.project_build_root() / 'docs'
     ],
+    depends: install_web_deps,
     env: runutf8,
     suite: 'script'
   )

src/qemu/qemu_domain.c

@@ -3951,7 +3951,9 @@ qemuDomainDefSuggestDefaultAudioBackend(virQEMUDriver *driver,
                 audioPassthrough = true;
             } else {
                 audioPassthrough = false;
-                *audioBackend = VIR_DOMAIN_AUDIO_TYPE_NONE;
+                if (!*addAudio) {
+                    *audioBackend = VIR_DOMAIN_AUDIO_TYPE_NONE;
+                }
             }
             *addAudio = true;
             break;