From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1et7Dj-0002jU-3r for qemu-devel@nongnu.org; Tue, 06 Mar 2018 02:41:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1et7De-0000BQ-8M for qemu-devel@nongnu.org; Tue, 06 Mar 2018 02:41:11 -0500 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:46640 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1et7De-0000Ab-4D for qemu-devel@nongnu.org; Tue, 06 Mar 2018 02:41:06 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6FE96EAEA0 for ; Tue, 6 Mar 2018 07:41:01 +0000 (UTC) From: Gerd Hoffmann Date: Tue, 6 Mar 2018 08:40:48 +0100 Message-Id: <20180306074053.22856-3-kraxel@redhat.com> In-Reply-To: <20180306074053.22856-1-kraxel@redhat.com> References: <20180306074053.22856-1-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 2/7] audio: add module loading support List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann Make audio_driver_lookup() try load the module in case it doesn't find the driver in the registry. Also load all modules for -audio-help, so the help output includes the help text for modular audio drivers. Signed-off-by: Gerd Hoffmann --- include/qemu/module.h | 1 + audio/audio.c | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/qemu/module.h b/include/qemu/module.h index 9fea75aaeb..54300ab6e5 100644 --- a/include/qemu/module.h +++ b/include/qemu/module.h @@ -54,6 +54,7 @@ typedef enum { #define block_module_load_one(lib) module_load_one("block-", lib) #define ui_module_load_one(lib) module_load_one("ui-", lib) +#define audio_module_load_one(lib) module_load_one("audio-", lib) void register_module_init(void (*fn)(void), module_init_type type); void register_dso_module_init(void (*fn)(void), module_init_type type); diff --git a/audio/audio.c b/audio/audio.c index 2384612b87..6eccdb17ee 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -68,9 +68,26 @@ audio_driver *audio_driver_lookup(const char *name) return d; } } + + audio_module_load_one(name); + QLIST_FOREACH(d, &audio_drivers, next) { + if (strcmp(name, d->name) == 0) { + return d; + } + } + return NULL; } +static void audio_module_load_all(void) +{ + int i; + + for (i = 0; i < ARRAY_SIZE(audio_prio_list); i++) { + audio_driver_lookup(audio_prio_list[i]); + } +} + struct fixed_settings { int enabled; int nb_voices; @@ -1675,6 +1692,9 @@ void AUD_help (void) { struct audio_driver *d; + /* make sure we print the help text for modular drivers too */ + audio_module_load_all(); + audio_process_options ("AUDIO", audio_options); QLIST_FOREACH(d, &audio_drivers, next) { if (d->options) { -- 2.9.3