From 1d45cea5496fe509f0b66f01b876067e68a5faa0 Mon Sep 17 00:00:00 2001 From: Cao jin Date: Fri, 29 Jul 2016 19:05:37 +0800 Subject: cpus: rename local variable to meaningful one 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 Message-Id: <1469790338-28990-3-git-send-email-caoj.fnst@cn.fujitsu.com> Signed-off-by: Paolo Bonzini --- cpus.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cpus.c') diff --git a/cpus.c b/cpus.c index 84c3520d44..e11caf7ced 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 timer and handle stop/restart */ -- cgit v1.2.3-55-g7522 From d90f3cca87844ea797a1c96b88758478ac575e1f Mon Sep 17 00:00:00 2001 From: Cao jin Date: Fri, 29 Jul 2016 19:05:38 +0800 Subject: cpus: update comments The returned value of cpu_get_clock() is plused with the offset, so it is the time elapsed in virtual machine when vm is active. Cc: Paolo Bonzini Cc Peter Crosthwaite Cc: Richard Henderson Signed-off-by: Cao jin Message-Id: <1469790338-28990-4-git-send-email-caoj.fnst@cn.fujitsu.com> Signed-off-by: Paolo Bonzini --- cpus.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'cpus.c') diff --git a/cpus.c b/cpus.c index e11caf7ced..030843132f 100644 --- a/cpus.c +++ b/cpus.c @@ -191,8 +191,12 @@ int64_t cpu_icount_to_ns(int64_t icount) return icount << icount_time_shift; } -/* return the host CPU cycle counter and handle stop/restart */ -/* Caller must hold the BQL */ +/* return the time elapsed in VM between vm_start and vm_stop. Unless + * icount is active, cpu_get_ticks() uses units of the host CPU cycle + * counter. + * + * Caller must hold the BQL + */ int64_t cpu_get_ticks(void) { int64_t ticks; @@ -229,7 +233,8 @@ static int64_t cpu_get_clock_locked(void) return time; } -/* return the host CPU monotonic timer and handle stop/restart */ +/* Return the monotonic time elapsed in VM, i.e., + * the time between vm_start and vm_stop */ int64_t cpu_get_clock(void) { int64_t ti; -- cgit v1.2.3-55-g7522