From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>, "Thomas Huth" <thuth@redhat.com>,
berrange@redhat.com, qemu-block@nongnu.org,
"Michael S. Tsirkin" <mst@redhat.com>,
"Michael Roth" <michael.roth@amd.com>,
"Cornelia Huck" <cohuck@redhat.com>, "Peter Lieven" <pl@kamp.de>,
"Markus Armbruster" <armbru@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
qemu-s390x@nongnu.org, "Gerd Hoffmann" <kraxel@redhat.com>,
"Ronnie Sahlberg" <ronniesahlberg@gmail.com>,
"Samuel Thibault" <samuel.thibault@ens-lyon.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Eric Blake" <eblake@redhat.com>,
"Christian Borntraeger" <borntraeger@de.ibm.com>
Subject: [PATCH v2 14/18] modules: use modinfo for dependencies
Date: Thu, 10 Jun 2021 07:57:51 +0200 [thread overview]
Message-ID: <20210610055755.538119-15-kraxel@redhat.com> (raw)
In-Reply-To: <20210610055755.538119-1-kraxel@redhat.com>
Use module database for module dependencies.
Drop hard-coded dependency list.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
util/module.c | 55 ++++++++++++++++++++-------------------------------
1 file changed, 21 insertions(+), 34 deletions(-)
diff --git a/util/module.c b/util/module.c
index b0ea8c57d438..fd5fc059e14a 100644
--- a/util/module.c
+++ b/util/module.c
@@ -254,28 +254,6 @@ static int module_load_file(const char *fname, bool mayfail, bool export_symbols
out:
return ret;
}
-
-static const struct {
- const char *name;
- const char *dep;
-} module_deps[] = {
- { "audio-spice", "ui-spice-core" },
- { "chardev-spice", "ui-spice-core" },
- { "hw-display-qxl", "ui-spice-core" },
- { "ui-spice-app", "ui-spice-core" },
- { "ui-spice-app", "chardev-spice" },
-
- { "hw-display-virtio-gpu-gl", "hw-display-virtio-gpu" },
- { "hw-display-virtio-gpu-pci-gl", "hw-display-virtio-gpu-pci" },
- { "hw-display-virtio-vga-gl", "hw-display-virtio-vga" },
-
-#ifdef CONFIG_OPENGL
- { "ui-egl-headless", "ui-opengl" },
- { "ui-gtk", "ui-opengl" },
- { "ui-sdl", "ui-opengl" },
- { "ui-spice-core", "ui-opengl" },
-#endif
-};
#endif
bool module_load_one(const char *prefix, const char *lib_name, bool mayfail)
@@ -289,9 +267,11 @@ bool module_load_one(const char *prefix, const char *lib_name, bool mayfail)
#endif
char *module_name;
int i = 0;
- int ret, dep;
+ int ret;
bool export_symbols = false;
static GHashTable *loaded_modules;
+ ModuleInfoList *modlist;
+ strList *sl;
if (!g_module_supported()) {
fprintf(stderr, "Module is not supported by system.\n");
@@ -304,17 +284,6 @@ bool module_load_one(const char *prefix, const char *lib_name, bool mayfail)
module_name = g_strdup_printf("%s%s", prefix, lib_name);
- for (dep = 0; dep < ARRAY_SIZE(module_deps); dep++) {
- if (strcmp(module_name, module_deps[dep].name) == 0) {
- /* we depend on another module */
- module_load_one("", module_deps[dep].dep, false);
- }
- if (strcmp(module_name, module_deps[dep].dep) == 0) {
- /* another module depends on us */
- export_symbols = true;
- }
- }
-
if (g_hash_table_contains(loaded_modules, module_name)) {
g_free(module_name);
return true;
@@ -324,6 +293,24 @@ bool module_load_one(const char *prefix, const char *lib_name, bool mayfail)
module_load_path_init();
module_load_modinfo();
+ for (modlist = modinfo->list; modlist != NULL; modlist = modlist->next) {
+ if (modlist->value->has_deps) {
+ if (strcmp(modlist->value->name, module_name) == 0) {
+ /* we depend on other module(s) */
+ for (sl = modlist->value->deps; sl != NULL; sl = sl->next) {
+ module_load_one("", sl->value, false);
+ }
+ } else {
+ for (sl = modlist->value->deps; sl != NULL; sl = sl->next) {
+ if (strcmp(module_name, sl->value) == 0) {
+ /* another module depends on us */
+ export_symbols = true;
+ }
+ }
+ }
+ }
+ }
+
for (i = 0; i < module_ndirs; i++) {
fname = g_strdup_printf("%s/%s%s",
module_dirs[i], module_name, CONFIG_HOST_DSOSUF);
--
2.31.1
next prev parent reply other threads:[~2021-06-10 6:09 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 5:57 [PATCH v2 00/18] modules: add metadata database Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 01/18] modules: add metadata macros, add qxl module annotations Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 02/18] qapi: add ModuleInfo schema Gerd Hoffmann
2021-06-14 7:48 ` Markus Armbruster
2021-06-14 15:21 ` Gerd Hoffmann
2021-06-14 16:53 ` Markus Armbruster
2021-06-10 5:57 ` [PATCH v2 03/18] modules: add qemu-modinfo utility Gerd Hoffmann
2021-06-10 13:04 ` Gerd Hoffmann
2021-06-10 13:13 ` Daniel P. Berrangé
2021-06-14 8:34 ` Paolo Bonzini
2021-06-14 14:36 ` Paolo Bonzini
2021-06-15 4:49 ` Gerd Hoffmann
2021-06-15 7:56 ` Gerd Hoffmann
2021-06-15 13:07 ` Gerd Hoffmann
2021-06-15 13:35 ` Paolo Bonzini
2021-06-16 9:16 ` Gerd Hoffmann
2021-06-16 10:53 ` Paolo Bonzini
2021-06-14 15:01 ` Gerd Hoffmann
2021-06-14 15:08 ` Daniel P. Berrangé
2021-06-15 4:54 ` Gerd Hoffmann
2021-06-15 9:27 ` Daniel P. Berrangé
2021-06-10 5:57 ` [PATCH v2 04/18] modules: add virtio-gpu module annotations Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 05/18] modules: add chardev " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 06/18] modules: add audio " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 07/18] modules: add usb-redir " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 08/18] modules: add ccid " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 09/18] modules: add ui " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 10/18] modules: add s390x " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 11/18] modules: add block " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 12/18] modules: add module_load_path_init helper Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 13/18] modules: load modinfo.json Gerd Hoffmann
2021-06-10 5:57 ` Gerd Hoffmann [this message]
2021-06-10 5:57 ` [PATCH v2 15/18] modules: use modinfo for qom load Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 16/18] modules: use modinfo for qemu opts load Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 17/18] modules: check arch and block load on mismatch Gerd Hoffmann
2021-06-10 12:35 ` Daniel P. Berrangé
2021-06-10 12:57 ` Gerd Hoffmann
2021-06-10 13:06 ` Daniel P. Berrangé
2021-06-10 14:03 ` Gerd Hoffmann
2021-06-14 11:23 ` Claudio Fontana
2021-06-14 13:44 ` Gerd Hoffmann
2021-06-14 13:52 ` Daniel P. Berrangé
2021-06-14 14:10 ` Gerd Hoffmann
2021-06-14 11:19 ` Claudio Fontana
2021-06-10 5:57 ` [PATCH v2 18/18] [fixup] module_load_modinfo Gerd Hoffmann
2021-06-10 6:24 ` Gerd Hoffmann
2021-06-10 8:32 ` [PATCH v2 00/18] modules: add metadata database Claudio Fontana
2021-06-10 9:54 ` Gerd Hoffmann
2021-06-14 11:31 ` Claudio Fontana
2021-06-14 14:07 ` Gerd Hoffmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210610055755.538119-15-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=michael.roth@amd.com \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=pl@kamp.de \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=ronniesahlberg@gmail.com \
--cc=samuel.thibault@ens-lyon.org \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).