[Qemu-commits] [qemu/qemu] 8c3a7d: qapi: qapi for audio backends

[Peter Maydell]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 8c3a7d008794305b1304549f1d9249c12cbf5b2b
      
https://github.com/qemu/qemu/commit/8c3a7d008794305b1304549f1d9249c12cbf5b2b
  Author: Kővágó, Zoltán <address@hidden>
  Date:   2019-03-11 (Mon, 11 Mar 2019)

  Changed paths:
    M qapi/Makefile.objs
    A qapi/audio.json
    M qapi/qapi-schema.json

  Log Message:
  -----------
  qapi: qapi for audio backends

This patch adds structures into qapi to replace the existing
configuration structures used by audio backends currently. This qapi
will be the base of the -audiodev command line parameter (that replaces
the old environment variables based config).

This is not a 1:1 translation of the old options, I've tried to make
them much more consistent (e.g. almost every backend had an option to
specify buffer size, but the name was different for every backend, and
some backends required usecs, while some other required frames, samples
or bytes). Also tried to reduce the number of abbreviations used by the
config keys.

Some of the more important changes:
* use `in` and `out` instead of `ADC` and `DAC`, as the former is more
  user friendly imho
* moved buffer settings into the global setting area (so it's the same
  for all backends that support it. Backends that can't change buffer
  size will simply ignore them). Also using usecs, as it's probably more
  user friendly than samples or bytes.
* try-poll is now an alsa backend specific option (as all other backends
  currently ignore it)

Signed-off-by: Kővágó, Zoltán <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 85bc58520c0e43660cbbe51b9eb5022a0baafe9f
      
https://github.com/qemu/qemu/commit/85bc58520c0e43660cbbe51b9eb5022a0baafe9f
  Author: Kővágó, Zoltán <address@hidden>
  Date:   2019-03-11 (Mon, 11 Mar 2019)

  Changed paths:
    M audio/alsaaudio.c
    M audio/audio.c
    M audio/audio.h
    M audio/audio_win_int.c
    M audio/ossaudio.c
    M audio/paaudio.c
    M audio/sdlaudio.c
    M audio/spiceaudio.c
    M audio/wavaudio.c
    M audio/wavcapture.c
    M hw/arm/omap2.c
    M hw/audio/ac97.c
    M hw/audio/adlib.c
    M hw/audio/cs4231a.c
    M hw/audio/es1370.c
    M hw/audio/gus.c
    M hw/audio/hda-codec.c
    M hw/audio/lm4549.c
    M hw/audio/milkymist-ac97.c
    M hw/audio/pcspk.c
    M hw/audio/sb16.c
    M hw/audio/wm8750.c
    M hw/display/xlnx_dp.c
    M hw/input/tsc210x.c
    M hw/usb/dev-audio.c
    M ui/vnc.c

  Log Message:
  -----------
  audio: use qapi AudioFormat instead of audfmt_e

I had to include an enum for audio sampling formats into qapi, but that
meant duplicating the audfmt_e enum.  This patch replaces audfmt_e and
associated values with the qapi generated AudioFormat enum.

This patch is mostly a search-and-replace, except for switches where the
qapi generated AUDIO_FORMAT_MAX caused problems.

Signed-off-by: Kővágó, Zoltán <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: f0b3d8115298c3162d3a56f8f38e0a02e783b54b
      
https://github.com/qemu/qemu/commit/f0b3d8115298c3162d3a56f8f38e0a02e783b54b
  Author: Kővágó, Zoltán <address@hidden>
  Date:   2019-03-11 (Mon, 11 Mar 2019)

  Changed paths:
    M qemu-deprecated.texi
    M qemu-options.hx

  Log Message:
  -----------
  audio: -audiodev command line option: documentation

This patch adds documentation of an -audiodev command line option, that
deprecates the old QEMU_* environment variables for audio backend
configuration.  It's syntax is similar to existing options (-netdev,
-device, etc):

  -audiodev driver_name,property=value,...

Although now it's possible to specify multiple -audiodev options on
command line, multiple audio backends are not supported yet.

Signed-off-by: Kővágó, Zoltán <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 71830221fb23388b32e6516c2fb7a698453a6c5a
      
https://github.com/qemu/qemu/commit/71830221fb23388b32e6516c2fb7a698453a6c5a
  Author: Kővágó, Zoltán <address@hidden>
  Date:   2019-03-11 (Mon, 11 Mar 2019)

  Changed paths:
    M audio/Makefile.objs
    M audio/alsaaudio.c
    M audio/audio.c
    M audio/audio.h
    M audio/audio_int.h
    A audio/audio_legacy.c
    M audio/audio_template.h
    M audio/coreaudio.c
    M audio/dsoundaudio.c
    M audio/noaudio.c
    M audio/ossaudio.c
    M audio/paaudio.c
    M audio/sdlaudio.c
    M audio/spiceaudio.c
    M audio/wavaudio.c
    M vl.c

  Log Message:
  -----------
  audio: -audiodev command line option basic implementation

Audio drivers now get an Audiodev * as config paramters, instead of the
global audio_option structs.  There is some code in audio/audio_legacy.c
that converts the old environment variables to audiodev options (this
way backends do not have to worry about legacy options).  It also
contains a replacement of -audio-help, which prints out the equivalent
-audiodev based config of the currently specified environment variables.

Note that backends are not updated and still rely on environment
variables.

Also note that (due to moving try-poll from global to backend specific
option) currently ALSA and OSS will always try poll mode, regardless of
environment variables or -audiodev options.

Signed-off-by: Kővágó, Zoltán <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: a93f328177378b4c5e3cf3c98f245415489eaa13
      
https://github.com/qemu/qemu/commit/a93f328177378b4c5e3cf3c98f245415489eaa13
  Author: Kővágó, Zoltán <address@hidden>
  Date:   2019-03-11 (Mon, 11 Mar 2019)

  Changed paths:
    M audio/alsaaudio.c
    M audio/audio_legacy.c

  Log Message:
  -----------
  alsaaudio: port to -audiodev config

Signed-off-by: Kővágó, Zoltán <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 17c56dc1d1882fd98d263a43c71761ffe17c6f65
      
https://github.com/qemu/qemu/commit/17c56dc1d1882fd98d263a43c71761ffe17c6f65
  Author: Kővágó, Zoltán <address@hidden>
  Date:   2019-03-11 (Mon, 11 Mar 2019)

  Changed paths:
    M audio/audio_legacy.c
    M audio/coreaudio.c

  Log Message:
  -----------
  coreaudio: port to -audiodev config

Signed-off-by: Kővágó, Zoltán <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 4a3b8b344495cd7e7419604fbf51d8efd088c210
      
https://github.com/qemu/qemu/commit/4a3b8b344495cd7e7419604fbf51d8efd088c210
  Author: Kővágó, Zoltán <address@hidden>
  Date:   2019-03-11 (Mon, 11 Mar 2019)

  Changed paths:
    M audio/audio_legacy.c
    M audio/dsound_template.h
    M audio/dsoundaudio.c

  Log Message:
  -----------
  dsoundaudio: port to -audiodev config

Signed-off-by: Kővágó, Zoltán <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: b1e4e97e5c8b3ddb75e5cc428faa6b2417a924d2
      
https://github.com/qemu/qemu/commit/b1e4e97e5c8b3ddb75e5cc428faa6b2417a924d2
  Author: Kővágó, Zoltán <address@hidden>
  Date:   2019-03-11 (Mon, 11 Mar 2019)

  Changed paths:
    M audio/noaudio.c

  Log Message:
  -----------
  noaudio: port to -audiodev config

Signed-off-by: Kővágó, Zoltán <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: baf6c7f4b4a7cf71d864964f778255d4b203a798
      
https://github.com/qemu/qemu/commit/baf6c7f4b4a7cf71d864964f778255d4b203a798
  Author: Kővágó, Zoltán <address@hidden>
  Date:   2019-03-11 (Mon, 11 Mar 2019)

  Changed paths:
    M audio/audio_legacy.c
    M audio/ossaudio.c

  Log Message:
  -----------
  ossaudio: port to -audiodev config

Signed-off-by: Kővágó, Zoltán <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 2c324b284aac7b87f65af043b8cb6196bd6ad16b
      
https://github.com/qemu/qemu/commit/2c324b284aac7b87f65af043b8cb6196bd6ad16b
  Author: Kővágó, Zoltán <address@hidden>
  Date:   2019-03-11 (Mon, 11 Mar 2019)

  Changed paths:
    M audio/audio_legacy.c
    M audio/paaudio.c

  Log Message:
  -----------
  paaudio: port to -audiodev config

Signed-off-by: Kővágó, Zoltán <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 57dea5533238cda04a07c3b49452f5cb315358b0
      
https://github.com/qemu/qemu/commit/57dea5533238cda04a07c3b49452f5cb315358b0
  Author: Kővágó, Zoltán <address@hidden>
  Date:   2019-03-11 (Mon, 11 Mar 2019)

  Changed paths:
    M audio/audio_legacy.c
    M audio/sdlaudio.c

  Log Message:
  -----------
  sdlaudio: port to -audiodev config

Signed-off-by: Kővágó, Zoltán <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 8af2234f7fbc7c32fb199dac351c3171efa34d10
      
https://github.com/qemu/qemu/commit/8af2234f7fbc7c32fb199dac351c3171efa34d10
  Author: Kővágó, Zoltán <address@hidden>
  Date:   2019-03-11 (Mon, 11 Mar 2019)

  Changed paths:
    M audio/spiceaudio.c

  Log Message:
  -----------
  spiceaudio: port to -audiodev config

Signed-off-by: Kővágó, Zoltán <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 0927d1665738df3b7b33d8e8790d52bd20c63506
      
https://github.com/qemu/qemu/commit/0927d1665738df3b7b33d8e8790d52bd20c63506
  Author: Kővágó, Zoltán <address@hidden>
  Date:   2019-03-11 (Mon, 11 Mar 2019)

  Changed paths:
    M audio/audio_legacy.c
    M audio/wavaudio.c

  Log Message:
  -----------
  wavaudio: port to -audiodev config

Signed-off-by: Kővágó, Zoltán <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: 05d2f2a64dbcaa50370d344ab12081d776ed0f03
      
https://github.com/qemu/qemu/commit/05d2f2a64dbcaa50370d344ab12081d776ed0f03
  Author: Kővágó, Zoltán <address@hidden>
  Date:   2019-03-11 (Mon, 11 Mar 2019)

  Changed paths:
    M audio/audio.c
    M audio/audio_int.h

  Log Message:
  -----------
  audio: -audiodev command line option: cleanup

Remove no longer needed code.

Signed-off-by: Kővágó, Zoltán <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>


  Commit: cfc3fef6b4e493bf1a7ee16790ad584e20dfbbd1
      
https://github.com/qemu/qemu/commit/cfc3fef6b4e493bf1a7ee16790ad584e20dfbbd1
  Author: Peter Maydell <address@hidden>
  Date:   2019-03-12 (Tue, 12 Mar 2019)

  Changed paths:
    M audio/Makefile.objs
    M audio/alsaaudio.c
    M audio/audio.c
    M audio/audio.h
    M audio/audio_int.h
    A audio/audio_legacy.c
    M audio/audio_template.h
    M audio/audio_win_int.c
    M audio/coreaudio.c
    M audio/dsound_template.h
    M audio/dsoundaudio.c
    M audio/noaudio.c
    M audio/ossaudio.c
    M audio/paaudio.c
    M audio/sdlaudio.c
    M audio/spiceaudio.c
    M audio/wavaudio.c
    M audio/wavcapture.c
    M hw/arm/omap2.c
    M hw/audio/ac97.c
    M hw/audio/adlib.c
    M hw/audio/cs4231a.c
    M hw/audio/es1370.c
    M hw/audio/gus.c
    M hw/audio/hda-codec.c
    M hw/audio/lm4549.c
    M hw/audio/milkymist-ac97.c
    M hw/audio/pcspk.c
    M hw/audio/sb16.c
    M hw/audio/wm8750.c
    M hw/display/xlnx_dp.c
    M hw/input/tsc210x.c
    M hw/usb/dev-audio.c
    M qapi/Makefile.objs
    A qapi/audio.json
    M qapi/qapi-schema.json
    M qemu-deprecated.texi
    M qemu-options.hx
    M ui/vnc.c
    M vl.c

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/kraxel/tags/audio-20190312-pull-request' into staging

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) <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann <address@hidden>" [full]
# gpg:                 aka "Gerd Hoffmann (private) <address@hidden>" [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 <address@hidden>

# Conflicts:
#       qemu-deprecated.texi


Compare: https://github.com/qemu/qemu/compare/2cb73afa6a24...cfc3fef6b4e4