diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2011-09-12 13:57:37 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2011-10-21 18:14:30 +0200 |
| commit | 946fb27c1dc158f10a6e3ce0374a161dce04c27b (patch) | |
| tree | 1825f63a5fff335fd8b43980261fb4551a8193ba /qemu-timer.h | |
| parent | dc2dfcf0002b4e6be494959a1ed2589dd109def0 (diff) | |
| download | qemu-946fb27c1dc158f10a6e3ce0374a161dce04c27b.tar.gz | |
qemu-timer: move icount to cpus.c
None of this is needed by tools, and most of it can even be made static
inside cpus.c.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'qemu-timer.h')
| -rw-r--r-- | qemu-timer.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/qemu-timer.h b/qemu-timer.h index 4578075f6f..ce576b90a4 100644 --- a/qemu-timer.h +++ b/qemu-timer.h @@ -58,9 +58,7 @@ int qemu_timer_expired(QEMUTimer *timer_head, int64_t current_time); void qemu_run_all_timers(void); int qemu_alarm_pending(void); -int64_t qemu_next_icount_deadline(void); void configure_alarms(char const *opt); -void configure_icount(const char *option); int qemu_calculate_timeout(void); void init_clocks(void); int init_timer_alarm(void); @@ -153,12 +151,8 @@ void ptimer_run(ptimer_state *s, int oneshot); void ptimer_stop(ptimer_state *s); /* icount */ -int64_t qemu_icount_round(int64_t count); -extern int64_t qemu_icount; -extern int use_icount; -extern int icount_time_shift; -extern int64_t qemu_icount_bias; int64_t cpu_get_icount(void); +int64_t cpu_get_clock(void); /*******************************************/ /* host CPU ticks (if available) */ @@ -314,22 +308,6 @@ static inline int64_t cpu_get_real_ticks (void) } #endif -#ifdef NEED_CPU_H -/* Deterministic execution requires that IO only be performed on the last - instruction of a TB so that interrupts take effect immediately. */ -static inline int can_do_io(CPUState *env) -{ - if (!use_icount) - return 1; - - /* If not executing code then assume we are ok. */ - if (!env->current_tb) - return 1; - - return env->can_do_io != 0; -} -#endif - #ifdef CONFIG_PROFILER static inline int64_t profile_getclock(void) { |