From: Marc-André Lureau <[email protected]> module_object_class_by_name() handles loading the module providing the requested object.
Signed-off-by: Marc-André Lureau <[email protected]> --- audio/audio_int.h | 2 -- audio/alsaaudio.c | 1 - audio/audio.c | 43 +++++++++++++------------------------------ audio/dbusaudio.c | 1 - audio/dsoundaudio.c | 1 - audio/jackaudio.c | 1 - audio/noaudio.c | 1 - audio/ossaudio.c | 1 - audio/paaudio.c | 1 - audio/pwaudio.c | 1 - audio/sdlaudio.c | 1 - audio/sndioaudio.c | 1 - audio/spiceaudio.c | 1 - audio/wavaudio.c | 1 - audio/coreaudio.m | 1 - 15 files changed, 13 insertions(+), 45 deletions(-) diff --git a/audio/audio_int.h b/audio/audio_int.h index e289ef5f66..eaf7838bfe 100644 --- a/audio/audio_int.h +++ b/audio/audio_int.h @@ -266,8 +266,6 @@ extern const struct mixeng_volume nominal_volume; extern const char *audio_prio_list[]; -void audio_driver_register(audio_driver *drv); - void audio_pcm_init_info (struct audio_pcm_info *info, struct audsettings *as); void audio_pcm_info_clear_buf (struct audio_pcm_info *info, void *buf, int len); diff --git a/audio/alsaaudio.c b/audio/alsaaudio.c index c28ee05b93..1056bdd63d 100644 --- a/audio/alsaaudio.c +++ b/audio/alsaaudio.c @@ -984,7 +984,6 @@ static const TypeInfo audio_alsa_info = { static void register_audio_alsa(void) { - audio_driver_register(&alsa_audio_driver); type_register_static(&audio_alsa_info); } type_init(register_audio_alsa); diff --git a/audio/audio.c b/audio/audio.c index 31459f9707..8523f14daa 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -67,40 +67,21 @@ const char *audio_prio_list[] = { NULL }; -static QLIST_HEAD(, audio_driver) audio_drivers; static AudiodevListHead audiodevs = QSIMPLEQ_HEAD_INITIALIZER(audiodevs); static AudiodevListHead default_audiodevs = QSIMPLEQ_HEAD_INITIALIZER(default_audiodevs); - -void audio_driver_register(audio_driver *drv) -{ - QLIST_INSERT_HEAD(&audio_drivers, drv, next); -} - -static audio_driver *audio_driver_lookup(const char *name) +static AudioBackendClass *audio_be_class_by_name(const char *name) { - struct audio_driver *d; - Error *local_err = NULL; - int rv; + g_autofree char *tname = g_strconcat("audio-", name, NULL); + ObjectClass *oc = module_object_class_by_name(tname); - QLIST_FOREACH(d, &audio_drivers, next) { - if (strcmp(name, d->name) == 0) { - return d; - } - } - rv = audio_module_load(name, &local_err); - if (rv > 0) { - QLIST_FOREACH(d, &audio_drivers, next) { - if (strcmp(name, d->name) == 0) { - return d; - } - } - } else if (rv < 0) { - error_report_err(local_err); + if (!oc || !object_class_dynamic_cast(oc, TYPE_AUDIO_BACKEND)) { + return NULL; } - return NULL; + + return AUDIO_BACKEND_CLASS(oc); } static AudioBackend *default_audio_be; @@ -1765,7 +1746,7 @@ static const VMStateDescription vmstate_audio = { void audio_create_default_audiodevs(void) { for (int i = 0; audio_prio_list[i]; i++) { - if (audio_driver_lookup(audio_prio_list[i])) { + if (audio_be_class_by_name(audio_prio_list[i]) != NULL) { QDict *dict = qdict_new(); Audiodev *dev = NULL; Visitor *v; @@ -2129,9 +2110,11 @@ void audio_help(void) printf("Available audio drivers:\n"); for (i = 0; i < AUDIODEV_DRIVER__MAX; i++) { - audio_driver *driver = audio_driver_lookup(AudiodevDriver_str(i)); - if (driver) { - printf("%s\n", driver->name); + const char *name = AudiodevDriver_str(i); + AudioBackendClass *be = audio_be_class_by_name(name); + + if (be) { + printf("%s\n", name); } } } diff --git a/audio/dbusaudio.c b/audio/dbusaudio.c index edd551a80f..187da7fa65 100644 --- a/audio/dbusaudio.c +++ b/audio/dbusaudio.c @@ -749,7 +749,6 @@ static const TypeInfo audio_dbus_info = { static void register_audio_dbus(void) { - audio_driver_register(&dbus_audio_driver); type_register_static(&audio_dbus_info); } type_init(register_audio_dbus); diff --git a/audio/dsoundaudio.c b/audio/dsoundaudio.c index 341df9e6d8..9c6ff93022 100644 --- a/audio/dsoundaudio.c +++ b/audio/dsoundaudio.c @@ -730,7 +730,6 @@ static const TypeInfo audio_dsound_info = { static void register_audio_dsound(void) { - audio_driver_register(&dsound_audio_driver); type_register_static(&audio_dsound_info); } type_init(register_audio_dsound); diff --git a/audio/jackaudio.c b/audio/jackaudio.c index 7706fbcb6e..d472f4e5c6 100644 --- a/audio/jackaudio.c +++ b/audio/jackaudio.c @@ -728,7 +728,6 @@ static const TypeInfo audio_jack_info = { static void register_audio_jack(void) { qemu_mutex_init(&qjack_shutdown_lock); - audio_driver_register(&jack_driver); type_register_static(&audio_jack_info); #if !defined(WIN32) && defined(CONFIG_PTHREAD_SETNAME_NP_W_TID) jack_set_thread_creator(qjack_thread_creator); diff --git a/audio/noaudio.c b/audio/noaudio.c index 6f5af23004..b788bc5f8e 100644 --- a/audio/noaudio.c +++ b/audio/noaudio.c @@ -174,7 +174,6 @@ static const TypeInfo audio_none_info = { static void register_audio_none(void) { - audio_driver_register(&no_audio_driver); type_register_static(&audio_none_info); } type_init(register_audio_none); diff --git a/audio/ossaudio.c b/audio/ossaudio.c index f5ce04928a..60aff632a6 100644 --- a/audio/ossaudio.c +++ b/audio/ossaudio.c @@ -808,7 +808,6 @@ static const TypeInfo audio_oss_info = { static void register_audio_oss(void) { - audio_driver_register(&oss_audio_driver); type_register_static(&audio_oss_info); } type_init(register_audio_oss); diff --git a/audio/paaudio.c b/audio/paaudio.c index abeb2c2d81..02fb29cb2f 100644 --- a/audio/paaudio.c +++ b/audio/paaudio.c @@ -967,7 +967,6 @@ static const TypeInfo audio_pa_info = { static void register_audio_pa(void) { - audio_driver_register(&pa_audio_driver); type_register_static(&audio_pa_info); } type_init(register_audio_pa); diff --git a/audio/pwaudio.c b/audio/pwaudio.c index 5b51a933ae..c42f81b820 100644 --- a/audio/pwaudio.c +++ b/audio/pwaudio.c @@ -884,7 +884,6 @@ static const TypeInfo audio_pw_info = { static void register_audio_pw(void) { - audio_driver_register(&pw_audio_driver); type_register_static(&audio_pw_info); } diff --git a/audio/sdlaudio.c b/audio/sdlaudio.c index 65fab1427e..e52616bec8 100644 --- a/audio/sdlaudio.c +++ b/audio/sdlaudio.c @@ -527,7 +527,6 @@ static const TypeInfo audio_sdl_info = { static void register_audio_sdl(void) { - audio_driver_register(&sdl_audio_driver); type_register_static(&audio_sdl_info); } type_init(register_audio_sdl); diff --git a/audio/sndioaudio.c b/audio/sndioaudio.c index 1a4912fb60..c1468ef2b9 100644 --- a/audio/sndioaudio.c +++ b/audio/sndioaudio.c @@ -591,7 +591,6 @@ static const TypeInfo audio_sndio_info = { static void register_audio_sndio(void) { - audio_driver_register(&sndio_audio_driver); type_register_static(&audio_sndio_info); } diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c index d8451d5877..1165f88400 100644 --- a/audio/spiceaudio.c +++ b/audio/spiceaudio.c @@ -361,7 +361,6 @@ static const TypeInfo audio_spice_info = { static void register_audio_spice(void) { - audio_driver_register(&spice_audio_driver); type_register_static(&audio_spice_info); } type_init(register_audio_spice); diff --git a/audio/wavaudio.c b/audio/wavaudio.c index 3c1f352f11..dbf0e8e00c 100644 --- a/audio/wavaudio.c +++ b/audio/wavaudio.c @@ -250,7 +250,6 @@ static const TypeInfo audio_wav_info = { static void register_audio_wav(void) { - audio_driver_register(&wav_audio_driver); type_register_static(&audio_wav_info); } type_init(register_audio_wav); diff --git a/audio/coreaudio.m b/audio/coreaudio.m index d1a837f4bc..9e4266ee97 100644 --- a/audio/coreaudio.m +++ b/audio/coreaudio.m @@ -709,7 +709,6 @@ static void coreaudio_audio_fini (void *opaque) static void register_audio_coreaudio(void) { - audio_driver_register(&coreaudio_audio_driver); type_register_static(&audio_coreaudio_info); } type_init(register_audio_coreaudio); -- 2.51.1
