SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

system: Open-code qemu_init_arch_modules() using target_name()

Browse Source 
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>
This commit is contained in:
Philippe Mathieu-Daudé 2025-03-04 22:26:08 +01:00
parent df9ae6aa84
commit f2d4df439e
3 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/system/arch_init.h
View File

@ -27,6 +27,4 @@ enum {
extern const uint32_t arch_type; extern const uint32_t arch_type;
void qemu_init_arch_modules(void);
#endif #endif

9
system/arch_init.c
View File

@ -22,7 +22,6 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/module.h"
#include "system/arch_init.h" #include "system/arch_init.h"
#ifdef TARGET_SPARC #ifdef TARGET_SPARC
@ -40,11 +39,3 @@ int graphic_depth = 32;
#endif #endif
const uint32_t arch_type = QEMU_ARCH; 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
}

7
system/vl.c
View File

@ -26,6 +26,7 @@
#include "qemu/help-texts.h" #include "qemu/help-texts.h"
#include "qemu/datadir.h" #include "qemu/datadir.h"
#include "qemu/units.h" #include "qemu/units.h"
#include "qemu/module.h"
#include "exec/cpu-common.h" #include "exec/cpu-common.h"
#include "exec/page-vary.h" #include "exec/page-vary.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
@ -78,6 +79,7 @@
#include "hw/block/block.h" #include "hw/block/block.h"
#include "hw/i386/x86.h" #include "hw/i386/x86.h"
#include "hw/i386/pc.h" #include "hw/i386/pc.h"
#include "hw/core/cpu.h"
#include "migration/cpr.h" #include "migration/cpr.h"
#include "migration/misc.h" #include "migration/misc.h"
#include "migration/snapshot.h" #include "migration/snapshot.h"
@ -2885,7 +2887,10 @@ void qemu_init(int argc, char **argv)
os_setup_limits(); os_setup_limits();
qemu_init_arch_modules(); #ifdef CONFIG_MODULES
module_init_info(qemu_modinfo);
module_allow_arch(target_name());
#endif
qemu_init_subsystems(); qemu_init_subsystems();