audio: Rename audio_init() to soundhw_init()

To make it consistent with the remaining soundhw.c functions and
avoid confusion with the audio_init() function in audio/audio.c,
rename audio_init() to soundhw_init().

Signed-off-by: Eduardo Habkost <[email protected]>
Reviewed-by: David Gibson <[email protected]>
Message-id: 20170508205735[email protected]
Signed-off-by: Gerd Hoffmann <[email protected]>

diff --git a/hw/audio/soundhw.c b/hw/audio/soundhw.c
index 5e96b73c81497baf6a564e6bee978f03a495d927..29565da93d4b31238a9767c1c76a74c9667c66a4 100644 (file)
--- a/hw/audio/soundhw.c
+++ b/hw/audio/soundhw.c
@@ -129,7 +129,7 @@ void select_soundhw(const char *optarg)
     }
 }
 
-void audio_init(void)
+void soundhw_init(void)
 {
     struct soundhw *c;
     ISABus *isa_bus = (ISABus *) object_resolve_path_type("", TYPE_ISA_BUS, NULL);

diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 96a4813b3feb2683055d2439495b4665103861c3..4a7d2cfbe00d2330cfa71421cd9b6906fe7b9b3a 100644 (file)
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -783,7 +783,7 @@ static void ibm_40p_init(MachineState *machine)
                        &cmos_checksum);
 
     /* initialize audio subsystem */
-    audio_init();
+    soundhw_init();
 
     /* add some more devices */
     if (defaults_enabled()) {

diff --git a/include/hw/audio/audio.h b/include/hw/audio/audio.h
index 259bb2cf961f33fb3f65f5cbb77f3b4ba653b82c..119f7d78d5062f539c004d3302245c2a6566d0d1 100644 (file)
--- a/include/hw/audio/audio.h
+++ b/include/hw/audio/audio.h
@@ -7,7 +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 audio_init(void);
+void soundhw_init(void);
 void select_soundhw(const char *optarg);
 
 #endif

diff --git a/vl.c b/vl.c
index 6e46889cdebd30c45dbac682a80a3a8a0b572db9..8f08f422a771cb8509fbd2384e2ad7f71588582b 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -4575,7 +4575,7 @@ int main(int argc, char **argv, char **envp)
 
     realtime_init();
 
-    audio_init();
+    soundhw_init();
 
     if (hax_enabled()) {
         hax_sync_vcpus();