diff options
| author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-03-04 22:26:08 +0100 |
|---|---|---|
| committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2025-03-06 15:46:18 +0100 |
| commit | f2d4df439e0b2c2c3cebf792a7966466c9d97b52 (patch) | |
| tree | 17d0c0bf29dbb4cdeeff72c01f8cb0451316cf0c | |
| parent | df9ae6aa84b92bb73c84194dc60f938e2495594c (diff) | |
| download | qemu-f2d4df439e0b2c2c3cebf792a7966466c9d97b52.zip qemu-f2d4df439e0b2c2c3cebf792a7966466c9d97b52.tar.gz qemu-f2d4df439e0b2c2c3cebf792a7966466c9d97b52.tar.bz2 | |
system: Open-code qemu_init_arch_modules() using target_name()
Mostly revert commit c80cafa0c73 ("system: Add qemu_init_arch_modules")
but using target_name() instead of the target specific 'TARGET_NAME'
definition.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250305005225.95051-3-philmd@linaro.org>
| -rw-r--r-- | include/system/arch_init.h | 2 | ||||
| -rw-r--r-- | system/arch_init.c | 9 | ||||
| -rw-r--r-- | system/vl.c | 7 |
3 files changed, 6 insertions, 12 deletions
diff --git a/include/system/arch_init.h b/include/system/arch_init.h index 5b1c102..d8b7744 100644 --- a/include/system/arch_init.h +++ b/include/system/arch_init.h @@ -27,6 +27,4 @@ enum { extern const uint32_t arch_type; -void qemu_init_arch_modules(void); - #endif diff --git a/system/arch_init.c b/system/arch_init.c index d2c32f8..b1baed1 100644 --- a/system/arch_init.c +++ b/system/arch_init.c @@ -22,7 +22,6 @@ * THE SOFTWARE. */ #include "qemu/osdep.h" -#include "qemu/module.h" #include "system/arch_init.h" #ifdef TARGET_SPARC @@ -40,11 +39,3 @@ int graphic_depth = 32; #endif const uint32_t arch_type = QEMU_ARCH; - -void qemu_init_arch_modules(void) -{ -#ifdef CONFIG_MODULES - module_init_info(qemu_modinfo); - module_allow_arch(TARGET_NAME); -#endif -} diff --git a/system/vl.c b/system/vl.c index 8f77668..04f7846 100644 --- a/system/vl.c +++ b/system/vl.c @@ -26,6 +26,7 @@ #include "qemu/help-texts.h" #include "qemu/datadir.h" #include "qemu/units.h" +#include "qemu/module.h" #include "exec/cpu-common.h" #include "exec/page-vary.h" #include "hw/qdev-properties.h" @@ -78,6 +79,7 @@ #include "hw/block/block.h" #include "hw/i386/x86.h" #include "hw/i386/pc.h" +#include "hw/core/cpu.h" #include "migration/cpr.h" #include "migration/misc.h" #include "migration/snapshot.h" @@ -2885,7 +2887,10 @@ void qemu_init(int argc, char **argv) os_setup_limits(); - qemu_init_arch_modules(); +#ifdef CONFIG_MODULES + module_init_info(qemu_modinfo); + module_allow_arch(target_name()); +#endif qemu_init_subsystems(); |