From cb842c90a485d9dbf05fa51e1500b3c1a1931256 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 13 Apr 2011 10:03:46 +0200 Subject: qemu_next_deadline should not consider host-time timers It is purely for icount-based virtual timers. And now that we got the code right, rename the function to clarify the intended scope. Signed-off-by: Paolo Bonzini Tested-by: Edgar E. Iglesias Signed-off-by: Edgar E. Iglesias --- cpus.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'cpus.c') diff --git a/cpus.c b/cpus.c index 6a50199..1fc34b7 100644 --- a/cpus.c +++ b/cpus.c @@ -833,7 +833,7 @@ static void *qemu_tcg_cpu_thread_fn(void *arg) while (1) { cpu_exec_all(); - if (use_icount && qemu_next_deadline() <= 0) { + if (use_icount && qemu_next_icount_deadline() <= 0) { qemu_notify_event(); } qemu_tcg_wait_io_event(); @@ -1050,7 +1050,7 @@ static int tcg_cpu_exec(CPUState *env) qemu_icount -= (env->icount_decr.u16.low + env->icount_extra); env->icount_decr.u16.low = 0; env->icount_extra = 0; - count = qemu_icount_round (qemu_next_deadline()); + count = qemu_icount_round(qemu_next_icount_deadline()); qemu_icount += count; decr = (count > 0xffff) ? 0xffff : count; count -= decr; -- cgit v1.1