[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 18/24] modules: check arch on qom lookup
From: |
Gerd Hoffmann |
Subject: |
[PATCH v3 18/24] modules: check arch on qom lookup |
Date: |
Fri, 18 Jun 2021 06:53:47 +0200 |
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>
---
util/module.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/util/module.c b/util/module.c
index 065aed09ffef..6bb4ad915a1c 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
- [PATCH v3 11/24] modules: add s390x module annotations, (continued)
- [PATCH v3 11/24] modules: add s390x module annotations, Gerd Hoffmann, 2021/06/18
- [PATCH v3 10/24] modules: add ui module annotations, Gerd Hoffmann, 2021/06/18
- [PATCH v3 12/24] modules: add block module annotations, Gerd Hoffmann, 2021/06/18
- [PATCH v3 14/24] modules: use modinfo for qom load, Gerd Hoffmann, 2021/06/18
- [PATCH v3 16/24] modules: add tracepoints, Gerd Hoffmann, 2021/06/18
- [PATCH v3 13/24] modules: use modinfo for dependencies, Gerd Hoffmann, 2021/06/18
- [PATCH v3 15/24] modules: use modinfo for qemu opts load, Gerd Hoffmann, 2021/06/18
- [PATCH v3 18/24] modules: check arch on qom lookup,
Gerd Hoffmann <=
- [PATCH v3 17/24] modules: check arch and block load on mismatch, Gerd Hoffmann, 2021/06/18
- [PATCH v3 20/24] accel: autoload modules, Gerd Hoffmann, 2021/06/18
- [PATCH v3 19/24] modules: target-specific module build infrastructure, Gerd Hoffmann, 2021/06/18
- [PATCH v3 21/24] accel: add qtest module annotations, Gerd Hoffmann, 2021/06/18
- [PATCH v3 23/24] accel: add tcg module annotations, Gerd Hoffmann, 2021/06/18
- [PATCH v3 22/24] accel: build qtest modular, Gerd Hoffmann, 2021/06/18
- [PATCH v3 24/24] accel: build tcg modular, Gerd Hoffmann, 2021/06/18