ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert wrong fixes for -icount in the iothread case 

This reverts commits 225d02cd and c9f7383c.  While some parts of
the latter could be saved, I preferred a smooth, complete revert.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Tested-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
This commit is contained in:
Paolo Bonzini 2011-04-13 10:03:45 +02:00 committed by Edgar E. Iglesias
parent ab33fcda9f
commit 1ece93a91b
1 changed files with 36 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
qemu-timer.c
View File

@ -110,9 +110,12 @@ static int64_t cpu_get_clock(void)
} }
} }
#ifndef CONFIG_IOTHREAD
static int64_t qemu_icount_delta(void) static int64_t qemu_icount_delta(void)
{ {
if (use_icount == 1) { if (!use_icount) {
return 5000 * (int64_t) 1000000;
} else if (use_icount == 1) {
/* When not using an adaptive execution frequency /* When not using an adaptive execution frequency
we tend to get badly out of sync with real time, we tend to get badly out of sync with real time,
so just delay for a reasonable amount of time. */ so just delay for a reasonable amount of time. */
@ -121,6 +124,7 @@ static int64_t qemu_icount_delta(void)
return cpu_get_icount() - cpu_get_clock(); return cpu_get_icount() - cpu_get_clock();
} }
} }
#endif
/* enable cpu_get_ticks() */ /* enable cpu_get_ticks() */
void cpu_enable_ticks(void) void cpu_enable_ticks(void)
@ -1147,39 +1151,41 @@ void quit_timers(void)
int qemu_calculate_timeout(void) int qemu_calculate_timeout(void)
{ {
#ifndef CONFIG_IOTHREAD
int timeout; int timeout;
int64_t add;
int64_t delta;
/* When using icount, making forward progress with qemu_icount when the if (!vm_running)
guest CPU is idle is critical. We only use the static io-thread timeout timeout = 5000;
for non icount runs. */ else {
if (!use_icount || !vm_running) { /* XXX: use timeout computed from timers */
return 5000; int64_t add;
} int64_t delta;
/* Advance virtual time to the next event. */
/* Advance virtual time to the next event. */ delta = qemu_icount_delta();
delta = qemu_icount_delta(); if (delta > 0) {
if (delta > 0) { /* If virtual time is ahead of real time then just
/* If virtual time is ahead of real time then just wait for IO. */
wait for IO. */ timeout = (delta + 999999) / 1000000;
timeout = (delta + 999999) / 1000000; } else {
} else { /* Wait for either IO to occur or the next
/* Wait for either IO to occur or the next timer event. */
timer event. */ add = qemu_next_deadline();
add = qemu_next_deadline(); /* We advance the timer before checking for IO.
/* We advance the timer before checking for IO. Limit the amount we advance so that early IO
Limit the amount we advance so that early IO activity won't get the guest too far ahead. */
activity won't get the guest too far ahead. */ if (add > 10000000)
if (add > 10000000) add = 10000000;
add = 10000000; delta += add;
delta += add; qemu_icount += qemu_icount_round (add);
qemu_icount += qemu_icount_round (add); timeout = delta / 1000000;
timeout = delta / 1000000; if (timeout < 0)
if (timeout < 0) timeout = 0;
timeout = 0; }
} }
return timeout; return timeout;
#else /* CONFIG_IOTHREAD */
return 1000;
#endif
} }