david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add qemu_icount_round

Browse Source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Paolo Bonzini 2010-03-10 11:38:49 +01:00 committed by Anthony Liguori
parent 4e3de9e954
commit e2a7bb4b15
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vl.c
View File

@ -731,6 +731,11 @@ static void configure_icount(const char *option)
qemu_get_clock(vm_clock) + get_ticks_per_sec() / 10); 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[] = { static struct qemu_alarm_timer alarm_timers[] = {
#ifndef _WIN32 #ifndef _WIN32
#ifdef __linux__ #ifdef __linux__
@ -3960,9 +3965,7 @@ static int qemu_cpu_exec(CPUState *env)
qemu_icount -= (env->icount_decr.u16.low + env->icount_extra); qemu_icount -= (env->icount_decr.u16.low + env->icount_extra);
env->icount_decr.u16.low = 0; env->icount_decr.u16.low = 0;
env->icount_extra = 0; env->icount_extra = 0;
count = qemu_next_deadline(); count = qemu_icount_round (qemu_next_deadline());
count = (count + (1 << icount_time_shift) - 1)
>> icount_time_shift;
qemu_icount += count; qemu_icount += count;
decr = (count > 0xffff) ? 0xffff : count; decr = (count > 0xffff) ? 0xffff : count;
count -= decr; count -= decr;
@ -4072,9 +4075,7 @@ static int qemu_calculate_timeout(void)
if (add > 10000000) if (add > 10000000)
add = 10000000; add = 10000000;
delta += add; delta += add;
add = (add + (1 << icount_time_shift) - 1) qemu_icount += qemu_icount_round (add);
>> icount_time_shift;
qemu_icount += add;
timeout = delta / 1000000; timeout = delta / 1000000;
if (timeout < 0) if (timeout < 0)
timeout = 0; timeout = 0;