Commit dffa41b4 authored by Fam Zheng's avatar Fam Zheng Committed by Max Reitz
Browse files

module: Don't load the same module if requested multiple times 



Use a hash table to keep record of all loaded modules, and return early
if the requested module is already loaded.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Message-id: 1473043845-13197-3-git-send-email-famz@redhat.com
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 159975f3

util/module.c

+16 −2
Original line number Diff line number Diff line
@@ -163,14 +163,28 @@ void module_load_one(const char *prefix, const char *lib_name) 
    char *fname = NULL;

    char *exec_dir;

    char *dirs[3];

    char *module_name;

    int i = 0;

    int ret;

    static GHashTable *loaded_modules;



    if (!g_module_supported()) {

        fprintf(stderr, "Module is not supported by system.\n");

        return;

    }



    if (!loaded_modules) {

        loaded_modules = g_hash_table_new(g_str_hash, g_str_equal);

    }



    module_name = g_strdup_printf("%s%s", prefix, lib_name);



    if (g_hash_table_lookup(loaded_modules, module_name)) {

        g_free(module_name);

        return;

    }

    g_hash_table_insert(loaded_modules, module_name, module_name);



    exec_dir = qemu_get_exec_dir();

    dirs[i++] = g_strdup_printf("%s", CONFIG_QEMU_MODDIR);

    dirs[i++] = g_strdup_printf("%s/..", exec_dir ? : "");
@@ -180,8 +194,8 @@ void module_load_one(const char *prefix, const char *lib_name) 
    exec_dir = NULL;



    for (i = 0; i < ARRAY_SIZE(dirs); i++) {

        fname = g_strdup_printf("%s/%s%s%s",

                dirs[i], prefix, lib_name, HOST_DSOSUF);

        fname = g_strdup_printf("%s/%s%s",

                dirs[i], module_name, HOST_DSOSUF);

        ret = module_load_file(fname);

        g_free(fname);

        fname = NULL;