do not use qemu_icount_delta in the !use_icount case
commitc9f7383c6e5423c1b5111d73346a8314b563f019
authorPaolo Bonzini <pbonzini@redhat.com>
Mon, 21 Feb 2011 08:51:23 +0000 (21 09:51 +0100)
committerEdgar E. Iglesias <edgar.iglesias@petalogix.com>
Wed, 23 Feb 2011 09:42:32 +0000 (23 10:42 +0100)
tree78aded7d4f2bd8d8f73322e6e5f228305e2e7336
parent9a31334f419c1d773cf4b4bfbbdace96fbf8a4f4
do not use qemu_icount_delta in the !use_icount case

The !use_icount code is the same for iothread and non-iothread,
except that the timeout is different.  Since the timeout might as
well be infinite and is only masking bugs, use the higher value.
With this change the !use_icount code is handled equivalently
in qemu_icount_delta and qemu_calculate_timeout, and we rip it
out of the former.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@petalogix.com>
qemu-timer.c