[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 1/8] module: silence errors for module_load_qom_all().
From: |
Gerd Hoffmann |
Subject: |
[PULL 1/8] module: silence errors for module_load_qom_all(). |
Date: |
Thu, 15 Oct 2020 14:53:15 +0200 |
Add mayfail bool parameter to module loading functions. Set it to true
for module_load_qom_all() because device modules might not load into all
system emulation variants. qemu-system-s390x for example will not load
qxl because it lacks vga support. Makes "make check" less chatty.
Drop module_loaded_qom_all check in module_load_qom_one to make sure we
see errors for explicit load requests, i.e. module_load_qom_one("qxl")
failing will log an error no matter whenever module_load_qom_all() was
called before or not.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20200923091217.22662-1-kraxel@redhat.com
---
include/qemu/module.h | 8 ++++----
softmmu/qtest.c | 2 +-
util/module.c | 20 ++++++++++----------
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/include/qemu/module.h b/include/qemu/module.h
index 9121a475c1b6..944d403cbd15 100644
--- a/include/qemu/module.h
+++ b/include/qemu/module.h
@@ -61,15 +61,15 @@ typedef enum {
#define fuzz_target_init(function) module_init(function, \
MODULE_INIT_FUZZ_TARGET)
#define migration_init(function) module_init(function, MODULE_INIT_MIGRATION)
-#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)
+#define block_module_load_one(lib) module_load_one("block-", lib, false)
+#define ui_module_load_one(lib) module_load_one("ui-", lib, false)
+#define audio_module_load_one(lib) module_load_one("audio-", lib, false)
void register_module_init(void (*fn)(void), module_init_type type);
void register_dso_module_init(void (*fn)(void), module_init_type type);
void module_call_init(module_init_type type);
-bool module_load_one(const char *prefix, const char *lib_name);
+bool module_load_one(const char *prefix, const char *lib_name, bool mayfail);
void module_load_qom_one(const char *type);
void module_load_qom_all(void);
diff --git a/softmmu/qtest.c b/softmmu/qtest.c
index 2c6e8dc858c4..7965dc9a16ba 100644
--- a/softmmu/qtest.c
+++ b/softmmu/qtest.c
@@ -757,7 +757,7 @@ static void qtest_process_command(CharBackend *chr, gchar
**words)
g_assert(words[1] && words[2]);
qtest_send_prefix(chr);
- if (module_load_one(words[1], words[2])) {
+ if (module_load_one(words[1], words[2], false)) {
qtest_sendf(chr, "OK\n");
} else {
qtest_sendf(chr, "FAIL\n");
diff --git a/util/module.c b/util/module.c
index a44ec38d9362..836fd444e1fd 100644
--- a/util/module.c
+++ b/util/module.c
@@ -110,7 +110,7 @@ void module_call_init(module_init_type type)
}
#ifdef CONFIG_MODULES
-static int module_load_file(const char *fname)
+static int module_load_file(const char *fname, bool mayfail)
{
GModule *g_module;
void (*sym)(void);
@@ -134,8 +134,10 @@ static int module_load_file(const char *fname)
g_module = g_module_open(fname, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
if (!g_module) {
- fprintf(stderr, "Failed to open module: %s\n",
- g_module_error());
+ if (!mayfail) {
+ fprintf(stderr, "Failed to open module: %s\n",
+ g_module_error());
+ }
ret = -EINVAL;
goto out;
}
@@ -167,7 +169,7 @@ out:
}
#endif
-bool module_load_one(const char *prefix, const char *lib_name)
+bool module_load_one(const char *prefix, const char *lib_name, bool mayfail)
{
bool success = false;
@@ -218,7 +220,7 @@ bool module_load_one(const char *prefix, const char
*lib_name)
for (i = 0; i < n_dirs; i++) {
fname = g_strdup_printf("%s/%s%s",
dirs[i], module_name, CONFIG_HOST_DSOSUF);
- ret = module_load_file(fname);
+ ret = module_load_file(fname, mayfail);
g_free(fname);
fname = NULL;
/* Try loading until loaded a module file */
@@ -275,13 +277,11 @@ void module_load_qom_one(const char *type)
if (!type) {
return;
}
- if (module_loaded_qom_all) {
- return;
- }
for (i = 0; i < ARRAY_SIZE(qom_modules); i++) {
if (strcmp(qom_modules[i].type, type) == 0) {
module_load_one(qom_modules[i].prefix,
- qom_modules[i].module);
+ qom_modules[i].module,
+ false);
return;
}
}
@@ -302,7 +302,7 @@ void module_load_qom_all(void)
/* one module implementing multiple types -> load only once */
continue;
}
- module_load_one(qom_modules[i].prefix, qom_modules[i].module);
+ module_load_one(qom_modules[i].prefix, qom_modules[i].module, true);
}
module_loaded_qom_all = true;
}
--
2.27.0
- [PULL 0/8] Modules 20201015 patches, Gerd Hoffmann, 2020/10/15
- [PULL 2/8] modules: update qom object module comment, Gerd Hoffmann, 2020/10/15
- [PULL 8/8] chardev/spice: build spice chardevs as module, Gerd Hoffmann, 2020/10/15
- [PULL 3/8] ui/spice-app: don't use qemu_chr_open_spice_port directly, Gerd Hoffmann, 2020/10/15
- [PULL 1/8] module: silence errors for module_load_qom_all().,
Gerd Hoffmann <=
- [PULL 5/8] chardev/spice: simplify chardev setup, Gerd Hoffmann, 2020/10/15
- [PULL 6/8] meson: add spice_headers dependency., Gerd Hoffmann, 2020/10/15
- [PULL 4/8] chardev/spice: make qemu_chr_open_spice_port static, Gerd Hoffmann, 2020/10/15
- [PULL 7/8] meson: add spice dependency to core spice source files., Gerd Hoffmann, 2020/10/15
- Re: [PULL 0/8] Modules 20201015 patches, Peter Maydell, 2020/10/16