diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2013-10-07 17:21:51 +0200 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-10-17 17:31:00 +0200 |
commit | 468cc7cf3b85dd20a833773e6bde9f720f2df677 (patch) | |
tree | a7d3db420ee95f01332aed72d01fc0774e4fad86 | |
parent | add40e9777de139fb317ca6b1fb0dc142601cfcd (diff) | |
download | qemu-468cc7cf3b85dd20a833773e6bde9f720f2df677.zip qemu-468cc7cf3b85dd20a833773e6bde9f720f2df677.tar.gz qemu-468cc7cf3b85dd20a833773e6bde9f720f2df677.tar.bz2 |
icount: use cpu_get_icount() directly
This will help later when we will have to place these calls in
a critical section, and thus call a version of cpu_get_icount()
that does not take the lock.
Reviewed-by: Alex Bligh <alex@alex.org.uk>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | cpus.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -236,12 +236,15 @@ static void icount_adjust(void) int64_t cur_icount; int64_t delta; static int64_t last_delta; + /* If the VM is not running, then do nothing. */ if (!runstate_is_running()) { return; } + cur_time = cpu_get_clock(); - cur_icount = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + cur_icount = cpu_get_icount(); + delta = cur_icount - cur_time; /* FIXME: This is a very crude algorithm, somewhat prone to oscillation. */ if (delta > 0 @@ -297,7 +300,7 @@ static void icount_warp_rt(void *opaque) * far ahead of real time. */ int64_t cur_time = cpu_get_clock(); - int64_t cur_icount = qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL); + int64_t cur_icount = cpu_get_icount(); int64_t delta = cur_time - cur_icount; qemu_icount_bias += MIN(warp_delta, delta); } |