From patchwork Wed Mar 10 10:38:51 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [14/18] new function qemu_icount_delta Date: Wed, 10 Mar 2010 00:38:51 -0000 From: Paolo Bonzini X-Patchwork-Id: 47243 Message-Id: <1268217535-26554-15-git-send-email-pbonzini@redhat.com> To: qemu-devel@nongnu.org Tweaking the rounding in qemu_next_deadline ensures that there's no change whatsoever. Signed-off-by: Paolo Bonzini --- vl.c | 29 ++++++++++++++++++----------- 1 files changed, 18 insertions(+), 11 deletions(-) diff --git a/vl.c b/vl.c index 18bd2ee..d10319f 100644 --- a/vl.c +++ b/vl.c @@ -548,6 +548,22 @@ static int64_t cpu_get_clock(void) } } +#ifndef CONFIG_IOTHREAD +static int64_t qemu_icount_delta(void) +{ + if (!use_icount) { + return 5000 * (int64_t) 1000000; + } else if (use_icount == 1) { + /* When not using an adaptive execution frequency + we tend to get badly out of sync with real time, + so just delay for a reasonable amount of time. */ + return 0; + } else { + return cpu_get_icount() - cpu_get_clock(); + } +} +#endif + /* enable cpu_get_ticks() */ void cpu_enable_ticks(void) { @@ -4052,25 +4068,16 @@ static int qemu_calculate_timeout(void) timeout = 5000; else if (tcg_has_work()) timeout = 0; - else if (!use_icount) - timeout = 5000; else { /* XXX: use timeout computed from timers */ int64_t add; int64_t delta; /* Advance virtual time to the next event. */ - if (use_icount == 1) { - /* When not using an adaptive execution frequency - we tend to get badly out of sync with real time, - so just delay for a reasonable amount of time. */ - delta = 0; - } else { - delta = cpu_get_icount() - cpu_get_clock(); - } + delta = qemu_icount_delta(); if (delta > 0) { /* If virtual time is ahead of real time then just wait for IO. */ - timeout = (delta / 1000000) + 1; + timeout = (delta + 999999) / 1000000; } else { /* Wait for either IO to occur or the next timer event. */