rename qemu_sendv to iov_send, change proto and move declarations to iov.h

[qemu.git] / qemu-tool.c

diff --git a/qemu-tool.c b/qemu-tool.c
index dda752b7d26f1ab096fe4631a6ae1758a911be45..07fc4f201a591519b793f37cecde698ac0d61665 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 "qemu-error.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,110 +32,82 @@ struct QEMUBH
     void *opaque;
 };
 
-void qemu_service_io(void)
-{
-}
+Monitor *cur_mon;
 
-void monitor_printf(Monitor *mon, const char *fmt, ...)
+int monitor_cur_is_qmp(void)
 {
+    return 0;
 }
 
-void monitor_print_filename(Monitor *mon, const char *filename)
+void monitor_set_error(Monitor *mon, QError *qerror)
 {
 }
 
-void async_context_push(void)
+void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
 {
 }
 
-void async_context_pop(void)
+void monitor_printf(Monitor *mon, const char *fmt, ...)
 {
 }
 
-int get_async_context_id(void)
+void monitor_print_filename(Monitor *mon, const char *filename)
 {
-    return 0;
 }
 
 void monitor_protocol_event(MonitorEvent event, QObject *data)
 {
 }
 
-QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque)
+int64_t cpu_get_clock(void)
 {
-    QEMUBH *bh;
-
-    bh = qemu_malloc(sizeof(*bh));
-    bh->cb = cb;
-    bh->opaque = opaque;
-
-    return bh;
+    return qemu_get_clock_ns(rt_clock);
 }
 
-int qemu_bh_poll(void)
+int64_t cpu_get_icount(void)
 {
-    return 0;
+    abort();
 }
 
-void qemu_bh_schedule(QEMUBH *bh)
+void qemu_mutex_lock_iothread(void)
 {
-    bh->cb(bh->opaque);
 }
 
-void qemu_bh_cancel(QEMUBH *bh)
+void qemu_mutex_unlock_iothread(void)
 {
 }
 
-void qemu_bh_delete(QEMUBH *bh)
-{
-    qemu_free(bh);
-}
+int use_icount;
 
-int qemu_set_fd_handler2(int fd,
-                         IOCanReadHandler *fd_read_poll,
-                         IOHandler *fd_read,
-                         IOHandler *fd_write,
-                         void *opaque)
+void qemu_clock_warp(QEMUClock *clock)
 {
-    return 0;
 }
 
-int64_t qemu_get_clock(QEMUClock *clock)
+int qemu_init_main_loop(void)
 {
-    qemu_timeval tv;
-    qemu_gettimeofday(&tv);
-    return (tv.tv_sec * 1000000000LL + (tv.tv_usec * 1000)) / 1000000;
+    init_clocks();
+    init_timer_alarm();
+    return main_loop_init();
 }
 
-Location *loc_push_restore(Location *loc)
+void slirp_update_timeout(uint32_t *timeout)
 {
-    return loc;
 }
 
-Location *loc_push_none(Location *loc)
+void slirp_select_fill(int *pnfds, fd_set *readfds,
+                       fd_set *writefds, fd_set *xfds)
 {
-    return loc;
 }
 
-Location *loc_pop(Location *loc)
+void slirp_select_poll(fd_set *readfds, fd_set *writefds,
+                       fd_set *xfds, int select_error)
 {
-    return loc;
 }
 
-Location *loc_save(Location *loc)
+void migrate_add_blocker(Error *reason)
 {
-    return loc;
 }
 
-void loc_restore(Location *loc)
+void migrate_del_blocker(Error *reason)
 {
 }
-
-void error_report(const char *fmt, ...)
-{
-    va_list args;
-
-    va_start(args, fmt);
-    vfprintf(stderr, fmt, args);
-    va_end(args);
-}