From 468cc7cf3b85dd20a833773e6bde9f720f2df677 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 7 Oct 2013 17:21:51 +0200 Subject: 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 Signed-off-by: Paolo Bonzini --- cpus.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'cpus.c') diff --git a/cpus.c b/cpus.c index f075335..a2d09f3 100644 --- a/cpus.c +++ b/cpus.c @@ -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); } -- cgit v1.1