commit 1b71f7c14fab6f00c2680d4489fbee7baf796e4f
author Andreas Färber <afaerber@suse.de> Sun Mar 04 21:32:35 2012 +0100
committer Anthony Liguori <aliguori@us.ibm.com> Tue Mar 13 13:23:17 2012 -0500
tree c325839cecfd3f9df2521a630965b24e74239645
parent 03f48b0797c9904301ee91e0081e89b3a3250f91

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>

vl.c

diff --git a/vl.c b/vl.c
index 65f11f2..bd95539 100644
--- a/vl.c
+++ b/vl.c
@@ -2299,6 +2299,8 @@
 #endif
     }
 
+    module_call_init(MODULE_INIT_QOM);
+
     runstate_init();
 
     init_clocks();
@@ -3466,8 +3468,6 @@
     if (foreach_device_config(DEV_DEBUGCON, debugcon_parse) < 0)
         exit(1);
 
-    module_call_init(MODULE_INIT_QOM);
-
     /* must be after qdev registration but before machine init */
     if (vga_model) {
         select_vgahw(vga_model);