From: Claudio Fontana <cfontana@suse.de>

Date: Thu, 29 Sep 2022 11:30:32 +0200

Subject: module: rename module_load_one to module_load

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

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>

(cherry picked from commit dbc0e80553c067f56cb236d9de2cd0d50f3c6131)

Resolves: bsc#1208139

Signed-off-by: Dario Faggioli <dfaggioli@suse.com>

---

 audio/audio.c         |  2 +-

 block.c               |  4 ++--

 block/dmg.c           |  4 ++--

 hw/core/qdev.c        |  2 +-

 include/qemu/module.h | 10 +++++-----

 qom/object.c          |  4 ++--

 softmmu/qtest.c       |  2 +-

 ui/console.c          |  6 +++---

 util/module.c         | 14 +++++++-------

 9 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/audio/audio.c b/audio/audio.c

index a02f3ce5c6192542544c9c8017b1..9e2609707d7f4adecfb6e9f45670 100644

--- a/audio/audio.c

+++ b/audio/audio.c

@@ -79,7 +79,7 @@ audio_driver *audio_driver_lookup(const char *name)

         }

     }

-    audio_module_load_one(name);

+    audio_module_load(name);

     QLIST_FOREACH(d, &audio_drivers, next) {

         if (strcmp(name, d->name) == 0) {

             return d;

diff --git a/block.c b/block.c

index bc85f46eed690321657cf1de5d27..72c7f6d47d590657472b036a5847 100644

--- a/block.c

+++ b/block.c

@@ -464,7 +464,7 @@ BlockDriver *bdrv_find_format(const char *format_name)

     /* The driver isn't registered, maybe we need to load a module */

     for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) {

         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;

         }

     }

@@ -976,7 +976,7 @@ BlockDriver *bdrv_find_protocol(const char *filename,

     for (i = 0; i < (int)ARRAY_SIZE(block_driver_modules); ++i) {

         if (block_driver_modules[i].protocol_name &&

             !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;

         }

     }

diff --git a/block/dmg.c b/block/dmg.c

index 98db18d82a0e56e340db4373d967..007b8d9996d61be8370699f3d81f 100644

--- a/block/dmg.c

+++ b/block/dmg.c

@@ -446,8 +446,8 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,

         return -EINVAL;

     }

-    block_module_load_one("dmg-bz2");

-    block_module_load_one("dmg-lzfse");

+    block_module_load("dmg-bz2");

+    block_module_load("dmg-lzfse");

     s->n_chunks = 0;

     s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;

diff --git a/hw/core/qdev.c b/hw/core/qdev.c

index 0806d8fcaaaca5a1566c1791bd14..25dfc08468011b2d63f032526919 100644

--- a/hw/core/qdev.c

+++ b/hw/core/qdev.c

@@ -148,7 +148,7 @@ bool qdev_set_parent_bus(DeviceState *dev, BusState *bus, Error **errp)

 DeviceState *qdev_new(const char *name)

 {

     if (!object_class_by_name(name)) {

-        module_load_qom_one(name);

+        module_load_qom(name);

     }

     return DEVICE(object_new(name));

 }

diff --git a/include/qemu/module.h b/include/qemu/module.h

index 8c012bbe038d3c67ccc7f0795287..b7911ce7916148ba9c3245878350 100644

--- a/include/qemu/module.h

+++ b/include/qemu/module.h

@@ -61,16 +61,16 @@ 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(lib) module_load("block-", lib)

+#define ui_module_load(lib) module_load("ui-", lib)

+#define audio_module_load(lib) module_load("audio-", lib)

 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);

-void module_load_qom_one(const char *type);

+bool module_load(const char *prefix, const char *lib_name);

+void module_load_qom(const char *type);

 void module_load_qom_all(void);

 void module_allow_arch(const char *arch);

diff --git a/qom/object.c b/qom/object.c

index d34608558e9e5e53f4b363774f06..4f834f3bf66c6672138d9bfc9e55 100644

--- a/qom/object.c

+++ b/qom/object.c

@@ -526,7 +526,7 @@ void object_initialize(void *data, size_t size, const char *typename)

 #ifdef CONFIG_MODULES

     if (!type) {

-        module_load_qom_one(typename);

+        module_load_qom(typename);

         type = type_get_by_name(typename);

     }

 #endif

@@ -1033,7 +1033,7 @@ ObjectClass *module_object_class_by_name(const char *typename)

     oc = object_class_by_name(typename);

 #ifdef CONFIG_MODULES

     if (!oc) {

-        module_load_qom_one(typename);

+        module_load_qom(typename);

         oc = object_class_by_name(typename);

     }

 #endif

diff --git a/softmmu/qtest.c b/softmmu/qtest.c

index 76eb7bac563ea9608e1272f923cc..fc5b733c630035785732610c920c 100644

--- a/softmmu/qtest.c

+++ b/softmmu/qtest.c

@@ -756,7 +756,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(words[1], words[2])) {

             qtest_sendf(chr, "OK\n");

         } else {

             qtest_sendf(chr, "FAIL\n");

diff --git a/ui/console.c b/ui/console.c

index 765892f84f1c3bb6335887bc4889..4913c55684cb9b9d8c8ab0df5b22 100644

--- a/ui/console.c

+++ b/ui/console.c

@@ -2632,7 +2632,7 @@ bool qemu_display_find_default(DisplayOptions *opts)

     for (i = 0; i < (int)ARRAY_SIZE(prio); i++) {

         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) {

             continue;

@@ -2650,7 +2650,7 @@ void qemu_display_early_init(DisplayOptions *opts)

         return;

     }

     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) {

         error_report("Display '%s' is not available.",

@@ -2680,7 +2680,7 @@ void qemu_display_help(void)

     printf("none\n");

     for (idx = DISPLAY_TYPE_NONE; idx < DISPLAY_TYPE__MAX; idx++) {

         if (!dpys[idx]) {

-            ui_module_load_one(DisplayType_str(idx));

+            ui_module_load(DisplayType_str(idx));

         }

         if (dpys[idx]) {

             printf("%s\n",  DisplayType_str(dpys[idx]->type));

diff --git a/util/module.c b/util/module.c

index 8563edd6267cc6e2fbea2cb61e65..ad89cd50dc2a03ea6f8431849137 100644

--- a/util/module.c

+++ b/util/module.c

@@ -206,7 +206,7 @@ out:

 }

 #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;

@@ -254,7 +254,7 @@ bool module_load_one(const char *prefix, const char *lib_name)

             if (strcmp(modinfo->name, module_name) == 0) {

                 /* we depend on other module(s) */

                 for (sl = modinfo->deps; *sl != NULL; sl++) {

-                    module_load_one("", *sl);

+                    module_load("", *sl);

                 }

             } else {

                 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;

-void module_load_qom_one(const char *type)

+void module_load_qom(const char *type)

 {

     const QemuModinfo *modinfo;

     const char **sl;

@@ -331,7 +331,7 @@ void module_load_qom_one(const char *type)

         }

         for (sl = modinfo->objs; *sl != NULL; sl++) {

             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)) {

             continue;

         }

-        module_load_one("", modinfo->name);

+        module_load("", modinfo->name);

     }

     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++) {

             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 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) {}

 #endif