From: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
Date: Wed, 29 Feb 2012 14:41:32 +0000 (+0000)
Subject: qemu-tool: revert cpu_get_clock() abort(3)
X-Git-Tag: v1.1-rc0~290^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4889978e94bd16c5374f473d57f5e757fbe72485;p=thirdparty%2Fqemu.git

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 <stefanha@linux.vnet.ibm.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/qemu-tool.c b/qemu-tool.c
index 183a583fec2..edb84f5f5d4 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)