From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:45941)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1X6SCR-0000Yx-Ti
	for qemu-devel@nongnu.org; Sun, 13 Jul 2014 18:24:56 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1X6SCM-0007GR-Kf
	for qemu-devel@nongnu.org; Sun, 13 Jul 2014 18:24:51 -0400
Received: from mx1.redhat.com ([209.132.183.28]:49655)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1X6SCM-0007G0-DQ
	for qemu-devel@nongnu.org; Sun, 13 Jul 2014 18:24:46 -0400
Date: Mon, 14 Jul 2014 01:27:02 +0300
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20140713222702.GA8873@redhat.com>
References: <20140709150442.6843.14602.stgit@3820>
	<20140713222634.GB8804@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20140713222634.GB8804@redhat.com>
Subject: Re: [Qemu-devel] [PATCH] qtest: fix vhost-user-test compilation
	with old GLib
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
Cc: kwolf@redhat.com, snabb-devel@googlegroups.com, qemu-devel@nongnu.org, tech@virtualopensystems.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