diff options
| -rw-r--r-- | qemu-timer.c | 59 |
1 files changed, 25 insertions, 34 deletions
diff --git a/qemu-timer.c b/qemu-timer.c index b0db780a1e..88c7b28853 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -112,9 +112,7 @@ static int64_t cpu_get_clock(void) static int64_t qemu_icount_delta(void) { - if (!use_icount) { - return 5000 * (int64_t) 1000000; - } else if (use_icount == 1) { + 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. */ @@ -1077,43 +1075,36 @@ void quit_timers(void) int qemu_calculate_timeout(void) { int timeout; + int64_t add; + int64_t delta; -#ifdef CONFIG_IOTHREAD /* When using icount, making forward progress with qemu_icount when the guest CPU is idle is critical. We only use the static io-thread timeout for non icount runs. */ - if (!use_icount) { - return 1000; + if (!use_icount || !vm_running) { + return 5000; } -#endif - if (!vm_running) - timeout = 5000; - else { - /* XXX: use timeout computed from timers */ - int64_t add; - int64_t delta; - /* Advance virtual time to the next event. */ - delta = qemu_icount_delta(); - if (delta > 0) { - /* If virtual time is ahead of real time then just - wait for IO. */ - timeout = (delta + 999999) / 1000000; - } else { - /* Wait for either IO to occur or the next - timer event. */ - add = qemu_next_deadline(); - /* We advance the timer before checking for IO. - Limit the amount we advance so that early IO - activity won't get the guest too far ahead. */ - if (add > 10000000) - add = 10000000; - delta += add; - qemu_icount += qemu_icount_round (add); - timeout = delta / 1000000; - if (timeout < 0) - timeout = 0; - } + /* Advance virtual time to the next event. */ + delta = qemu_icount_delta(); + if (delta > 0) { + /* If virtual time is ahead of real time then just + wait for IO. */ + timeout = (delta + 999999) / 1000000; + } else { + /* Wait for either IO to occur or the next + timer event. */ + add = qemu_next_deadline(); + /* We advance the timer before checking for IO. + Limit the amount we advance so that early IO + activity won't get the guest too far ahead. */ + if (add > 10000000) + add = 10000000; + delta += add; + qemu_icount += qemu_icount_round (add); + timeout = delta / 1000000; + if (timeout < 0) + timeout = 0; } return timeout; |