diff options
| author | Peter Maydell | 2018-10-29 16:15:14 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-10-29 16:15:14 +0100 |
| commit | db7069133e2aab279efa999b7de3d241bb219acf (patch) | |
| tree | fcc5b915b2dffeeb8fea9e7ba193d2a2deb18ef6 /include | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/vga-20181029-pull-request' ... (diff) | |
| parent | audio: use TYPE_MV88W8618_AUDIO instead of hardcoded string (diff) | |
| download | qemu-db7069133e2aab279efa999b7de3d241bb219acf.tar.gz qemu-db7069133e2aab279efa999b7de3d241bb219acf.tar.xz qemu-db7069133e2aab279efa999b7de3d241bb219acf.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/audio-20181029-pull-request' into staging
audio: qom cleanups.
# gpg: Signature made Mon 29 Oct 2018 13:37:09 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/audio-20181029-pull-request:
audio: use TYPE_MV88W8618_AUDIO instead of hardcoded string
audio: use object link instead of qdev property to pass wm8750 reference
audio: use TYPE_WM8750 instead of a hardcoded string
hw: AC97: make it more QOMconventional
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/audio/wm8750.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/hw/audio/wm8750.h b/include/hw/audio/wm8750.h index 84e7a119bb..e12cb886d1 100644 --- a/include/hw/audio/wm8750.h +++ b/include/hw/audio/wm8750.h @@ -17,6 +17,7 @@ #include "hw/hw.h" #define TYPE_WM8750 "wm8750" +#define TYPE_MV88W8618_AUDIO "mv88w8618_audio" typedef void data_req_cb(void *opaque, int free_out, int free_in); |