aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2017-05-19 16:54:10 +0100
committerStefan Hajnoczi <stefanha@redhat.com>2017-05-19 16:54:14 +0100
commit0bb8cacd958631655441ec1c2f7cd9644076b1ac (patch)
tree4cca59a176fc3d08eead0e59537cfcd618376c5a /include
parenta4657d4b918f9a7c655620c90d135fe34e7293ee (diff)
parent8a824e4d74213a2da39323304f949c5b4243e1fb (diff)
downloadqemu-0bb8cacd958631655441ec1c2f7cd9644076b1ac.zip
qemu-0bb8cacd958631655441ec1c2f7cd9644076b1ac.tar.gz
qemu-0bb8cacd958631655441ec1c2f7cd9644076b1ac.tar.bz2
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 'include')
-rw-r--r--include/hw/audio/soundhw.h (renamed from include/hw/audio/audio.h)3
-rw-r--r--include/sysemu/arch_init.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/include/hw/audio/audio.h b/include/hw/audio/soundhw.h
index 55d40f7..119f7d7 100644
--- a/include/hw/audio/audio.h
+++ b/include/hw/audio/soundhw.h
@@ -7,4 +7,7 @@ void isa_register_soundhw(const char *name, const char *descr,
void pci_register_soundhw(const char *name, const char *descr,
int (*init_pci)(PCIBus *bus));
+void soundhw_init(void);
+void select_soundhw(const char *optarg);
+
#endif
diff --git a/include/sysemu/arch_init.h b/include/sysemu/arch_init.h
index 2bf16b2..8751c46 100644
--- a/include/sysemu/arch_init.h
+++ b/include/sysemu/arch_init.h
@@ -28,8 +28,6 @@ enum {
extern const uint32_t arch_type;
-void select_soundhw(const char *optarg);
-void audio_init(void);
int kvm_available(void);
int xen_available(void);