From: Gerd Hoffmann <kraxel@redhat.com>
To: qemu-devel@nongnu.org
Cc: "Kevin Wolf" <kwolf@redhat.com>, "Thomas Huth" <thuth@redhat.com>,
berrange@redhat.com, qemu-block@nongnu.org,
"Michael S. Tsirkin" <mst@redhat.com>,
"Michael Roth" <michael.roth@amd.com>,
"Cornelia Huck" <cohuck@redhat.com>, "Peter Lieven" <pl@kamp.de>,
"Markus Armbruster" <armbru@redhat.com>,
"Max Reitz" <mreitz@redhat.com>,
"Halil Pasic" <pasic@linux.ibm.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
qemu-s390x@nongnu.org, "Gerd Hoffmann" <kraxel@redhat.com>,
"Ronnie Sahlberg" <ronniesahlberg@gmail.com>,
"Samuel Thibault" <samuel.thibault@ens-lyon.org>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"David Hildenbrand" <david@redhat.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Eric Blake" <eblake@redhat.com>,
"Christian Borntraeger" <borntraeger@de.ibm.com>
Subject: [PATCH v2 13/18] modules: load modinfo.json
Date: Thu, 10 Jun 2021 07:57:50 +0200 [thread overview]
Message-ID: <20210610055755.538119-14-kraxel@redhat.com> (raw)
In-Reply-To: <20210610055755.538119-1-kraxel@redhat.com>
Load and parse the module info database.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
util/module.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++
util/trace-events | 3 +++
2 files changed, 57 insertions(+)
diff --git a/util/module.c b/util/module.c
index 3a2d6dde9734..b0ea8c57d438 100644
--- a/util/module.c
+++ b/util/module.c
@@ -20,9 +20,16 @@
#include "qemu/queue.h"
#include "qemu/module.h"
#include "qemu/cutils.h"
+#include "qemu/error-report.h"
#ifdef CONFIG_MODULE_UPGRADES
#include "qemu-version.h"
#endif
+#include "trace.h"
+
+#include "qapi/error.h"
+#include "qapi/qapi-types-modules.h"
+#include "qapi/qapi-visit-modules.h"
+#include "qapi/qobject-input-visitor.h"
typedef struct ModuleEntry
{
@@ -111,6 +118,7 @@ void module_call_init(module_init_type type)
#ifdef CONFIG_MODULES
+static Modules *modinfo;
static char *module_dirs[5];
static int module_ndirs;
@@ -137,7 +145,52 @@ static void module_load_path_init(void)
#endif
assert(module_ndirs <= ARRAY_SIZE(module_dirs));
+}
+static void module_load_modinfo(void)
+{
+ char *file, *json;
+ FILE *fp;
+ int i, size;
+ Visitor *v;
+ Error *errp = NULL;
+
+ if (modinfo) {
+ return;
+ }
+
+ for (i = 0; i < module_ndirs; i++) {
+ file = g_strdup_printf("%s/modinfo.json", module_dirs[i]);
+ fp = fopen(file, "r");
+ if (fp != NULL) {
+ break;
+ }
+ g_free(file);
+ }
+ if (NULL == fp) {
+ warn_report("No modinfo.json file found.");
+ return;
+ } else {
+ trace_module_load_modinfo(file);
+ }
+
+ fseek(fp, 0, SEEK_END);
+ size = ftell(fp);
+ fseek(fp, 0, SEEK_SET);
+ json = g_malloc0(size + 1);
+ fread(json, size, 1, fp);
+ json[size] = 0;
+ fclose(fp);
+
+ v = qobject_input_visitor_new_str(json, NULL, &errp);
+ if (errp) {
+ error_reportf_err(errp, "parse error (%s)", file);
+ g_free(file);
+ return;
+ }
+ visit_type_Modules(v, NULL, &modinfo, &errp);
+ visit_free(v);
+ g_free(file);
}
static int module_load_file(const char *fname, bool mayfail, bool export_symbols)
@@ -269,6 +322,7 @@ bool module_load_one(const char *prefix, const char *lib_name, bool mayfail)
g_hash_table_add(loaded_modules, module_name);
module_load_path_init();
+ module_load_modinfo();
for (i = 0; i < module_ndirs; i++) {
fname = g_strdup_printf("%s/%s%s",
diff --git a/util/trace-events b/util/trace-events
index 806cac14a762..8b2afcbd109a 100644
--- a/util/trace-events
+++ b/util/trace-events
@@ -100,3 +100,6 @@ uffd_create_fd_api_failed(int err) "errno: %i"
uffd_create_fd_api_noioctl(uint64_t ioctl_req, uint64_t ioctl_supp) "ioctl_req: 0x%" PRIx64 "ioctl_supp: 0x%" PRIx64
uffd_register_memory_failed(void *addr, uint64_t length, uint64_t mode, int err) "addr: %p length: %" PRIu64 " mode: 0x%" PRIx64 " errno: %i"
uffd_unregister_memory_failed(void *addr, uint64_t length, int err) "addr: %p length: %" PRIu64 " errno: %i"
+
+# module.c
+module_load_modinfo(const char *filename) "modinfo %s"
--
2.31.1
next prev parent reply other threads:[~2021-06-10 6:12 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 5:57 [PATCH v2 00/18] modules: add metadata database Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 01/18] modules: add metadata macros, add qxl module annotations Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 02/18] qapi: add ModuleInfo schema Gerd Hoffmann
2021-06-14 7:48 ` Markus Armbruster
2021-06-14 15:21 ` Gerd Hoffmann
2021-06-14 16:53 ` Markus Armbruster
2021-06-10 5:57 ` [PATCH v2 03/18] modules: add qemu-modinfo utility Gerd Hoffmann
2021-06-10 13:04 ` Gerd Hoffmann
2021-06-10 13:13 ` Daniel P. Berrangé
2021-06-14 8:34 ` Paolo Bonzini
2021-06-14 14:36 ` Paolo Bonzini
2021-06-15 4:49 ` Gerd Hoffmann
2021-06-15 7:56 ` Gerd Hoffmann
2021-06-15 13:07 ` Gerd Hoffmann
2021-06-15 13:35 ` Paolo Bonzini
2021-06-16 9:16 ` Gerd Hoffmann
2021-06-16 10:53 ` Paolo Bonzini
2021-06-14 15:01 ` Gerd Hoffmann
2021-06-14 15:08 ` Daniel P. Berrangé
2021-06-15 4:54 ` Gerd Hoffmann
2021-06-15 9:27 ` Daniel P. Berrangé
2021-06-10 5:57 ` [PATCH v2 04/18] modules: add virtio-gpu module annotations Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 05/18] modules: add chardev " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 06/18] modules: add audio " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 07/18] modules: add usb-redir " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 08/18] modules: add ccid " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 09/18] modules: add ui " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 10/18] modules: add s390x " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 11/18] modules: add block " Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 12/18] modules: add module_load_path_init helper Gerd Hoffmann
2021-06-10 5:57 ` Gerd Hoffmann [this message]
2021-06-10 5:57 ` [PATCH v2 14/18] modules: use modinfo for dependencies Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 15/18] modules: use modinfo for qom load Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 16/18] modules: use modinfo for qemu opts load Gerd Hoffmann
2021-06-10 5:57 ` [PATCH v2 17/18] modules: check arch and block load on mismatch Gerd Hoffmann
2021-06-10 12:35 ` Daniel P. Berrangé
2021-06-10 12:57 ` Gerd Hoffmann
2021-06-10 13:06 ` Daniel P. Berrangé
2021-06-10 14:03 ` Gerd Hoffmann
2021-06-14 11:23 ` Claudio Fontana
2021-06-14 13:44 ` Gerd Hoffmann
2021-06-14 13:52 ` Daniel P. Berrangé
2021-06-14 14:10 ` Gerd Hoffmann
2021-06-14 11:19 ` Claudio Fontana
2021-06-10 5:57 ` [PATCH v2 18/18] [fixup] module_load_modinfo Gerd Hoffmann
2021-06-10 6:24 ` Gerd Hoffmann
2021-06-10 8:32 ` [PATCH v2 00/18] modules: add metadata database Claudio Fontana
2021-06-10 9:54 ` Gerd Hoffmann
2021-06-14 11:31 ` Claudio Fontana
2021-06-14 14:07 ` Gerd Hoffmann
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=20210610055755.538119-14-kraxel@redhat.com \
--to=kraxel@redhat.com \
--cc=armbru@redhat.com \
--cc=berrange@redhat.com \
--cc=borntraeger@de.ibm.com \
--cc=cohuck@redhat.com \
--cc=david@redhat.com \
--cc=eblake@redhat.com \
--cc=kwolf@redhat.com \
--cc=marcandre.lureau@redhat.com \
--cc=michael.roth@amd.com \
--cc=mreitz@redhat.com \
--cc=mst@redhat.com \
--cc=pasic@linux.ibm.com \
--cc=pbonzini@redhat.com \
--cc=pl@kamp.de \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=ronniesahlberg@gmail.com \
--cc=samuel.thibault@ens-lyon.org \
--cc=thuth@redhat.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).