From c57c846a80f9306aa2c6cf7efdef45ed42723fac Mon Sep 17 00:00:00 2001 From: Blue Swirl Date: Sat, 23 Oct 2010 15:24:07 +0000 Subject: qemu-timer: move commonly used timer code to qemu-timer-common Move timer init functions to a new file, qemu-timer-common.c. Make other critical timer functions inlined to preserve performance in qemu-timer.c, also move muldiv64() (used by the inline functions) to qemu-timer.h. Adjust block/raw-posix.c and simpletrace.c to use get_clock() directly. Remove a similar/duplicate definition in qemu-tool.c. Adjust hw/omap_clk.c to include qemu-timer.h because muldiv64() is used there. After this change, tracing can be used also for user code and simpletrace on Win32. Cc: Stefan Hajnoczi Acked-by: Stefan Hajnoczi Signed-off-by: Blue Swirl --- Makefile.objs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile.objs') diff --git a/Makefile.objs b/Makefile.objs index 6e6f60a3af..f07fb01bc3 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -127,7 +127,7 @@ common-obj-y += iov.o acl.o common-obj-$(CONFIG_THREAD) += qemu-thread.o common-obj-$(CONFIG_IOTHREAD) += compatfd.o common-obj-y += notify.o event_notifier.o -common-obj-y += qemu-timer.o +common-obj-y += qemu-timer.o qemu-timer-common.o slirp-obj-y = cksum.o if.o ip_icmp.o ip_input.o ip_output.o slirp-obj-y += slirp.o mbuf.o misc.o sbuf.o socket.o tcp_input.o tcp_output.o @@ -278,6 +278,7 @@ libdis-$(CONFIG_SPARC_DIS) += sparc-dis.o trace-obj-y = trace.o ifeq ($(TRACE_BACKEND),simple) trace-obj-y += simpletrace.o +user-obj-y += qemu-timer-common.o endif vl.o: QEMU_CFLAGS+=$(GPROF_CFLAGS) -- cgit v1.2.3