Re: [Qemu-trivial] [Qemu-stable] [PATCH for-1.6] qemu-timer: fix get_clock() gettimeofday() fallback #ifdef

[Michael Roth <mdroth@linux.vnet.ibm.com>]

Quoting Michael Roth (2013-09-24 16:58:22)
> Quoting Stefan Hajnoczi (2013-08-06 06:48:58)
> > If CLOCK_MONOTONIC is not defined by system headers we use
> > gettimeofday(2).  Apparently this is not used very often since no one
> > noticed the #ifdef was actually broken and left the function definition
> > unterminated.
> > 
> > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
> 
> Ping, looking to pull this in for stable.

Bah, ignore this. Didn't see previous discussion.

> 
> > ---
> >  include/qemu/timer.h | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/include/qemu/timer.h b/include/qemu/timer.h
> > index 9dd206c..e3299b8 100644
> > --- a/include/qemu/timer.h
> > +++ b/include/qemu/timer.h
> > @@ -125,8 +125,8 @@ static inline int64_t get_clock(void)
> >             changes, so it should be avoided. */
> >          return get_clock_realtime();
> >      }
> > -}
> >  #endif
> > +}
> > 
> >  void qemu_get_timer(QEMUFile *f, QEMUTimer *ts);
> >  void qemu_put_timer(QEMUFile *f, QEMUTimer *ts);
> > -- 
> > 1.8.1.4