From: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
Date: Wed, 9 Jul 2014 15:06:32 +0000 (+0300)
Subject: qtest: fix vhost-user-test compilation with old GLib
X-Git-Tag: v2.1.0-rc2~7^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80504dcaa11097b99842312014f5954a54fe1826;p=thirdparty%2Fqemu.git

qtest: fix vhost-user-test compilation with old GLib

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>
Tested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---

diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c
index 2af2381a1de..406ba709419 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