[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/18] add qemu_icount_round
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 12/18] add qemu_icount_round |
Date: |
Wed, 10 Mar 2010 11:38:49 +0100 |
Signed-off-by: Paolo Bonzini <address@hidden>
---
vl.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/vl.c b/vl.c
index d05bae5..2f78817 100644
--- a/vl.c
+++ b/vl.c
@@ -731,6 +731,11 @@ static void configure_icount(const char *option)
qemu_get_clock(vm_clock) + get_ticks_per_sec() / 10);
}
+static int64_t qemu_icount_round(int64_t count)
+{
+ return (count + (1 << icount_time_shift) - 1) >> icount_time_shift;
+}
+
static struct qemu_alarm_timer alarm_timers[] = {
#ifndef _WIN32
#ifdef __linux__
@@ -3961,9 +3966,7 @@ static int qemu_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_next_deadline();
- count = (count + (1 << icount_time_shift) - 1)
- >> icount_time_shift;
+ count = qemu_icount_round (qemu_next_deadline());
qemu_icount += count;
decr = (count > 0xffff) ? 0xffff : count;
count -= decr;
@@ -4073,9 +4076,7 @@ static int qemu_calculate_timeout(void)
if (add > 10000000)
add = 10000000;
delta += add;
- add = (add + (1 << icount_time_shift) - 1)
- >> icount_time_shift;
- qemu_icount += add;
+ qemu_icount += qemu_icount_round (add);
timeout = delta / 1000000;
if (timeout < 0)
timeout = 0;
--
1.6.6
- [Qemu-devel] [PATCH 03/18] only one flag is needed for alarm_timer, (continued)
- [Qemu-devel] [PATCH 03/18] only one flag is needed for alarm_timer, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 04/18] more alarm timer cleanup, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 05/18] do not use qemu_event_increment outside qemu_notify_event, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 07/18] remove qemu_rearm_alarm_timer from main loop, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 08/18] extract timer handling out of main_loop_wait, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 06/18] tweak qemu_notify_event, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 10/18] introduce and use qemu_clock_enable, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 11/18] centralize handling of -icount, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 09/18] change qemu_run_timers interface, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 13/18] add qemu_alarm_pending, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 12/18] add qemu_icount_round,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 14/18] new function qemu_icount_delta, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 15/18] move vmstate registration of vmstate_timers earlier, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 16/18] place together more #ifdef CONFIG_IOTHREAD blocks, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 17/18] disentangle tcg and deadline calculation, Paolo Bonzini, 2010/03/10
- [Qemu-devel] [PATCH 18/18] split out qemu-timer.c, Paolo Bonzini, 2010/03/10