c08c3d8fd2
Update to v2.1.0-rc1 OBS-URL: https://build.opensuse.org/request/show/240239 OBS-URL: https://build.opensuse.org/package/show/Virtualization/qemu?expand=0&rev=216
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From 97f277e21ed2aa01d23a960ec499f3b12ec18ed5 Mon Sep 17 00:00:00 2001
|
|
From: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
|
|
Date: Wed, 9 Jul 2014 18:06:32 +0300
|
|
Subject: [PATCH] qtest: fix vhost-user-test compilation with old GLib
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
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>
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
---
|
|
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 2af2381..406ba70 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
|