From 4889978e94bd16c5374f473d57f5e757fbe72485 Mon Sep 17 00:00:00 2001 From: Stefan Hajnoczi Date: Wed, 29 Feb 2012 14:41:32 +0000 Subject: qemu-tool: revert cpu_get_clock() abort(3) Despite the fact that the qemu-tool environment has no guest running and vm_clock therefore does not make sense, there is code that gets the vm_clock time even in qemu-tool. Therefore, revert the abort(3) call and just return 0 like we used to. This unbreaks qemu-img/qemu-io with QED and Kevin has also expressed interest in this for qcow2. Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- qemu-tool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qemu-tool.c b/qemu-tool.c index 183a583fe..edb84f5f5 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) { - abort(); + return 0; } int64_t cpu_get_icount(void) -- cgit v1.2.3