[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 4/7] qtest: fix vhost-user-test compilation with o
From: |
Michael S. Tsirkin |
Subject: |
[Qemu-devel] [PULL v2 4/7] qtest: fix vhost-user-test compilation with old GLib |
Date: |
Fri, 18 Jul 2014 02:44:44 +0300 |
From: Nikolay Nikolaev <address@hidden>
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 <address@hidden>
Signed-off-by: Nikolay Nikolaev <address@hidden>
Reviewed-by: Michael S. Tsirkin <address@hidden>
Signed-off-by: Michael S. Tsirkin <address@hidden>
---
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
--
MST
- [Qemu-devel] [PULL v2 0/7] pc,vhost,test fixes, Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL v2 2/7] pc_piix: Reuse pc_compat_1_2() for pc-0.1[0123], Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL v2 1/7] pc: fix qemu exiting with error when -m X < 128 with old machines types, Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL v2 6/7] qtest: Adapt vhost-user-test to latest vhost-user changes, Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL v2 3/7] fix typo: apci -> acpi, Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL v2 4/7] qtest: fix vhost-user-test compilation with old GLib,
Michael S. Tsirkin <=
- [Qemu-devel] [PULL v2 7/7] vhost-user: minor cleanups, Michael S. Tsirkin, 2014/07/17
- [Qemu-devel] [PULL v2 5/7] vhost-user: Fix VHOST_SET_MEM_TABLE processing, Michael S. Tsirkin, 2014/07/17
- Re: [Qemu-devel] [PULL v2 0/7] pc,vhost,test fixes, Peter Maydell, 2014/07/18