diff options
| author | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2012-02-29 14:41:32 +0000 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2012-02-29 15:48:44 +0100 |
| commit | 4889978e94bd16c5374f473d57f5e757fbe72485 (patch) | |
| tree | 1405fde2bfb87b65538628b7be9cda56adf48f24 | |
| parent | 6ce2d77abeb7dece24612e884a74d149cdf52376 (diff) | |
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>
| -rw-r--r-- | qemu-tool.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |