From: "Jose R. Ziviani" <jziviani@suse.de>
To: qemu-devel@nongnu.org
Cc: berrange@redhat.com, ehabkost@redhat.com,
"Jose R. Ziviani" <jziviani@suse.de>,
kraxel@redhat.com, pbonzini@redhat.com, cfontana@suse.de
Subject: [RFC 2/3] modules: Implement module_is_loaded function
Date: Wed, 30 Jun 2021 20:27:48 -0300 [thread overview]
Message-ID: <20210630232749.21873-3-jziviani@suse.de> (raw)
In-Reply-To: <20210630232749.21873-1-jziviani@suse.de>
The function module_load_one() fills a hash table will all modules that
were successfuly loaded. However, that table is a static variable of
module_load_one(). This patch changes it and creates a function that
informs whether a given module was loaded or not.
Signed-off-by: Jose R. Ziviani <jziviani@suse.de>
---
include/qemu/module.h | 3 +++
util/module.c | 28 +++++++++++++++++++++-------
2 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/include/qemu/module.h b/include/qemu/module.h
index 456e190a55..01779cc7fb 100644
--- a/include/qemu/module.h
+++ b/include/qemu/module.h
@@ -14,6 +14,7 @@
#ifndef QEMU_MODULE_H
#define QEMU_MODULE_H
+#include <stdbool.h>
#define DSO_STAMP_FUN glue(qemu_stamp, CONFIG_STAMP)
#define DSO_STAMP_FUN_STR stringify(DSO_STAMP_FUN)
@@ -74,6 +75,8 @@ void module_load_qom_one(const char *type);
void module_load_qom_all(void);
void module_allow_arch(const char *arch);
+bool module_is_loaded(const char *name);
+
/**
* DOC: module info annotation macros
*
diff --git a/util/module.c b/util/module.c
index 6bb4ad915a..64307b7a25 100644
--- a/util/module.c
+++ b/util/module.c
@@ -119,6 +119,8 @@ static const QemuModinfo module_info_stub[] = { {
static const QemuModinfo *module_info = module_info_stub;
static const char *module_arch;
+static GHashTable *loaded_modules;
+
void module_init_info(const QemuModinfo *info)
{
module_info = info;
@@ -206,13 +208,10 @@ static int module_load_file(const char *fname, bool mayfail, bool export_symbols
out:
return ret;
}
-#endif
bool module_load_one(const char *prefix, const char *lib_name, bool mayfail)
{
bool success = false;
-
-#ifdef CONFIG_MODULES
char *fname = NULL;
#ifdef CONFIG_MODULE_UPGRADES
char *version_dir;
@@ -223,7 +222,6 @@ bool module_load_one(const char *prefix, const char *lib_name, bool mayfail)
int i = 0, n_dirs = 0;
int ret;
bool export_symbols = false;
- static GHashTable *loaded_modules;
const QemuModinfo *modinfo;
const char **sl;
@@ -307,12 +305,9 @@ bool module_load_one(const char *prefix, const char *lib_name, bool mayfail)
g_free(dirs[i]);
}
-#endif
return success;
}
-#ifdef CONFIG_MODULES
-
static bool module_loaded_qom_all;
void module_load_qom_one(const char *type)
@@ -377,6 +372,15 @@ void qemu_load_module_for_opts(const char *group)
}
}
+bool module_is_loaded(const char *name)
+{
+ if (!loaded_modules || !g_hash_table_contains(loaded_modules, name)) {
+ return false;
+ }
+
+ return true;
+}
+
#else
void module_allow_arch(const char *arch) {}
@@ -384,4 +388,14 @@ void qemu_load_module_for_opts(const char *group) {}
void module_load_qom_one(const char *type) {}
void module_load_qom_all(void) {}
+bool module_load_one(const char *prefix, const char *lib_name, bool mayfail)
+{
+ return false;
+}
+
+bool module_is_loaded(const char *name)
+{
+ return false;
+}
+
#endif
--
2.32.0
next prev parent reply other threads:[~2021-06-30 23:29 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-30 23:27 [RFC 0/3] Improve module accelerator error message Jose R. Ziviani
2021-06-30 23:27 ` [RFC 1/3] modules: Add CONFIG_TCG_MODULAR in config_host Jose R. Ziviani
2021-06-30 23:27 ` Jose R. Ziviani [this message]
2021-06-30 23:27 ` [RFC 3/3] qom: Improve error message in module_object_class_by_name() Jose R. Ziviani
2021-07-19 15:29 ` Claudio Fontana
2021-07-20 1:26 ` Jose R. Ziviani
2021-07-20 6:40 ` Claudio Fontana
2021-07-21 9:54 ` Gerd Hoffmann
2021-07-21 9:57 ` Daniel P. Berrangé
2021-07-21 13:36 ` Jose R. Ziviani
2021-07-05 8:18 ` QEMU modules improvements objective (Was: Re: [RFC 0/3] Improve module accelerator error message) Claudio Fontana
2021-07-21 10:35 ` Gerd Hoffmann
2021-07-21 10:47 ` Claudio Fontana
2021-07-21 10:50 ` Claudio Fontana
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210630232749.21873-3-jziviani@suse.de \
--to=jziviani@suse.de \
--cc=berrange@redhat.com \
--cc=cfontana@suse.de \
--cc=ehabkost@redhat.com \
--cc=kraxel@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).