error: Trim includes after "Infrastructure to track locations..."

[mirror_qemu.git] / qemu-tool.c

diff --git a/qemu-tool.c b/qemu-tool.c
index 74d4b4f80eeb62b100e9a95018ea8218879ed1b7..dda752b7d26f1ab096fe4631a6ae1758a911be45 100644 (file)
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -12,14 +12,17 @@
  */
 
 #include "qemu-common.h"
-#include "console.h"
-#include "sysemu.h"
+#include "monitor.h"
 #include "qemu-timer.h"
+#include "qemu-log.h"
+#include "qemu-error.h"
 
 #include <sys/time.h>
 
 QEMUClock *rt_clock;
 
+FILE *logfile;
+
 struct QEMUBH
 {
     QEMUBHFunc *cb;
@@ -30,11 +33,28 @@ void qemu_service_io(void)
 {
 }
 
-void term_printf(const char *fmt, ...)
+void monitor_printf(Monitor *mon, const char *fmt, ...)
 {
 }
 
-void term_print_filename(const char *filename)
+void monitor_print_filename(Monitor *mon, const char *filename)
+{
+}
+
+void async_context_push(void)
+{
+}
+
+void async_context_pop(void)
+{
+}
+
+int get_async_context_id(void)
+{
+    return 0;
+}
+
+void monitor_protocol_event(MonitorEvent event, QObject *data)
 {
 }
 
@@ -43,10 +63,8 @@ QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque)
     QEMUBH *bh;
 
     bh = qemu_malloc(sizeof(*bh));
-    if (bh) {
-        bh->cb = cb;
-        bh->opaque = opaque;
-    }
+    bh->cb = cb;
+    bh->opaque = opaque;
 
     return bh;
 }
@@ -71,7 +89,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)
@@ -81,7 +99,40 @@ int qemu_set_fd_handler2(int fd,
 
 int64_t qemu_get_clock(QEMUClock *clock)
 {
-    struct timeval tv;
+    qemu_timeval tv;
     qemu_gettimeofday(&tv);
     return (tv.tv_sec * 1000000000LL + (tv.tv_usec * 1000)) / 1000000;
 }
+
+Location *loc_push_restore(Location *loc)
+{
+    return loc;
+}
+
+Location *loc_push_none(Location *loc)
+{
+    return loc;
+}
+
+Location *loc_pop(Location *loc)
+{
+    return loc;
+}
+
+Location *loc_save(Location *loc)
+{
+    return loc;
+}
+
+void loc_restore(Location *loc)
+{
+}
+
+void error_report(const char *fmt, ...)
+{
+    va_list args;
+
+    va_start(args, fmt);
+    vfprintf(stderr, fmt, args);
+    va_end(args);
+}