mirror of https://github.com/xemu-project/xemu.git
qom: Register QOM infrastructure early
The constructors for QOM TYPE_INTERFACE were executed rather late in vl.c's main(). Call them very early so that QOM can safely be used for machines and CPUs. Signed-off-by: Andreas Färber <afaerber@suse.de> Cc: Anthony Liguori <anthony@codemonkey.ws> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
03f48b0797
commit
1b71f7c14f
4
vl.c
4
vl.c
|
@ -2299,6 +2299,8 @@ int main(int argc, char **argv, char **envp)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
module_call_init(MODULE_INIT_QOM);
|
||||||
|
|
||||||
runstate_init();
|
runstate_init();
|
||||||
|
|
||||||
init_clocks();
|
init_clocks();
|
||||||
|
@ -3466,8 +3468,6 @@ int main(int argc, char **argv, char **envp)
|
||||||
if (foreach_device_config(DEV_DEBUGCON, debugcon_parse) < 0)
|
if (foreach_device_config(DEV_DEBUGCON, debugcon_parse) < 0)
|
||||||
exit(1);
|
exit(1);
|
||||||
|
|
||||||
module_call_init(MODULE_INIT_QOM);
|
|
||||||
|
|
||||||
/* must be after qdev registration but before machine init */
|
/* must be after qdev registration but before machine init */
|
||||||
if (vga_model) {
|
if (vga_model) {
|
||||||
select_vgahw(vga_model);
|
select_vgahw(vga_model);
|
||||||
|
|
Loading…
Reference in New Issue