From patchwork Wed Sep 14 07:58:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 9330973 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 89222607FD for ; Wed, 14 Sep 2016 09:15:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7790629A13 for ; Wed, 14 Sep 2016 09:15:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A92729A4F; Wed, 14 Sep 2016 09:15:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7E34629A13 for ; Wed, 14 Sep 2016 09:15:12 +0000 (UTC) Received: from localhost ([::1]:54493 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bk6Hf-0000tC-Jo for patchwork-qemu-devel@patchwork.kernel.org; Wed, 14 Sep 2016 05:15:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49057) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bk6HC-0000r7-1v for qemu-devel@nongnu.org; Wed, 14 Sep 2016 05:14:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bk6H7-0003ju-UJ for qemu-devel@nongnu.org; Wed, 14 Sep 2016 05:14:41 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:51766) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bk6H7-0003iN-Ma; Wed, 14 Sep 2016 05:14:37 -0400 Received: from tsrv.tls.msk.ru (tsrv.tls.msk.ru [192.168.177.2]) by isrv.corpit.ru (Postfix) with ESMTP id 0D9FB41859; Wed, 14 Sep 2016 12:14:32 +0300 (MSK) Received: from tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by tsrv.tls.msk.ru (Postfix) with SMTP id E9F9CAF3; Wed, 14 Sep 2016 10:58:58 +0300 (MSK) Received: (nullmailer pid 17341 invoked by uid 1000); Wed, 14 Sep 2016 07:58:57 -0000 From: Michael Tokarev To: qemu-devel@nongnu.org Date: Wed, 14 Sep 2016 10:58:41 +0300 Message-Id: <5bf6ef20e190cb6189081f9abe7236ebc5836c41.1473839869.git.mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 86.62.121.231 Subject: [Qemu-devel] [PULL 15/27] cpus: rename local variable to meaningful one X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-trivial@nongnu.org, Paolo Bonzini , Cao jin , Michael Tokarev , Richard Henderson Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Cao jin The function actually returns monotonic time value in nanosecond, the "ticks" is not suitable. Cc: Paolo Bonzini Cc Peter Crosthwaite Cc: Richard Henderson Signed-off-by: Cao jin Signed-off-by: Michael Tokarev --- cpus.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cpus.c b/cpus.c index 0ab4ab1..a70b536 100644 --- a/cpus.c +++ b/cpus.c @@ -219,14 +219,14 @@ int64_t cpu_get_ticks(void) static int64_t cpu_get_clock_locked(void) { - int64_t ticks; + int64_t time; - ticks = timers_state.cpu_clock_offset; + time = timers_state.cpu_clock_offset; if (timers_state.cpu_ticks_enabled) { - ticks += get_clock(); + time += get_clock(); } - return ticks; + return time; } /* return the host CPU monotonic time */