[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 23/48] modules: check arch on qom lookup
From: |
Paolo Bonzini |
Subject: |
[PULL 23/48] modules: check arch on qom lookup |
Date: |
Thu, 8 Jul 2021 17:17:23 +0200 |
From: Gerd Hoffmann <kraxel@redhat.com>
With target-specific modules we can have multiple modules implementing
the same object. Therefore we have to check the target arch on lookup
to find the correct module.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Jose R. Ziviani <jziviani@suse.de>
Message-Id: <20210624103836.2382472-20-kraxel@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
util/module.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/util/module.c b/util/module.c
index 065aed09ff..6bb4ad915a 100644
--- a/util/module.c
+++ b/util/module.c
@@ -329,6 +329,9 @@ void module_load_qom_one(const char *type)
if (!modinfo->objs) {
continue;
}
+ if (!module_check_arch(modinfo)) {
+ continue;
+ }
for (sl = modinfo->objs; *sl != NULL; sl++) {
if (strcmp(type, *sl) == 0) {
module_load_one("", modinfo->name, false);
@@ -349,6 +352,9 @@ void module_load_qom_all(void)
if (!modinfo->objs) {
continue;
}
+ if (!module_check_arch(modinfo)) {
+ continue;
+ }
module_load_one("", modinfo->name, false);
}
module_loaded_qom_all = true;
--
2.31.1
- [PULL 07/48] modules: generate modinfo.c, (continued)
- [PULL 07/48] modules: generate modinfo.c, Paolo Bonzini, 2021/07/08
- [PULL 09/48] modules: add qxl module annotations, Paolo Bonzini, 2021/07/08
- [PULL 13/48] modules: add usb-redir module annotations, Paolo Bonzini, 2021/07/08
- [PULL 14/48] modules: add ccid module annotations, Paolo Bonzini, 2021/07/08
- [PULL 08/48] modules: check if all dependencies can be satisfied, Paolo Bonzini, 2021/07/08
- [PULL 11/48] modules: add chardev module annotations, Paolo Bonzini, 2021/07/08
- [PULL 15/48] modules: add ui module annotations, Paolo Bonzini, 2021/07/08
- [PULL 16/48] modules: add s390x module annotations, Paolo Bonzini, 2021/07/08
- [PULL 17/48] modules: add block module annotations, Paolo Bonzini, 2021/07/08
- [PULL 18/48] modules: use modinfo for dependencies, Paolo Bonzini, 2021/07/08
- [PULL 23/48] modules: check arch on qom lookup,
Paolo Bonzini <=
- [PULL 19/48] modules: use modinfo for qom load, Paolo Bonzini, 2021/07/08
- [PULL 20/48] modules: use modinfo for qemu opts load, Paolo Bonzini, 2021/07/08
- [PULL 27/48] modules: module.h kerneldoc annotations, Paolo Bonzini, 2021/07/08
- [PULL 24/48] modules: target-specific module build infrastructure, Paolo Bonzini, 2021/07/08
- [PULL 25/48] modules: add documentation for module sourcesets, Paolo Bonzini, 2021/07/08
- [PULL 21/48] modules: add tracepoints, Paolo Bonzini, 2021/07/08
- [PULL 22/48] modules: check arch and block load on mismatch, Paolo Bonzini, 2021/07/08
- [PULL 29/48] accel: autoload modules, Paolo Bonzini, 2021/07/08
- [PULL 28/48] modules: hook up modules.h to docs build, Paolo Bonzini, 2021/07/08
- [PULL 30/48] accel: add qtest module annotations, Paolo Bonzini, 2021/07/08