vnc: rename vnc-encoding-* vnc-enc-*

[qemu.git] / qemu-tool.c

diff --git a/qemu-tool.c b/qemu-tool.c
index b35ea8e1c21c661f63f161b6737e0d55241bc8ba..b39af86e0105fc165e03715ecfc3ff6ed63531b3 100644 (file)
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -13,7 +13,6 @@
 
 #include "qemu-common.h"
 #include "monitor.h"
-#include "sysemu.h"
 #include "qemu-timer.h"
 #include "qemu-log.h"
 
@@ -35,6 +34,19 @@ void qemu_service_io(void)
 
 Monitor *cur_mon;
 
+int monitor_cur_is_qmp(void)
+{
+    return 0;
+}
+
+void monitor_set_error(Monitor *mon, QError *qerror)
+{
+}
+
+void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
+{
+}
+
 void monitor_printf(Monitor *mon, const char *fmt, ...)
 {
 }
@@ -56,6 +68,10 @@ int get_async_context_id(void)
     return 0;
 }
 
+void monitor_protocol_event(MonitorEvent event, QObject *data)
+{
+}
+
 QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque)
 {
     QEMUBH *bh;
@@ -87,7 +103,7 @@ void qemu_bh_delete(QEMUBH *bh)
 }
 
 int qemu_set_fd_handler2(int fd,
-                         IOCanRWHandler *fd_read_poll,
+                         IOCanReadHandler *fd_read_poll,
                          IOHandler *fd_read,
                          IOHandler *fd_write,
                          void *opaque)
@@ -101,12 +117,3 @@ int64_t qemu_get_clock(QEMUClock *clock)
     qemu_gettimeofday(&tv);
     return (tv.tv_sec * 1000000000LL + (tv.tv_usec * 1000)) / 1000000;
 }
-
-void qemu_error(const char *fmt, ...)
-{
-    va_list args;
-
-    va_start(args, fmt);
-    vfprintf(stderr, fmt, args);
-    va_end(args);
-}