OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

module: rename module_load_one to module_load

Browse Source 
Signed-off-by: Claudio Fontana <cfontana@suse.de>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220929093035.4231-3-cfontana@suse.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Claudio Fontana 2022-09-29 11:30:32 +02:00 committed by Paolo Bonzini
parent 2106106d80
commit dbc0e80553
9 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
audio/audio.c
View File

@ -80,7 +80,7 @@ audio_driver *audio_driver_lookup(const char *name)
} }
} }
audio_module_load_one(name); audio_module_load(name);
QLIST_FOREACH(d, &audio_drivers, next) { QLIST_FOREACH(d, &audio_drivers, next) {
if (strcmp(name, d->name) == 0) { if (strcmp(name, d->name) == 0) {
return d; return d;

4
block.c
View File

@ -464,7 +464,7 @@ BlockDriver *bdrv_find_format(const char *format_name)
/* The driver isn't registered, maybe we need to load a module */ /* The driver isn't registered, maybe we need to load a module */
for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) { for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) {
if (!strcmp(block_driver_modules[i].format_name, format_name)) { if (!strcmp(block_driver_modules[i].format_name, format_name)) {
block_module_load_one(block_driver_modules[i].library_name); block_module_load(block_driver_modules[i].library_name);
break; break;
} }
} }
@ -981,7 +981,7 @@ BlockDriver *bdrv_find_protocol(const char *filename,
for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) { for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) {
if (block_driver_modules[i].protocol_name && if (block_driver_modules[i].protocol_name &&
!strcmp(block_driver_modules[i].protocol_name, protocol)) { !strcmp(block_driver_modules[i].protocol_name, protocol)) {
block_module_load_one(block_driver_modules[i].library_name); block_module_load(block_driver_modules[i].library_name);
break; break;
} }
} }

4
block/dmg.c
View File

@ -445,8 +445,8 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
return ret; return ret;
} }
block_module_load_one("dmg-bz2"); block_module_load("dmg-bz2");
block_module_load_one("dmg-lzfse"); block_module_load("dmg-lzfse");
s->n_chunks = 0; s->n_chunks = 0;
s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL; s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;

2
hw/core/qdev.c
View File

@ -148,7 +148,7 @@ bool qdev_set_parent_bus(DeviceState *dev, BusState *bus, Error **errp)
DeviceState *qdev_new(const char *name) DeviceState *qdev_new(const char *name)
{ {
if (!object_class_by_name(name)) { if (!object_class_by_name(name)) {
module_load_qom_one(name); module_load_qom(name);
} }
return DEVICE(object_new(name)); return DEVICE(object_new(name));
} }

10
include/qemu/module.h
View File

@ -61,16 +61,16 @@ 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(lib) module_load("block-", lib)
#define ui_module_load_one(lib) module_load_one("ui-", lib) #define ui_module_load(lib) module_load("ui-", lib)
#define audio_module_load_one(lib) module_load_one("audio-", lib) #define audio_module_load(lib) module_load("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 module_load(const char *prefix, const char *lib_name);
void module_load_qom_one(const char *type); void module_load_qom(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);

4
qom/object.c
View File

@ -526,7 +526,7 @@ void object_initialize(void *data, size_t size, const char *typename)
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
if (!type) { if (!type) {
module_load_qom_one(typename); module_load_qom(typename);
type = type_get_by_name(typename); type = type_get_by_name(typename);
} }
#endif #endif
@ -1033,7 +1033,7 @@ ObjectClass *module_object_class_by_name(const char *typename)
oc = object_class_by_name(typename); oc = object_class_by_name(typename);
#ifdef CONFIG_MODULES #ifdef CONFIG_MODULES
if (!oc) { if (!oc) {
module_load_qom_one(typename); module_load_qom(typename);
oc = object_class_by_name(typename); oc = object_class_by_name(typename);
} }
#endif #endif

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])) { if (module_load(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");

6
ui/console.c
View File

@ -2632,7 +2632,7 @@ bool qemu_display_find_default(DisplayOptions *opts)
for (i = 0; i < (int)ARRAY_SIZE(prio); i++) { for (i = 0; i < (int)ARRAY_SIZE(prio); i++) {
if (dpys[prio[i]] == NULL) { if (dpys[prio[i]] == NULL) {
ui_module_load_one(DisplayType_str(prio[i])); ui_module_load(DisplayType_str(prio[i]));
} }
if (dpys[prio[i]] == NULL) { if (dpys[prio[i]] == NULL) {
continue; continue;
@ -2650,7 +2650,7 @@ void qemu_display_early_init(DisplayOptions *opts)
return; return;
} }
if (dpys[opts->type] == NULL) { if (dpys[opts->type] == NULL) {
ui_module_load_one(DisplayType_str(opts->type)); ui_module_load(DisplayType_str(opts->type));
} }
if (dpys[opts->type] == NULL) { if (dpys[opts->type] == NULL) {
error_report("Display '%s' is not available.", error_report("Display '%s' is not available.",
@ -2680,7 +2680,7 @@ void qemu_display_help(void)
printf("none\n"); printf("none\n");
for (idx = DISPLAY_TYPE_NONE; idx < DISPLAY_TYPE__MAX; idx++) { for (idx = DISPLAY_TYPE_NONE; idx < DISPLAY_TYPE__MAX; idx++) {
if (!dpys[idx]) { if (!dpys[idx]) {
ui_module_load_one(DisplayType_str(idx)); ui_module_load(DisplayType_str(idx));
} }
if (dpys[idx]) { if (dpys[idx]) {
printf("%s\n", DisplayType_str(dpys[idx]->type)); printf("%s\n", DisplayType_str(dpys[idx]->type));

14
util/module.c
View File

@ -206,7 +206,7 @@ out:
} }
#endif #endif
bool module_load_one(const char *prefix, const char *lib_name) bool module_load(const char *prefix, const char *lib_name)
{ {
bool success = false; bool success = false;
@ -254,7 +254,7 @@ bool module_load_one(const char *prefix, const char *lib_name)
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); module_load("", *sl);
} }
} else { } else {
for (sl = modinfo->deps; *sl != NULL; sl++) { for (sl = modinfo->deps; *sl != NULL; sl++) {
@ -312,7 +312,7 @@ bool module_load_one(const char *prefix, const char *lib_name)
static bool module_loaded_qom_all; static bool module_loaded_qom_all;
void module_load_qom_one(const char *type) void module_load_qom(const char *type)
{ {
const QemuModinfo *modinfo; const QemuModinfo *modinfo;
const char **sl; const char **sl;
@ -331,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); module_load("", modinfo->name);
} }
} }
} }
@ -352,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); module_load("", modinfo->name);
} }
module_loaded_qom_all = true; module_loaded_qom_all = true;
} }
@ -368,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); module_load("", modinfo->name);
} }
} }
} }
@ -378,7 +378,7 @@ void qemu_load_module_for_opts(const char *group)
void module_allow_arch(const char *arch) {} void module_allow_arch(const char *arch) {}
void qemu_load_module_for_opts(const char *group) {} void qemu_load_module_for_opts(const char *group) {}
void module_load_qom_one(const char *type) {} void module_load_qom(const char *type) {}
void module_load_qom_all(void) {} void module_load_qom_all(void) {}
#endif #endif