All of lore.kernel.org
 help / color / mirror / Atom feed
* [Qemu-devel] [PATCH] qtest: fix vhost-user-test compilation with old GLib
@ 2014-07-09 15:06 Nikolay Nikolaev
  2014-07-09 16:28 ` Kevin Wolf
  2014-07-13 22:26 ` Michael S. Tsirkin
  0 siblings, 2 replies; 5+ messages in thread
From: Nikolay Nikolaev @ 2014-07-09 15:06 UTC (permalink / raw)
  To: kwolf, snabb-devel, qemu-devel, mst; +Cc: tech, n.nikolaev

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>
---
 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

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

* Re: [Qemu-devel] [PATCH] qtest: fix vhost-user-test compilation with old GLib
  2014-07-09 15:06 [Qemu-devel] [PATCH] qtest: fix vhost-user-test compilation with old GLib Nikolay Nikolaev
@ 2014-07-09 16:28 ` Kevin Wolf
  2014-07-13 22:26 ` Michael S. Tsirkin
  1 sibling, 0 replies; 5+ messages in thread
From: Kevin Wolf @ 2014-07-09 16:28 UTC (permalink / raw)
  To: Nikolay Nikolaev; +Cc: snabb-devel, qemu-devel, tech, mst

Am 09.07.2014 um 17:06 hat Nikolay Nikolaev geschrieben:
> 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>

Thanks, this fixes the build for me.

Tested-by: Kevin Wolf <kwolf@redhat.com>

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

* Re: [Qemu-devel] [PATCH] qtest: fix vhost-user-test compilation with old GLib
  2014-07-09 15:06 [Qemu-devel] [PATCH] qtest: fix vhost-user-test compilation with old GLib Nikolay Nikolaev
  2014-07-09 16:28 ` Kevin Wolf
@ 2014-07-13 22:26 ` Michael S. Tsirkin
  2014-07-13 22:27   ` Michael S. Tsirkin
  2014-07-13 23:08   ` Peter Maydell
  1 sibling, 2 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2014-07-13 22:26 UTC (permalink / raw)
  To: Nikolay Nikolaev; +Cc: kwolf, snabb-devel, qemu-devel, tech

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!

> ---
>  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

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

* Re: [Qemu-devel] [PATCH] qtest: fix vhost-user-test compilation with old GLib
  2014-07-13 22:26 ` Michael S. Tsirkin
@ 2014-07-13 22:27   ` Michael S. Tsirkin
  2014-07-13 23:08   ` Peter Maydell
  1 sibling, 0 replies; 5+ messages in thread
From: Michael S. Tsirkin @ 2014-07-13 22:27 UTC (permalink / raw)
  To: Nikolay Nikolaev; +Cc: kwolf, snabb-devel, qemu-devel, tech

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

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

* Re: [Qemu-devel] [PATCH] qtest: fix vhost-user-test compilation with old GLib
  2014-07-13 22:26 ` Michael S. Tsirkin
  2014-07-13 22:27   ` Michael S. Tsirkin
@ 2014-07-13 23:08   ` Peter Maydell
  1 sibling, 0 replies; 5+ messages in thread
From: Peter Maydell @ 2014-07-13 23:08 UTC (permalink / raw)
  To: Michael S. Tsirkin
  Cc: Kevin Wolf, tech, snabb-devel, QEMU Developers, Nikolay Nikolaev

On 13 July 2014 23:26, Michael S. Tsirkin <mst@redhat.com> 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!

Applied to what? This is already in master as commit 0a58991a
(via Paolo's kvm tree).

thanks
-- PMM

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

end of thread, other threads:[~2014-07-13 23:09 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-07-09 15:06 [Qemu-devel] [PATCH] qtest: fix vhost-user-test compilation with old GLib Nikolay Nikolaev
2014-07-09 16:28 ` Kevin Wolf
2014-07-13 22:26 ` Michael S. Tsirkin
2014-07-13 22:27   ` Michael S. Tsirkin
2014-07-13 23:08   ` Peter Maydell

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.