[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 17/18] modules: check arch and block load on mismatch
From: |
Gerd Hoffmann |
Subject: |
[PATCH v2 17/18] modules: check arch and block load on mismatch |
Date: |
Thu, 10 Jun 2021 07:57:54 +0200 |
Add module_allow_arch() to set the target architecture.
In case a module is limited to some arch verify arches
match and ignore the module if not.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
include/qemu/module.h | 1 +
softmmu/vl.c | 3 +++
util/module.c | 15 +++++++++++++++
3 files changed, 19 insertions(+)
diff --git a/include/qemu/module.h b/include/qemu/module.h
index d3cab3c25a2f..7825f6d8c847 100644
--- a/include/qemu/module.h
+++ b/include/qemu/module.h
@@ -72,6 +72,7 @@ void module_call_init(module_init_type type);
bool module_load_one(const char *prefix, const char *lib_name, bool mayfail);
void module_load_qom_one(const char *type);
void module_load_qom_all(void);
+void module_allow_arch(const char *arch);
/*
* macros to store module metadata in a .modinfo section.
diff --git a/softmmu/vl.c b/softmmu/vl.c
index ba26a042b284..96316774fcc9 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -126,6 +126,8 @@
#include "sysemu/iothread.h"
#include "qemu/guest-random.h"
+#include "config-host.h"
+
#define MAX_VIRTIO_CONSOLES 1
typedef struct BlockdevOptionsQueueEntry {
@@ -2723,6 +2725,7 @@ void qemu_init(int argc, char **argv, char **envp)
error_init(argv[0]);
qemu_init_exec_dir(argv[0]);
+ module_allow_arch(TARGET_NAME);
qemu_init_subsystems();
/* first pass of option parsing */
diff --git a/util/module.c b/util/module.c
index 6e4199169c41..564b8e3da760 100644
--- a/util/module.c
+++ b/util/module.c
@@ -122,6 +122,12 @@ void module_call_init(module_init_type type)
static Modules *modinfo;
static char *module_dirs[5];
static int module_ndirs;
+static const char *module_arch;
+
+void module_allow_arch(const char *arch)
+{
+ module_arch = arch;
+}
static void module_load_path_init(void)
{
@@ -295,6 +301,14 @@ bool module_load_one(const char *prefix, const char
*lib_name, bool mayfail)
module_load_modinfo();
for (modlist = modinfo->list; modlist != NULL; modlist = modlist->next) {
+ if (modlist->value->has_arch) {
+ if (strcmp(modlist->value->name, module_name) == 0) {
+ if (!module_arch ||
+ strcmp(modlist->value->arch, module_arch) != 0) {
+ return false;
+ }
+ }
+ }
if (modlist->value->has_deps) {
if (strcmp(modlist->value->name, module_name) == 0) {
/* we depend on other module(s) */
@@ -401,6 +415,7 @@ void qemu_load_module_for_opts(const char *group)
#else
+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_all(void) {}
--
2.31.1
- [PATCH v2 07/18] modules: add usb-redir module annotations, (continued)
- [PATCH v2 07/18] modules: add usb-redir module annotations, Gerd Hoffmann, 2021/06/10
- [PATCH v2 09/18] modules: add ui module annotations, Gerd Hoffmann, 2021/06/10
- [PATCH v2 08/18] modules: add ccid module annotations, Gerd Hoffmann, 2021/06/10
- [PATCH v2 11/18] modules: add block module annotations, Gerd Hoffmann, 2021/06/10
- [PATCH v2 10/18] modules: add s390x module annotations, Gerd Hoffmann, 2021/06/10
- [PATCH v2 12/18] modules: add module_load_path_init helper, Gerd Hoffmann, 2021/06/10
- [PATCH v2 13/18] modules: load modinfo.json, Gerd Hoffmann, 2021/06/10
- [PATCH v2 14/18] modules: use modinfo for dependencies, Gerd Hoffmann, 2021/06/10
- [PATCH v2 15/18] modules: use modinfo for qom load, Gerd Hoffmann, 2021/06/10
- [PATCH v2 16/18] modules: use modinfo for qemu opts load, Gerd Hoffmann, 2021/06/10
- [PATCH v2 17/18] modules: check arch and block load on mismatch,
Gerd Hoffmann <=
- Re: [PATCH v2 17/18] modules: check arch and block load on mismatch, Daniel P . Berrangé, 2021/06/10
- Re: [PATCH v2 17/18] modules: check arch and block load on mismatch, Gerd Hoffmann, 2021/06/10
- Re: [PATCH v2 17/18] modules: check arch and block load on mismatch, Daniel P . Berrangé, 2021/06/10
- Re: [PATCH v2 17/18] modules: check arch and block load on mismatch, Gerd Hoffmann, 2021/06/10
- Re: [PATCH v2 17/18] modules: check arch and block load on mismatch, Claudio Fontana, 2021/06/14
- Re: [PATCH v2 17/18] modules: check arch and block load on mismatch, Gerd Hoffmann, 2021/06/14
- Re: [PATCH v2 17/18] modules: check arch and block load on mismatch, Daniel P . Berrangé, 2021/06/14
- Re: [PATCH v2 17/18] modules: check arch and block load on mismatch, Gerd Hoffmann, 2021/06/14
- Re: [PATCH v2 17/18] modules: check arch and block load on mismatch, Claudio Fontana, 2021/06/14
[PATCH v2 18/18] [fixup] module_load_modinfo, Gerd Hoffmann, 2021/06/10