summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-04-12 14:00:52 +0200
committerKevin Wolf <kwolf@redhat.com>2012-04-19 16:30:25 +0200
commit8a83205d34fbd7b12061f4e85148eb4b587acdcc (patch)
tree163c45f3ab658c425cfbf7ba24402fb5cf3e864e
parenta5a5238ee49cd6a0f598f6f63a4a43dbe18d12b7 (diff)
downloadqemu-8a83205d34fbd7b12061f4e85148eb4b587acdcc.tar.gz
qemu-8a83205d34fbd7b12061f4e85148eb4b587acdcc.tar.bz2
qemu-8a83205d34fbd7b12061f4e85148eb4b587acdcc.zip
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 <pbonzini@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--qemu-tool.c3
1 files changed, 1 insertions, 2 deletions
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();
}