From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:38701) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJSed-0002JI-VM for qemu-devel@nongnu.org; Mon, 09 May 2011 11:45:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QJSed-0002wO-4Z for qemu-devel@nongnu.org; Mon, 09 May 2011 11:45:51 -0400 Received: from mtagate3.uk.ibm.com ([194.196.100.163]:33527) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QJSec-0002wF-Rj for qemu-devel@nongnu.org; Mon, 09 May 2011 11:45:51 -0400 Received: from d06nrmr1307.portsmouth.uk.ibm.com (d06nrmr1307.portsmouth.uk.ibm.com [9.149.38.129]) by mtagate3.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p49FjluB017068 for ; Mon, 9 May 2011 15:45:48 GMT Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p49FjlNC2420884 for ; Mon, 9 May 2011 16:45:47 +0100 Received: from d06av08.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p49FjlrD011183 for ; Mon, 9 May 2011 16:45:47 +0100 From: Stefan Hajnoczi Date: Mon, 9 May 2011 16:45:39 +0100 Message-Id: <1304955940-18965-2-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1304955940-18965-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1304955940-18965-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH v2 1/2] qemu-tool: Stub out qemu-timer functions List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi Block drivers may use timers for flushing metadata to disk or reconnecting to a network drive. Stub out the following functions in qemu-tool.c: QEMUTimer *qemu_new_timer_ns(QEMUClock *clock, int scale, QEMUTimerCB *cb, void *opaque) void qemu_free_timer(QEMUTimer *ts) void qemu_del_timer(QEMUTimer *ts) void qemu_mod_timer(QEMUTimer *ts, int64_t expire_time) int64_t qemu_get_clock_ns(QEMUClock *clock) They will result in timers never firing when linked against qemu-tool.o. Signed-off-by: Stefan Hajnoczi --- qemu-tool.c | 25 +++++++++++++++++++++++++ 1 files changed, 25 insertions(+), 0 deletions(-) diff --git a/qemu-tool.c b/qemu-tool.c index f4a6ad0..41e5c41 100644 --- a/qemu-tool.c +++ b/qemu-tool.c @@ -19,6 +19,7 @@ #include QEMUClock *rt_clock; +QEMUClock *vm_clock; FILE *logfile; @@ -71,3 +72,27 @@ int qemu_set_fd_handler2(int fd, void qemu_notify_event(void) { } + +QEMUTimer *qemu_new_timer(QEMUClock *clock, int scale, + QEMUTimerCB *cb, void *opaque) +{ + return qemu_malloc(1); +} + +void qemu_free_timer(QEMUTimer *ts) +{ + qemu_free(ts); +} + +void qemu_del_timer(QEMUTimer *ts) +{ +} + +void qemu_mod_timer(QEMUTimer *ts, int64_t expire_time) +{ +} + +int64_t qemu_get_clock_ns(QEMUClock *clock) +{ + return 0; +} -- 1.7.4.4