kvmvapic: Disable if there is insufficient memory

[qemu.git] / qemu-tool.c

diff --git a/qemu-tool.c b/qemu-tool.c
index 183a583fec262c8c4f8663ff26067e7a481d5a74..64b5e88bc7a684a39625c37cc0ce2c7a299d306d 100644 (file)
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -24,14 +24,17 @@
 
 #include <sys/time.h>
 
-FILE *logfile;
-
 struct QEMUBH
 {
     QEMUBHFunc *cb;
     void *opaque;
 };
 
+const char *qemu_get_vm_name(void)
+{
+    return NULL;
+}
+
 Monitor *cur_mon;
 
 int monitor_cur_is_qmp(void)
@@ -61,7 +64,7 @@ void monitor_protocol_event(MonitorEvent event, QObject *data)
 
 int64_t cpu_get_clock(void)
 {
-    abort();
+    return qemu_get_clock_ns(rt_clock);
 }
 
 int64_t cpu_get_icount(void)
@@ -87,10 +90,13 @@ int qemu_init_main_loop(void)
 {
     init_clocks();
     init_timer_alarm();
-    qemu_clock_enable(vm_clock, false);
     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)
 {