Merge remote-tracking branch 'remotes/kraxel/tags/audio-20190312-pull-request' into...

audio: introduce -audiodev

# gpg: Signature made Tue 12 Mar 2019 07:12:19 GMT
# gpg:                using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/audio-20190312-pull-request:
  audio: -audiodev command line option: cleanup
  wavaudio: port to -audiodev config
  spiceaudio: port to -audiodev config
  sdlaudio: port to -audiodev config
  paaudio: port to -audiodev config
  ossaudio: port to -audiodev config
  noaudio: port to -audiodev config
  dsoundaudio: port to -audiodev config
  coreaudio: port to -audiodev config
  alsaaudio: port to -audiodev config
  audio: -audiodev command line option basic implementation
  audio: -audiodev command line option: documentation
  audio: use qapi AudioFormat instead of audfmt_e
  qapi: qapi for audio backends

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
# Conflicts:
#	qemu-deprecated.texi

diff --cc qemu-deprecated.texi
index 1e15f57e9cc950ad1c7f987ea37767b78f577e2d,5c07ad4acb2e23f7b59a0ff17f200391a4618391..1cf10fc78bc042a8b7ed4dd1798be413b9a3d69e
--- 1/qemu-deprecated.texi
--- 2/qemu-deprecated.texi
+++ b/qemu-deprecated.texi
@@@ -60,11 -60,13 +60,18 @@@ Support for invalid topologies will be 
  topologies described with -smp include all possible cpus, i.e.
    @math{@var{sockets} * @var{cores} * @var{threads} = @var{maxcpus}}.
  
 +@subsection -vnc acl (since 4.0.0)
 +
 +The @code{acl} option to the @code{-vnc} argument has been replaced
 +by the @code{tls-authz} and @code{sasl-authz} options.
 +
+ @subsection QEMU_AUDIO_ environment variables and -audio-help (since 4.0)
+ 
+ The ``-audiodev'' argument is now the preferred way to specify audio
+ backend settings instead of environment variables.  To ease migration to
+ the new format, the ``-audiodev-help'' option can be used to convert
+ the current values of the environment variables to ``-audiodev'' options.
+ 
  @section QEMU Machine Protocol (QMP) commands
  
  @subsection block-dirty-bitmap-add "autoload" parameter (since 2.12.0)

diff --cc qemu-options.hx
Simple merge

diff --cc ui/vnc.c
Simple merge

diff --cc vl.c
Simple merge