Merge branch 'linux-user-for-upstream' of git://git.linaro.org/people/rikuvoipio...

[qemu.git] / qemu-tool.c

diff --git a/qemu-tool.c b/qemu-tool.c
index 226b6e890ec4882a0c2532566124f77cb91b10e9..edb84f5f5d49f96a78e7ef616c75f9098a2d6d0a 100644 (file)
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -9,6 +9,8 @@
  * This work is licensed under the terms of the GNU GPL, version 2.  See
  * the COPYING file in the top-level directory.
  *
+ * Contributions after 2012-01-13 are licensed under the terms of the
+ * GNU GPL, version 2 or (at your option) any later version.
  */
 
 #include "qemu-common.h"
@@ -57,12 +59,12 @@ void monitor_protocol_event(MonitorEvent event, QObject *data)
 {
 }
 
-int64 cpu_get_clock(void)
+int64_t cpu_get_clock(void)
 {
-    abort();
+    return 0;
 }
 
-int64 cpu_get_icount(void)
+int64_t cpu_get_icount(void)
 {
     abort();
 }
@@ -81,11 +83,12 @@ void qemu_clock_warp(QEMUClock *clock)
 {
 }
 
-static void __attribute__((constructor)) init_main_loop(void)
+int qemu_init_main_loop(void)
 {
     init_clocks();
     init_timer_alarm();
     qemu_clock_enable(vm_clock, false);
+    return main_loop_init();
 }
 
 void slirp_select_fill(int *pnfds, fd_set *readfds,