From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:50250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QN2NY-0002Pk-L5 for qemu-devel@nongnu.org; Thu, 19 May 2011 08:31:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QN2NX-0003uE-Nt for qemu-devel@nongnu.org; Thu, 19 May 2011 08:31:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:29918) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QN2NX-0003ty-Gn for qemu-devel@nongnu.org; Thu, 19 May 2011 08:30:59 -0400 From: Kevin Wolf Date: Thu, 19 May 2011 14:33:22 +0200 Message-Id: <1305808412-16994-9-git-send-email-kwolf@redhat.com> In-Reply-To: <1305808412-16994-1-git-send-email-kwolf@redhat.com> References: <1305808412-16994-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 08/18] qemu-tool: Stub out qemu-timer functions 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 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 Signed-off-by: Kevin Wolf --- 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.2.3