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 d45840de288e765f15dba4f37c272f990a3b661e..edb84f5f5d49f96a78e7ef616c75f9098a2d6d0a 100644 (file)
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -9,18 +9,21 @@
  * 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 "qemu-timer.h"
 #include "qemu-log.h"
-#include "sysemu.h"
+#include "migration.h"
+#include "main-loop.h"
+#include "qemu_socket.h"
+#include "slirp/libslirp.h"
 
 #include <sys/time.h>
 
-QEMUClock *rt_clock;
-
 FILE *logfile;
 
 struct QEMUBH
@@ -29,10 +32,6 @@ struct QEMUBH
     void *opaque;
 };
 
-void qemu_service_io(void)
-{
-}
-
 Monitor *cur_mon;
 
 int monitor_cur_is_qmp(void)
@@ -60,15 +59,52 @@ void monitor_protocol_event(MonitorEvent event, QObject *data)
 {
 }
 
-int qemu_set_fd_handler2(int fd,
-                         IOCanReadHandler *fd_read_poll,
-                         IOHandler *fd_read,
-                         IOHandler *fd_write,
-                         void *opaque)
+int64_t cpu_get_clock(void)
 {
     return 0;
 }
 
-void qemu_notify_event(void)
+int64_t cpu_get_icount(void)
+{
+    abort();
+}
+
+void qemu_mutex_lock_iothread(void)
+{
+}
+
+void qemu_mutex_unlock_iothread(void)
+{
+}
+
+int use_icount;
+
+void qemu_clock_warp(QEMUClock *clock)
+{
+}
+
+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,
+                       fd_set *writefds, fd_set *xfds)
+{
+}
+
+void slirp_select_poll(fd_set *readfds, fd_set *writefds,
+                       fd_set *xfds, int select_error)
+{
+}
+
+void migrate_add_blocker(Error *reason)
+{
+}
+
+void migrate_del_blocker(Error *reason)
 {
 }