diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-19 16:54:10 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2017-05-19 16:54:14 +0100 |
| commit | 0bb8cacd958631655441ec1c2f7cd9644076b1ac (patch) | |
| tree | 4cca59a176fc3d08eead0e59537cfcd618376c5a /vl.c | |
| parent | a4657d4b918f9a7c655620c90d135fe34e7293ee (diff) | |
| parent | 8a824e4d74213a2da39323304f949c5b4243e1fb (diff) | |
| download | qemu-0bb8cacd958631655441ec1c2f7cd9644076b1ac.tar.gz | |
Merge remote-tracking branch 'kraxel/tags/pull-audio-20170519-1' into staging
audio: move & rename soundhw init code.
# gpg: Signature made Fri 19 May 2017 12:22:51 PM BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# 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
* kraxel/tags/pull-audio-20170519-1:
audio: Rename hw/audio/audio.h to hw/audio/soundhw.h
audio: Rename audio_init() to soundhw_init()
audio: Move arch_init audio code to hw/audio/soundhw.c
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'vl.c')
| -rw-r--r-- | vl.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -89,6 +89,7 @@ int main(int argc, char **argv) #include "migration/block.h" #include "sysemu/tpm.h" #include "sysemu/dma.h" +#include "hw/audio/soundhw.h" #include "audio/audio.h" #include "migration/migration.h" #include "sysemu/cpus.h" @@ -4574,7 +4575,7 @@ int main(int argc, char **argv, char **envp) realtime_init(); - audio_init(); + soundhw_init(); if (hax_enabled()) { hax_sync_vcpus(); |