monitor: move include files to include/monitor/

[qemu.git] / qemu-tool.c

diff --git a/qemu-tool.c b/qemu-tool.c
index 226b6e890ec4882a0c2532566124f77cb91b10e9..40453fdd991c907fc7258f5c5facc8813f2205f0 100644 (file)
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -9,29 +9,40 @@
  * 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"
-#include "monitor.h"
+#include "monitor/monitor.h"
 #include "qemu-timer.h"
 #include "qemu-log.h"
 #include "migration.h"
 #include "main-loop.h"
+#include "sysemu.h"
 #include "qemu_socket.h"
 #include "slirp/libslirp.h"
 
 #include <sys/time.h>
 
-FILE *logfile;
-
 struct QEMUBH
 {
     QEMUBHFunc *cb;
     void *opaque;
 };
 
+const char *qemu_get_vm_name(void)
+{
+    return NULL;
+}
+
 Monitor *cur_mon;
 
+void vm_stop(RunState state)
+{
+    abort();
+}
+
 int monitor_cur_is_qmp(void)
 {
     return 0;
@@ -57,12 +68,12 @@ void monitor_protocol_event(MonitorEvent event, QObject *data)
 {
 }
 
-int64 cpu_get_clock(void)
+int64_t cpu_get_clock(void)
 {
-    abort();
+    return get_clock_realtime();
 }
 
-int64 cpu_get_icount(void)
+int64_t cpu_get_icount(void)
 {
     abort();
 }
@@ -81,11 +92,8 @@ void qemu_clock_warp(QEMUClock *clock)
 {
 }
 
-static void __attribute__((constructor)) init_main_loop(void)
+void slirp_update_timeout(uint32_t *timeout)
 {
-    init_clocks();
-    init_timer_alarm();
-    qemu_clock_enable(vm_clock, false);
 }
 
 void slirp_select_fill(int *pnfds, fd_set *readfds,