From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58388) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTVPv-0004CO-FV for qemu-devel@nongnu.org; Wed, 10 Feb 2016 09:06:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTVPq-0001BO-CP for qemu-devel@nongnu.org; Wed, 10 Feb 2016 09:06:51 -0500 From: Christopher Covington Date: Wed, 10 Feb 2016 09:06:32 -0500 Message-Id: <1455113192-27139-1-git-send-email-cov@codeaurora.org> Subject: [Qemu-devel] [PATCH] Rename cpu_get_icount_{locked,biased} List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Aaron Lindsay , qemu-trivial@nongnu.org, Peter Crosthwaite , qemu-devel@nongnu.org, Alistair Francis , Christopher Covington , Paolo Bonzini , Richard Henderson The function does not provide locking but rather adds a bias value. Signed-off-by: Christopher Covington --- cpus.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cpus.c b/cpus.c index 898426c..50403c4 100644 --- a/cpus.c +++ b/cpus.c @@ -164,7 +164,7 @@ int64_t cpu_get_icount_raw(void) } /* Return the virtual CPU time, based on the instruction counter. */ -static int64_t cpu_get_icount_locked(void) +static int64_t cpu_get_icount_biased(void) { int64_t icount = cpu_get_icount_raw(); return timers_state.qemu_icount_bias + cpu_icount_to_ns(icount); @@ -177,7 +177,7 @@ int64_t cpu_get_icount(void) do { start = seqlock_read_begin(&timers_state.vm_clock_seqlock); - icount = cpu_get_icount_locked(); + icount = cpu_get_icount_biased(); } while (seqlock_read_retry(&timers_state.vm_clock_seqlock, start)); return icount; @@ -293,7 +293,7 @@ static void icount_adjust(void) seqlock_write_lock(&timers_state.vm_clock_seqlock); cur_time = cpu_get_clock_locked(); - cur_icount = cpu_get_icount_locked(); + cur_icount = cpu_get_icount_biased(); delta = cur_icount - cur_time; /* FIXME: This is a very crude algorithm, somewhat prone to oscillation. */ @@ -356,7 +356,7 @@ static void icount_warp_rt(void) * In adaptive mode, do not let QEMU_CLOCK_VIRTUAL run too * far ahead of real time. */ - int64_t cur_icount = cpu_get_icount_locked(); + int64_t cur_icount = cpu_get_icount_biased(); int64_t delta = clock - cur_icount; warp_delta = MIN(warp_delta, delta); } -- Qualcomm Innovation Center, Inc. Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project