dataplane: handle misaligned virtio-blk requests

[qemu.git] / qemu-tool.c

diff --git a/qemu-tool.c b/qemu-tool.c
index 6579b00552fe503b86ee46ad6988df96d0f3dd65..1a474c45bcb5f05a0c4dba2e2abbe5698fb62bc2 100644 (file)
--- a/qemu-tool.c
+++ b/qemu-tool.c
@@ -14,26 +14,35 @@
  */
 
 #include "qemu-common.h"
-#include "monitor.h"
-#include "qemu-timer.h"
-#include "qemu-log.h"
-#include "migration.h"
-#include "main-loop.h"
-#include "qemu_socket.h"
+#include "monitor/monitor.h"
+#include "qemu/timer.h"
+#include "qemu/log.h"
+#include "migration/migration.h"
+#include "qemu/main-loop.h"
+#include "sysemu/sysemu.h"
+#include "qemu/sockets.h"
 #include "slirp/libslirp.h"
 
 #include <sys/time.h>
 
-FILE *logfile;
-
 struct QEMUBH
 {
     QEMUBHFunc *cb;
     void *opaque;
 };
 
+const char *qemu_get_vm_name(void)
+{
+    return NULL;
+}
+
 Monitor *cur_mon;
 
+void vm_stop(RunState state)
+{
+    abort();
+}
+
 int monitor_cur_is_qmp(void)
 {
     return 0;
@@ -61,7 +70,7 @@ void monitor_protocol_event(MonitorEvent event, QObject *data)
 
 int64_t cpu_get_clock(void)
 {
-    return qemu_get_clock_ns(rt_clock);
+    return get_clock_realtime();
 }
 
 int64_t cpu_get_icount(void)
@@ -83,11 +92,8 @@ void qemu_clock_warp(QEMUClock *clock)
 {
 }
 
-int qemu_init_main_loop(void)
+void slirp_update_timeout(uint32_t *timeout)
 {
-    init_clocks();
-    init_timer_alarm();
-    return main_loop_init();
 }
 
 void slirp_select_fill(int *pnfds, fd_set *readfds,