On 23/01/2026 07:49, marcandre.lureau@redhat.com wrote:
> From: Marc-André Lureau <marcandre.lureau@redhat.com>
>
> module_object_class_by_name() handles loading the module providing the
> requested object.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
> ---
> 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 0b97c8edee3..446ba1d52c6 100644
> --- a/audio/audio_int.h
> +++ b/audio/audio_int.h
> @@ -259,8 +259,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, const 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 881f3d0349d..e8541e1a2a3 100644
> --- a/audio/alsaaudio.c
> +++ b/audio/alsaaudio.c
> @@ -972,7 +972,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 f6896229cfb..53b3ad09bf9 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;
> @@ -1763,7 +1744,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;
> @@ -2128,9 +2109,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 9b25269a2d9..2e76d650df1 100644
> --- a/audio/dbusaudio.c
> +++ b/audio/dbusaudio.c
> @@ -738,7 +738,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 f1902e55262..3de6a3dee9c 100644
> --- a/audio/dsoundaudio.c
> +++ b/audio/dsoundaudio.c
> @@ -720,7 +720,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 48a466ed532..dc86724d28f 100644
> --- a/audio/jackaudio.c
> +++ b/audio/jackaudio.c
> @@ -718,7 +718,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 e6e8bfd3323..fe649523e88 100644
> --- a/audio/noaudio.c
> +++ b/audio/noaudio.c
> @@ -164,7 +164,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 eb98cc62e9c..013958e1344 100644
> --- a/audio/ossaudio.c
> +++ b/audio/ossaudio.c
> @@ -798,7 +798,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 cf67a9f7593..941f75f25e8 100644
> --- a/audio/paaudio.c
> +++ b/audio/paaudio.c
> @@ -957,7 +957,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 3c2fbccaea4..ed48a9754fe 100644
> --- a/audio/pwaudio.c
> +++ b/audio/pwaudio.c
> @@ -874,7 +874,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 cc05c1d4531..1a5e3f8a969 100644
> --- a/audio/sdlaudio.c
> +++ b/audio/sdlaudio.c
> @@ -517,7 +517,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 6a3d93efd51..2fa519e3eab 100644
> --- a/audio/sndioaudio.c
> +++ b/audio/sndioaudio.c
> @@ -581,7 +581,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 bfa249b18c4..db9158284ce 100644
> --- a/audio/spiceaudio.c
> +++ b/audio/spiceaudio.c
> @@ -351,7 +351,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 480da5048fa..50b0fb93936 100644
> --- a/audio/wavaudio.c
> +++ b/audio/wavaudio.c
> @@ -240,7 +240,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 882e47f8c25..710ef0fe6ba 100644
> --- a/audio/coreaudio.m
> +++ b/audio/coreaudio.m
> @@ -699,7 +699,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);
Nice!
Reviewed-by: Mark Cave-Ayland <mark.caveayland@nutanix.com>
ATB,
Mark.