icount_time_shift is used for calculting the delay qemu has to sleep in order to synchronise the host and guest clocks. Therefore, we need it in cpu-exec.c.
Signed-off-by: Sebastian Tanase <sebastian.tan...@openwide.fr> Tested-by: Camille Bégué <camille.be...@openwide.fr> --- cpus.c | 8 ++++++-- include/qemu-common.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/cpus.c b/cpus.c index 3fa8ce7..312c2ee 100644 --- a/cpus.c +++ b/cpus.c @@ -105,8 +105,12 @@ static bool all_cpu_threads_idle(void) /* Compensate for varying guest execution speed. */ static int64_t qemu_icount_bias; static int64_t vm_clock_warp_start; -/* Conversion factor from emulated instructions to virtual clock ticks. */ -static int icount_time_shift; +/* Conversion factor from emulated instructions to virtual clock ticks. + * icount_time_shift is defined as extern in include/qemu-common.h because + * it is used (in cpu-exec.c) for calculating the delay for sleeping + * qemu in order to align the host and virtual clocks. + */ +int icount_time_shift; /* Arbitrarily pick 1MIPS as the minimum allowable speed. */ #define MAX_ICOUNT_SHIFT 10 diff --git a/include/qemu-common.h b/include/qemu-common.h index 860bb15..f568635 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -108,6 +108,7 @@ static inline char *realpath(const char *path, char *resolved_path) /* icount */ void configure_icount(QemuOpts *opts, Error **errp); extern int use_icount; +extern int icount_time_shift; extern int icount_align_option; #include "qemu/osdep.h" -- 2.0.0.rc2