json-parser: don't replicate tokens at each level of recursion

[qemu.git] / qemu-tool.c

diff --git a/qemu-tool.c b/qemu-tool.c
index 87cc2949b2291b9d50af5ca750601685fc78db9b..18205bababe093b9582d2a4ed962f3584a895700 100644 (file)
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -9,79 +9,128 @@
  * 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 "console.h"
-#include "sysemu.h"
+#include "monitor.h"
 #include "qemu-timer.h"
+#include "qemu-log.h"
+#include "migration.h"
+#include "main-loop.h"
+#include "qemu_socket.h"
+#include "slirp/libslirp.h"
 
 #include <sys/time.h>
 
-QEMUClock *rt_clock;
-
 struct QEMUBH
 {
     QEMUBHFunc *cb;
     void *opaque;
 };
 
-void qemu_service_io(void)
+const char *qemu_get_vm_name(void)
 {
+    return NULL;
 }
 
-void term_printf(const char *fmt, ...)
+Monitor *cur_mon;
+
+int monitor_cur_is_qmp(void)
 {
+    return 0;
 }
 
-void term_print_filename(const char *filename)
+void monitor_set_error(Monitor *mon, QError *qerror)
 {
 }
 
-QEMUBH *qemu_bh_new(QEMUBHFunc *cb, void *opaque)
+void monitor_vprintf(Monitor *mon, const char *fmt, va_list ap)
 {
-    QEMUBH *bh;
+}
 
-    bh = qemu_malloc(sizeof(*bh));
-    if (bh) {
-        bh->cb = cb;
-        bh->opaque = opaque;
-    }
+void monitor_printf(Monitor *mon, const char *fmt, ...)
+{
+}
 
-    return bh;
+void monitor_print_filename(Monitor *mon, const char *filename)
+{
 }
 
-int qemu_bh_poll(void)
+void monitor_protocol_event(MonitorEvent event, QObject *data)
 {
-    return 0;
 }
 
-void qemu_bh_schedule(QEMUBH *bh)
+int monitor_fdset_get_fd(int64_t fdset_id, int flags)
 {
-    bh->cb(bh->opaque);
+    return -1;
 }
 
-void qemu_bh_cancel(QEMUBH *bh)
+int monitor_fdset_dup_fd_add(int64_t fdset_id, int dup_fd)
 {
+    return -1;
 }
 
-void qemu_bh_delete(QEMUBH *bh)
+int monitor_fdset_dup_fd_remove(int dup_fd)
 {
-    qemu_free(bh);
+    return -1;
 }
 
-int qemu_set_fd_handler2(int fd,
-                         IOCanRWHandler *fd_read_poll,
-                         IOHandler *fd_read,
-                         IOHandler *fd_write,
-                         void *opaque)
+int monitor_fdset_dup_fd_find(int dup_fd)
+{
+    return -1;
+}
+
+int64_t cpu_get_clock(void)
+{
+    return qemu_get_clock_ns(rt_clock);
+}
+
+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();
+    return main_loop_init();
+}
+
+void slirp_update_timeout(uint32_t *timeout)
+{
+}
+
+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)
 {
-    return 0;
 }
 
-int64_t qemu_get_clock(QEMUClock *clock)
+void migrate_del_blocker(Error *reason)
 {
-    struct timeval tv;
-    gettimeofday(&tv, NULL);
-    return (tv.tv_sec * 1000000000LL + (tv.tv_usec * 1000)) / 1000000;
 }