From: Paolo Bonzini Date: Thu, 12 Apr 2012 12:00:52 +0000 (+0200) Subject: qemu-tool: map vm_clock to rt_clock X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8a83205d34fbd7b12061f4e85148eb4b587acdcc;p=qemu.git qemu-tool: map vm_clock to rt_clock QED uses vm_clock timers so that images are not touched during and after migration. This however does not apply to qemu-io and qemu-img. Treat vm_clock as a synonym for rt_clock there, and enable it. Signed-off-by: Paolo Bonzini Signed-off-by: Kevin Wolf --- diff --git a/qemu-tool.c b/qemu-tool.c index edb84f5f5d..6579b00552 100644 --- a/qemu-tool.c +++ b/qemu-tool.c @@ -61,7 +61,7 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) int64_t cpu_get_clock(void) { - return 0; + return qemu_get_clock_ns(rt_clock); } int64_t cpu_get_icount(void) @@ -87,7 +87,6 @@ int qemu_init_main_loop(void) { init_clocks(); init_timer_alarm(); - qemu_clock_enable(vm_clock, false); return main_loop_init(); }