qemu-trivial.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [Qemu-trivial] [PATCH] timer/cpus: fix some typos and update some comments
@ 2016-07-08 10:31 Cao jin
  2016-07-08 11:44 ` [Qemu-trivial] [Qemu-devel] " Cao jin
  2016-07-28 15:30 ` [Qemu-trivial] " Michael Tokarev
  0 siblings, 2 replies; 3+ messages in thread
From: Cao jin @ 2016-07-08 10:31 UTC (permalink / raw)
  To: qemu-devel; +Cc: bonzini, crosthwaite.peter, rth, qemu-trivial

Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
---
 cpus.c               | 6 +++---
 include/qemu/timer.h | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cpus.c b/cpus.c
index 84c3520..d4afd93 100644
--- a/cpus.c
+++ b/cpus.c
@@ -229,7 +229,7 @@ static int64_t cpu_get_clock_locked(void)
     return ticks;
 }
 
-/* return the host CPU monotonic timer and handle stop/restart */
+/* return the host CPU monotonic time */
 int64_t cpu_get_clock(void)
 {
     int64_t ti;
@@ -244,7 +244,7 @@ int64_t cpu_get_clock(void)
 }
 
 /* enable cpu_get_ticks()
- * Caller must hold BQL which server as mutex for vm_clock_seqlock.
+ * Caller must hold BQL which serve as mutex for vm_clock_seqlock.
  */
 void cpu_enable_ticks(void)
 {
@@ -260,7 +260,7 @@ void cpu_enable_ticks(void)
 
 /* disable cpu_get_ticks() : the clock is stopped. You must not call
  * cpu_get_ticks() after that.
- * Caller must hold BQL which server as mutex for vm_clock_seqlock.
+ * Caller must hold BQL which serve as mutex for vm_clock_seqlock.
  */
 void cpu_disable_ticks(void)
 {
diff --git a/include/qemu/timer.h b/include/qemu/timer.h
index 7fea97f..930b5d3 100644
--- a/include/qemu/timer.h
+++ b/include/qemu/timer.h
@@ -802,7 +802,7 @@ static inline int64_t get_max_clock_jump(void)
  * Low level clock functions
  */
 
-/* real time host monotonic timer */
+/* get host real time in nanosecond */
 static inline int64_t get_clock_realtime(void)
 {
     struct timeval tv;
-- 
2.1.0





^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [Qemu-trivial] [Qemu-devel] [PATCH] timer/cpus: fix some typos and update some comments
  2016-07-08 10:31 [Qemu-trivial] [PATCH] timer/cpus: fix some typos and update some comments Cao jin
@ 2016-07-08 11:44 ` Cao jin
  2016-07-28 15:30 ` [Qemu-trivial] " Michael Tokarev
  1 sibling, 0 replies; 3+ messages in thread
From: Cao jin @ 2016-07-08 11:44 UTC (permalink / raw)
  To: qemu-devel; +Cc: Paolo Bonzini, qemu-trivial, rth, crosthwaite.peter

cc to Paolo

On 07/08/2016 06:31 PM, Cao jin wrote:
> Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com>
> ---
>   cpus.c               | 6 +++---
>   include/qemu/timer.h | 2 +-
>   2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/cpus.c b/cpus.c
> index 84c3520..d4afd93 100644
> --- a/cpus.c
> +++ b/cpus.c
> @@ -229,7 +229,7 @@ static int64_t cpu_get_clock_locked(void)
>       return ticks;
>   }
>
> -/* return the host CPU monotonic timer and handle stop/restart */
> +/* return the host CPU monotonic time */
>   int64_t cpu_get_clock(void)
>   {
>       int64_t ti;
> @@ -244,7 +244,7 @@ int64_t cpu_get_clock(void)
>   }
>
>   /* enable cpu_get_ticks()
> - * Caller must hold BQL which server as mutex for vm_clock_seqlock.
> + * Caller must hold BQL which serve as mutex for vm_clock_seqlock.
>    */
>   void cpu_enable_ticks(void)
>   {
> @@ -260,7 +260,7 @@ void cpu_enable_ticks(void)
>
>   /* disable cpu_get_ticks() : the clock is stopped. You must not call
>    * cpu_get_ticks() after that.
> - * Caller must hold BQL which server as mutex for vm_clock_seqlock.
> + * Caller must hold BQL which serve as mutex for vm_clock_seqlock.
>    */
>   void cpu_disable_ticks(void)
>   {
> diff --git a/include/qemu/timer.h b/include/qemu/timer.h
> index 7fea97f..930b5d3 100644
> --- a/include/qemu/timer.h
> +++ b/include/qemu/timer.h
> @@ -802,7 +802,7 @@ static inline int64_t get_max_clock_jump(void)
>    * Low level clock functions
>    */
>
> -/* real time host monotonic timer */
> +/* get host real time in nanosecond */
>   static inline int64_t get_clock_realtime(void)
>   {
>       struct timeval tv;
>

-- 
Yours Sincerely,

Cao jin




^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [Qemu-trivial] [PATCH] timer/cpus: fix some typos and update some comments
  2016-07-08 10:31 [Qemu-trivial] [PATCH] timer/cpus: fix some typos and update some comments Cao jin
  2016-07-08 11:44 ` [Qemu-trivial] [Qemu-devel] " Cao jin
@ 2016-07-28 15:30 ` Michael Tokarev
  1 sibling, 0 replies; 3+ messages in thread
From: Michael Tokarev @ 2016-07-28 15:30 UTC (permalink / raw)
  To: Cao jin, qemu-devel; +Cc: bonzini, qemu-trivial, rth, crosthwaite.peter

Applied to -trivial, with the following change:

>  /* enable cpu_get_ticks()
> - * Caller must hold BQL which server as mutex for vm_clock_seqlock.
> + * Caller must hold BQL which serve as mutex for vm_clock_seqlock.

 ..which serveS as a mutex...

here and in one more place.

/mjt


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2016-07-28 15:30 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-07-08 10:31 [Qemu-trivial] [PATCH] timer/cpus: fix some typos and update some comments Cao jin
2016-07-08 11:44 ` [Qemu-trivial] [Qemu-devel] " Cao jin
2016-07-28 15:30 ` [Qemu-trivial] " Michael Tokarev

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).