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>
This commit is contained in:
parent
42a8aa8393
commit
2d8ebcf94e
12
cpu-all.h
12
cpu-all.h
|
@ -943,18 +943,6 @@ void dump_exec_info(FILE *f,
|
||||||
int cpu_memory_rw_debug(CPUState *env, target_ulong addr,
|
int cpu_memory_rw_debug(CPUState *env, target_ulong addr,
|
||||||
uint8_t *buf, int len, int is_write);
|
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,
|
void cpu_inject_x86_mce(CPUState *cenv, int bank, uint64_t status,
|
||||||
uint64_t mcg_status, uint64_t addr, uint64_t misc);
|
uint64_t mcg_status, uint64_t addr, uint64_t misc);
|
||||||
|
|
||||||
|
|
11
qemu-timer.h
11
qemu-timer.h
|
@ -236,4 +236,15 @@ static inline int can_do_io(CPUState *env)
|
||||||
}
|
}
|
||||||
#endif
|
#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
|
#endif
|
||||||
|
|
|
@ -47,6 +47,7 @@
|
||||||
#include "qemu-common.h"
|
#include "qemu-common.h"
|
||||||
#include "cache-utils.h"
|
#include "cache-utils.h"
|
||||||
#include "host-utils.h"
|
#include "host-utils.h"
|
||||||
|
#include "qemu-timer.h"
|
||||||
|
|
||||||
/* Note: the long term plan is to reduce the dependancies on the QEMU
|
/* Note: the long term plan is to reduce the dependancies on the QEMU
|
||||||
CPU definitions. Currently they are used for qemu_ld/st
|
CPU definitions. Currently they are used for qemu_ld/st
|
||||||
|
|
Reference in New Issue