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 <ehabkost@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Message-id: 20170508205735.23444-3-ehabkost@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Eduardo Habkost 2017-05-08 17:57:34 -03:00 committed by Gerd Hoffmann
parent ca89f72092
commit 4c565674a2
4 changed files with 4 additions and 4 deletions

View File

@ -129,7 +129,7 @@ void select_soundhw(const char *optarg)
} }
} }
void audio_init(void) void soundhw_init(void)
{ {
struct soundhw *c; struct soundhw *c;
ISABus *isa_bus = (ISABus *) object_resolve_path_type("", TYPE_ISA_BUS, NULL); ISABus *isa_bus = (ISABus *) object_resolve_path_type("", TYPE_ISA_BUS, NULL);

View File

@ -783,7 +783,7 @@ static void ibm_40p_init(MachineState *machine)
&cmos_checksum); &cmos_checksum);
/* initialize audio subsystem */ /* initialize audio subsystem */
audio_init(); soundhw_init();
/* add some more devices */ /* add some more devices */
if (defaults_enabled()) { if (defaults_enabled()) {

View File

@ -7,7 +7,7 @@ void isa_register_soundhw(const char *name, const char *descr,
void pci_register_soundhw(const char *name, const char *descr, void pci_register_soundhw(const char *name, const char *descr,
int (*init_pci)(PCIBus *bus)); int (*init_pci)(PCIBus *bus));
void audio_init(void); void soundhw_init(void);
void select_soundhw(const char *optarg); void select_soundhw(const char *optarg);
#endif #endif

2
vl.c
View File

@ -4575,7 +4575,7 @@ int main(int argc, char **argv, char **envp)
realtime_init(); realtime_init();
audio_init(); soundhw_init();
if (hax_enabled()) { if (hax_enabled()) {
hax_sync_vcpus(); hax_sync_vcpus();