Re: [Qemu-devel] [PATCH] qtest: fix vhost-user-test compilation with old GLib

["Michael S. Tsirkin" <mst@redhat.com>]

On Mon, Jul 14, 2014 at 01:26:34AM +0300, Michael S. Tsirkin wrote:
> On Wed, Jul 09, 2014 at 06:06:32PM +0300, Nikolay Nikolaev wrote:
> > Mising G_TIME_SPAN_SECOND definition breaks the RHEL6 compilation as GLib
> > version before 2.26 does not have it. In such case just define it.
> > 
> > Reported-by: Kevin Wolf <kwolf@redhat.com>
> > Signed-off-by: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
> 
> Applied, thanks!

but again please put for-2.1 in subject.

> > ---
> >  tests/vhost-user-test.c |    4 ++++
> >  1 file changed, 4 insertions(+)
> > 
> > diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
> > index b9dcec1..75fedf0 100644
> > --- a/tests/vhost-user-test.c
> > +++ b/tests/vhost-user-test.c
> > @@ -22,6 +22,10 @@
> >  #include <qemu/sockets.h>
> >  
> >  /* GLIB version compatibility flags */
> > +#if !GLIB_CHECK_VERSION(2, 26, 0)
> > +#define G_TIME_SPAN_SECOND              (G_GINT64_CONSTANT(1000000))
> > +#endif
> > +
> >  #if GLIB_CHECK_VERSION(2, 28, 0)
> >  #define HAVE_MONOTONIC_TIME
> >  #endif