Merge remote-tracking branch 'sstabellini/for_1.1_rc3' into staging

[qemu.git] / qemu-tool.c

diff --git a/qemu-tool.c b/qemu-tool.c
index c73bf7152e0a8f9a86895a84037cc154e7064f98..07fc4f201a591519b793f37cecde698ac0d61665 100644 (file)
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -59,12 +59,12 @@ void monitor_protocol_event(MonitorEvent event, QObject *data)
 {
 }
 
-int64 cpu_get_clock(void)
+int64_t cpu_get_clock(void)
 {
-    abort();
+    return qemu_get_clock_ns(rt_clock);
 }
 
-int64 cpu_get_icount(void)
+int64_t cpu_get_icount(void)
 {
     abort();
 }
@@ -83,11 +83,15 @@ 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_update_timeout(uint32_t *timeout)
+{
 }
 
 void slirp_select_fill(int *pnfds, fd_set *readfds,