Commit 4c565674 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Gerd Hoffmann
Browse files

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: default avatarEduardo Habkost <ehabkost@redhat.com>
Reviewed-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Message-id: 20170508205735.23444-3-ehabkost@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent ca89f720

hw/audio/soundhw.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

hw/ppc/prep.c

+1 −1
Original line number Diff line number Diff line
@@ -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()) {

include/hw/audio/audio.h

+1 −1
Original line number Diff line number Diff line
@@ -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

vl.c

+1 −1
Original line number Diff line number Diff line
@@ -4575,7 +4575,7 @@ int main(int argc, char **argv, char **envp) 


    realtime_init();



    audio_init();

    soundhw_init();



    if (hax_enabled()) {

        hax_sync_vcpus();