diff options
| author | Peter Maydell | 2020-12-15 14:58:18 +0100 |
|---|---|---|
| committer | Peter Maydell | 2020-12-15 14:58:18 +0100 |
| commit | ffb1e2ed7cd76df7537562f7e0b2bd5bf8b0842d (patch) | |
| tree | 22a5e232f302cdc34f87f5d8c304878b646fb6f8 /hw | |
| parent | Merge remote-tracking branch 'remotes/vivier2/tags/trivial-branch-for-6.0-pul... (diff) | |
| parent | audio: add sanity check (diff) | |
| download | qemu-ffb1e2ed7cd76df7537562f7e0b2bd5bf8b0842d.tar.gz qemu-ffb1e2ed7cd76df7537562f7e0b2bd5bf8b0842d.tar.xz qemu-ffb1e2ed7cd76df7537562f7e0b2bd5bf8b0842d.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/audio-20201215-pull-request' into staging
audio: coreaudio playback state fixes.
audio: misc cleanups.
# gpg: Signature made Tue 15 Dec 2020 13:47:57 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-20201215-pull-request:
audio: add sanity check
audio: Simplify audio_bug() removing old code
cs4231: Get rid of empty property array
audio: remove unused function audio_is_cleaning_up()
coreaudio: always stop audio playback on shut down
coreaudio: don't start playback in init routine
coreaudio: rename misnamed variable fake_as
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/audio/cs4231.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/hw/audio/cs4231.c b/hw/audio/cs4231.c index 8e9554ce9b..209c05a0a0 100644 --- a/hw/audio/cs4231.c +++ b/hw/audio/cs4231.c @@ -160,17 +160,12 @@ static void cs4231_init(Object *obj) sysbus_init_irq(dev, &s->irq); } -static Property cs4231_properties[] = { - {.name = NULL}, -}; - static void cs4231_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); dc->reset = cs_reset; dc->vmsd = &vmstate_cs4231; - device_class_set_props(dc, cs4231_properties); } static const TypeInfo cs4231_info = { |