From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:59983) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2lFR-0006O2-M6 for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:32 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S2lFF-0003hh-Q4 for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:21 -0500 Received: from mx1.redhat.com ([209.132.183.28]:64380) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S2lFF-0003h4-Ix for qemu-devel@nongnu.org; Wed, 29 Feb 2012 10:15:09 -0500 From: Kevin Wolf Date: Wed, 29 Feb 2012 16:18:06 +0100 Message-Id: <1330528688-21996-26-git-send-email-kwolf@redhat.com> In-Reply-To: <1330528688-21996-1-git-send-email-kwolf@redhat.com> References: <1330528688-21996-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 25/27] qemu-tool: revert cpu_get_clock() abort(3) List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Stefan Hajnoczi 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 files changed, 1 insertions(+), 1 deletions(-) diff --git a/qemu-tool.c b/qemu-tool.c index 183a583..edb84f5 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) -- 1.7.6.5