From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O2mtU-0001wg-Rb for qemu-devel@nongnu.org; Fri, 16 Apr 2010 10:51:44 -0400 Received: from [140.186.70.92] (port=37606 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O2mtT-0001vl-6r for qemu-devel@nongnu.org; Fri, 16 Apr 2010 10:51:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O2mtS-0007Q0-33 for qemu-devel@nongnu.org; Fri, 16 Apr 2010 10:51:43 -0400 Received: from mail-pv0-f173.google.com ([74.125.83.173]:51742) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O2mtR-0007MA-U1 for qemu-devel@nongnu.org; Fri, 16 Apr 2010 10:51:42 -0400 Received: by mail-pv0-f173.google.com with SMTP id 12so1589639pvd.4 for ; Fri, 16 Apr 2010 07:51:41 -0700 (PDT) Sender: Richard Henderson From: Richard Henderson Date: Fri, 16 Apr 2010 09:50:44 -0500 Message-Id: <1271429444-900-3-git-send-email-rth@twiddle.net> In-Reply-To: <1271429444-900-2-git-send-email-rth@twiddle.net> References: <1271429444-900-1-git-send-email-rth@twiddle.net> <1271429444-900-2-git-send-email-rth@twiddle.net> Subject: [Qemu-devel] [PATCH 3/3] Fix --enable-profiler compilation. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.orgqemu-devel@nongnu.org Cc: blauwirbel@gmail.com There's a header file inclusion ordering problem between cpu-all.h and qemu-timer.h, such that cpu_get_real_ticks is not defined when we attempt to use it in profile_getclock. Signed-off-by: Richard Henderson --- cpu-all.h | 12 ------------ qemu-timer.h | 11 +++++++++++ tcg/tcg.c | 1 + 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cpu-all.h b/cpu-all.h index 3004d0f..7b1594c 100644 --- a/cpu-all.h +++ b/cpu-all.h @@ -943,18 +943,6 @@ void dump_exec_info(FILE *f, int cpu_memory_rw_debug(CPUState *env, target_ulong addr, uint8_t *buf, int len, int is_write); -/* profiling */ -#ifdef CONFIG_PROFILER -static inline int64_t profile_getclock(void) -{ - return cpu_get_real_ticks(); -} - -extern int64_t qemu_time, qemu_time_start; -extern int64_t tlb_flush_time; -extern int64_t dev_time; -#endif - void cpu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status, uint64_t mcg_status, uint64_t addr, uint64_t misc); diff --git a/qemu-timer.h b/qemu-timer.h index d2e15f4..62da887 100644 --- a/qemu-timer.h +++ b/qemu-timer.h @@ -236,4 +236,15 @@ static inline int can_do_io(CPUState *env) } #endif +#ifdef CONFIG_PROFILER +static inline int64_t profile_getclock(void) +{ + return cpu_get_real_ticks(); +} + +extern int64_t qemu_time, qemu_time_start; +extern int64_t tlb_flush_time; +extern int64_t dev_time; +#endif + #endif diff --git a/tcg/tcg.c b/tcg/tcg.c index 3294743..2261482 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -47,6 +47,7 @@ #include "qemu-common.h" #include "cache-utils.h" #include "host-utils.h" +#include "qemu-timer.h" /* Note: the long term plan is to reduce the dependancies on the QEMU CPU definitions. Currently they are used for qemu_ld/st -- 1.6.6.1