system/qemu
system/qemu
1
0
Fork 0
mirror of https://gitlab.com/qemu-project/qemu synced 2024-07-21 18:34:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

module: removed unused function argument "mayfail"

Browse source 
mayfail is always passed as false for every invocation throughout the program.
It controls whether to printf or not to printf an error on
g_module_open failure.

Remove this unused argument.

Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20220929093035.4231-2-cfontana@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Claudio Fontana 2022-09-29 11:30:31 +02:00 committed by Paolo Bonzini
parent efa3901e14
commit 2106106d80
3 changed files with 14 additions and 16 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, false) #define block_module_load_one(lib) module_load_one("block-", lib)
#define ui_module_load_one(lib) module_load_one("ui-", lib, false) #define ui_module_load_one(lib) module_load_one("ui-", lib)
#define audio_module_load_one(lib) module_load_one("audio-", lib, false) #define audio_module_load_one(lib) module_load_one("audio-", lib)
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 mayfail); bool module_load_one(const char *prefix, const char *lib_name);
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);
void module_allow_arch(const char *arch); void module_allow_arch(const char *arch);

2
softmmu/qtest.c
View file

@ -756,7 +756,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], false)) { if (module_load_one(words[1], words[2])) {
qtest_sendf(chr, "OK\n"); qtest_sendf(chr, "OK\n");
} else { } else {
qtest_sendf(chr, "FAIL\n"); qtest_sendf(chr, "FAIL\n");

20
util/module.c
View file

@ -144,7 +144,7 @@ static bool module_check_arch(const QemuModinfo *modinfo)
return true; return true;
} }
static int module_load_file(const char *fname, bool mayfail, bool export_symbols) static int module_load_file(const char *fname, bool export_symbols)
{ {
GModule *g_module; GModule *g_module;
void (*sym)(void); void (*sym)(void);
@ -172,10 +172,8 @@ static int module_load_file(const char *fname, bool mayfail, bool export_symbols
} }
g_module = g_module_open(fname, flags); g_module = g_module_open(fname, flags);
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;
} }
@ -208,7 +206,7 @@ out:
} }
#endif #endif
bool module_load_one(const char *prefix, const char *lib_name, bool mayfail) bool module_load_one(const char *prefix, const char *lib_name)
{ {
bool success = false; bool success = false;
@ -256,7 +254,7 @@ bool module_load_one(const char *prefix, const char *lib_name, bool mayfail)
if (strcmp(modinfo->name, module_name) == 0) { if (strcmp(modinfo->name, module_name) == 0) {
/* we depend on other module(s) */ /* we depend on other module(s) */
for (sl = modinfo->deps; *sl != NULL; sl++) { for (sl = modinfo->deps; *sl != NULL; sl++) {
module_load_one("", *sl, false); module_load_one("", *sl);
} }
} else { } else {
for (sl = modinfo->deps; *sl != NULL; sl++) { for (sl = modinfo->deps; *sl != NULL; sl++) {
@ -287,7 +285,7 @@ bool module_load_one(const char *prefix, const char *lib_name, bool mayfail)
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, mayfail, export_symbols); ret = module_load_file(fname, export_symbols);
g_free(fname); g_free(fname);
fname = NULL; fname = NULL;
/* Try loading until loaded a module file */ /* Try loading until loaded a module file */
@ -333,7 +331,7 @@ void module_load_qom_one(const char *type)
} }
for (sl = modinfo->objs; *sl != NULL; sl++) { for (sl = modinfo->objs; *sl != NULL; sl++) {
if (strcmp(type, *sl) == 0) { if (strcmp(type, *sl) == 0) {
module_load_one("", modinfo->name, false); module_load_one("", modinfo->name);
} }
} }
} }
@ -354,7 +352,7 @@ void module_load_qom_all(void)
if (!module_check_arch(modinfo)) { if (!module_check_arch(modinfo)) {
continue; continue;
} }
module_load_one("", modinfo->name, false); module_load_one("", modinfo->name);
} }
module_loaded_qom_all = true; module_loaded_qom_all = true;
} }
@ -370,7 +368,7 @@ void qemu_load_module_for_opts(const char *group)
} }
for (sl = modinfo->opts; *sl != NULL; sl++) { for (sl = modinfo->opts; *sl != NULL; sl++) {
if (strcmp(group, *sl) == 0) { if (strcmp(group, *sl) == 0) {
module_load_one("", modinfo->name, false); module_load_one("", modinfo->name);
} }
} }
} }