audio: Rename hw/audio/audio.h to hw/audio/soundhw.h

All the functions in hw/audio/audio.h are called "soundhw_*()"
and live in hw/audio/audiohw.c. Rename the header file for
consistency.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>
Message-id: 20170508205735.23444-4-ehabkost@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>

diff --git a/arch_init.c b/arch_init.c
index 74ca62f5085b8b1443548cb33a3c6ea74daf9537..a0b8ed616757b030861dc2362dda6b6cf8ecaa5c 100644 (file)
--- a/arch_init.c
+++ b/arch_init.c
@@ -27,7 +27,7 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/arch_init.h"
 #include "hw/pci/pci.h"
-#include "hw/audio/audio.h"
+#include "hw/audio/soundhw.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "qmp-commands.h"

diff --git a/hw/audio/ac97.c b/hw/audio/ac97.c
index c30657501ca42b7b6ebd2007f70da737dc7ec9ef..959c78626107cef29bc024f59719d8117e61b075 100644 (file)
--- a/hw/audio/ac97.c
+++ b/hw/audio/ac97.c
@@ -19,7 +19,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/audio/audio.h"
+#include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/pci/pci.h"
 #include "sysemu/dma.h"

diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 09b8248cdac0ffc7f69217b6c058b5a9470ce98c..c6e0f10c16356ded2fea2ed80d683bbfb63a0bfb 100644 (file)
--- a/hw/audio/adlib.c
+++ b/hw/audio/adlib.c
@@ -25,7 +25,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
-#include "hw/audio/audio.h"
+#include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/isa/isa.h"
 

diff --git a/hw/audio/cs4231a.c b/hw/audio/cs4231a.c
index 3ecd0582bf63510eaca4decd9c1a632117be3a4b..096e8e98d73dca80d225b37c523beacdf8544d30 100644 (file)
--- a/hw/audio/cs4231a.c
+++ b/hw/audio/cs4231a.c
@@ -23,7 +23,7 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/audio/audio.h"
+#include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev.h"

diff --git a/hw/audio/es1370.c b/hw/audio/es1370.c
index fe64c1ac3749d7ed259035557f2c602e5340d964..dd7c23d185954d5047f41f8eca9c96622b7005e4 100644 (file)
--- a/hw/audio/es1370.c
+++ b/hw/audio/es1370.c
@@ -28,7 +28,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/audio/audio.h"
+#include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/pci/pci.h"
 #include "sysemu/dma.h"

diff --git a/hw/audio/gus.c b/hw/audio/gus.c
index ec103a4db9501be3bf8cd078a822b437c0de3efc..3e864cd36d4758252f8cfd3aa78d4da0bce2785c 100644 (file)
--- a/hw/audio/gus.c
+++ b/hw/audio/gus.c
@@ -24,7 +24,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "hw/hw.h"
-#include "hw/audio/audio.h"
+#include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/isa/isa.h"
 #include "gusemu.h"

diff --git a/hw/audio/intel-hda.c b/hw/audio/intel-hda.c
index 2c497eb174b72d7c1ba39f874407f0717ce90a38..06acc98f7b2df54d49efdf3344ea7436b80eca2c 100644 (file)
--- a/hw/audio/intel-hda.c
+++ b/hw/audio/intel-hda.c
@@ -22,7 +22,7 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/msi.h"
 #include "qemu/timer.h"
-#include "hw/audio/audio.h"
+#include "hw/audio/soundhw.h"
 #include "intel-hda.h"
 #include "intel-hda-defs.h"
 #include "sysemu/dma.h"

diff --git a/hw/audio/pcspk.c b/hw/audio/pcspk.c
index 9b99358d874717f02f2efaf89358cadb4bc66aa8..f643b122bb10a7bed7cf50d35a31959aff89ecf2 100644 (file)
--- a/hw/audio/pcspk.c
+++ b/hw/audio/pcspk.c
@@ -26,7 +26,7 @@
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/isa/isa.h"
-#include "hw/audio/audio.h"
+#include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "qemu/timer.h"
 #include "hw/timer/i8254.h"

diff --git a/hw/audio/sb16.c b/hw/audio/sb16.c
index 6b4427f24286682c754e9956a7f20783b6b0f7d8..6ab2f6f89ad7fd386ad54e7e5b45c97a9d7253c8 100644 (file)
--- a/hw/audio/sb16.c
+++ b/hw/audio/sb16.c
@@ -23,7 +23,7 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
-#include "hw/audio/audio.h"
+#include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev.h"

diff --git a/hw/audio/soundhw.c b/hw/audio/soundhw.c
index 29565da93d4b31238a9767c1c76a74c9667c66a4..e698909d348b1b8185965bdedc15374b40875857 100644 (file)
--- a/hw/audio/soundhw.c
+++ b/hw/audio/soundhw.c
@@ -28,7 +28,7 @@
 #include "qom/object.h"
 #include "hw/isa/isa.h"
 #include "hw/pci/pci.h"
-#include "hw/audio/audio.h"
+#include "hw/audio/soundhw.h"
 
 struct soundhw {
     const char *name;

diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 4a7d2cfbe00d2330cfa71421cd9b6906fe7b9b3a..d16646c95d1a3711e8ff5eb439fc85c719e952b9 100644 (file)
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -36,7 +36,7 @@
 #include "hw/pci/pci_host.h"
 #include "hw/ppc/ppc.h"
 #include "hw/boards.h"
-#include "hw/audio/audio.h"
+#include "hw/audio/soundhw.h"
 #include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "hw/ide.h"

diff --git a/include/hw/audio/audio.h b/include/hw/audio/audio.h
deleted file mode 100644 (file)
index 119f7d7..0000000
--- a/include/hw/audio/audio.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef HW_AUDIO_H
-#define HW_AUDIO_H
-
-void isa_register_soundhw(const char *name, const char *descr,
-                          int (*init_isa)(ISABus *bus));
-
-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/hw/audio/soundhw.h b/include/hw/audio/soundhw.h
new file mode 100644 (file)
index 0000000..119f7d7
--- /dev/null
+++ b/include/hw/audio/soundhw.h
@@ -0,0 +1,13 @@
+#ifndef HW_AUDIO_H
+#define HW_AUDIO_H
+
+void isa_register_soundhw(const char *name, const char *descr,
+                          int (*init_isa)(ISABus *bus));
+
+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/vl.c b/vl.c
index 8f08f422a771cb8509fbd2384e2ad7f71588582b..4d5eb6d215ec72456c70dcbb71593ab7083cf306 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -89,7 +89,7 @@ int main(int argc, char **argv)
 #include "migration/block.h"
 #include "sysemu/tpm.h"
 #include "sysemu/dma.h"
-#include "hw/audio/audio.h"
+#include "hw/audio/soundhw.h"
 #include "audio/audio.h"
 #include "migration/migration.h"
 #include "sysemu/cpus.h"