aboutsummaryrefslogtreecommitdiff
path: root/cpu-all.h
diff options
context:
space:
mode:
authorRichard Henderson <rth@twiddle.net>2010-04-17 16:25:10 +0000
committerBlue Swirl <blauwirbel@gmail.com>2010-04-17 16:25:10 +0000
commit2d8ebcf94ee461dea9eb363be7becb769d9a962f (patch)
tree9208e57f9e950459b07462996f64f1f2ed442425 /cpu-all.h
parent42a8aa8393b931c92662578bc6b0b82c54fe63f8 (diff)
downloadqemu-2d8ebcf94ee461dea9eb363be7becb769d9a962f.zip
qemu-2d8ebcf94ee461dea9eb363be7becb769d9a962f.tar.gz
qemu-2d8ebcf94ee461dea9eb363be7becb769d9a962f.tar.bz2
Fix --enable-profiler compilation.
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 <rth@twiddle.net> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'cpu-all.h')
-rw-r--r--cpu-all.h12
1 files changed, 0 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);