vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

module: silence errors for module_load_qom_all(). 

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
master
Gerd Hoffmann 2020-09-23 11:12:17 +02:00
parent 57c98ea9ac
commit 501093207e
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/qemu/module.h
View File

@ -61,15 +61,15 @@ typedef enum {
#define fuzz_target_init(function) module_init(function, \ #define fuzz_target_init(function) module_init(function, \
MODULE_INIT_FUZZ_TARGET) MODULE_INIT_FUZZ_TARGET)
#define migration_init(function) module_init(function, MODULE_INIT_MIGRATION) #define migration_init(function) module_init(function, MODULE_INIT_MIGRATION)
#define block_module_load_one(lib) module_load_one("block-", lib) #define block_module_load_one(lib) module_load_one("block-", lib, false)
#define ui_module_load_one(lib) module_load_one("ui-", lib) #define ui_module_load_one(lib) module_load_one("ui-", lib, false)
#define audio_module_load_one(lib) module_load_one("audio-", lib) #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_module_init(void (*fn)(void), module_init_type type);
void register_dso_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); 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_one(const char *type);
void module_load_qom_all(void); void module_load_qom_all(void);

2
softmmu/qtest.c
View File

@ -757,7 +757,7 @@ static void qtest_process_command(CharBackend *chr, gchar **words)
g_assert(words[1] && words[2]); g_assert(words[1] && words[2]);
qtest_send_prefix(chr); 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"); qtest_sendf(chr, "OK\n");
} else { } else {
qtest_sendf(chr, "FAIL\n"); qtest_sendf(chr, "FAIL\n");

16
util/module.c
View File

@ -110,7 +110,7 @@ void module_call_init(module_init_type type)
} }
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
static int module_load_file(const char *fname) static int module_load_file(const char *fname, bool mayfail)
{ {
GModule *g_module; GModule *g_module;
void (*sym)(void); 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); g_module = g_module_open(fname, G_MODULE_BIND_LAZY | G_MODULE_BIND_LOCAL);
if (!g_module) { if (!g_module) {
if (!mayfail) {
fprintf(stderr, "Failed to open module: %s\n", fprintf(stderr, "Failed to open module: %s\n",
g_module_error()); g_module_error());
}
ret = -EINVAL; ret = -EINVAL;
goto out; goto out;
} }
@ -167,7 +169,7 @@ out:
} }
#endif #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; 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++) { for (i = 0; i < n_dirs; i++) {
fname = g_strdup_printf("%s/%s%s", fname = g_strdup_printf("%s/%s%s",
dirs[i], module_name, CONFIG_HOST_DSOSUF); dirs[i], module_name, CONFIG_HOST_DSOSUF);
ret = module_load_file(fname); ret = module_load_file(fname, mayfail);
g_free(fname); g_free(fname);
fname = NULL; fname = NULL;
/* Try loading until loaded a module file */ /* Try loading until loaded a module file */
@ -275,13 +277,11 @@ void module_load_qom_one(const char *type)
if (!type) { if (!type) {
return; return;
} }
if (module_loaded_qom_all) {
return;
}
for (i = 0; i < ARRAY_SIZE(qom_modules); i++) { for (i = 0; i < ARRAY_SIZE(qom_modules); i++) {
if (strcmp(qom_modules[i].type, type) == 0) { if (strcmp(qom_modules[i].type, type) == 0) {
module_load_one(qom_modules[i].prefix, module_load_one(qom_modules[i].prefix,
qom_modules[i].module); qom_modules[i].module,
false);
return; return;
} }
} }
@ -302,7 +302,7 @@ void module_load_qom_all(void)
/* one module implementing multiple types -> load only once */ /* one module implementing multiple types -> load only once */
continue; 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; module_loaded_qom_all = true;
} }