[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.1 17/22] qtest: fix vhost-user-test compilation
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL for-2.1 17/22] qtest: fix vhost-user-test compilation with old GLib |
Date: |
Thu, 10 Jul 2014 14:35:22 +0200 |
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>
Tested-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <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
--
1.8.3.1
- [Qemu-devel] [PULL for-2.1 06/22] AioContext: speed up aio_notify, (continued)
- [Qemu-devel] [PULL for-2.1 06/22] AioContext: speed up aio_notify, Kevin Wolf, 2014/07/10
- [Qemu-devel] [PULL for-2.1 09/22] qed: Make qiov match request size until backing file EOF, Kevin Wolf, 2014/07/10
- [Qemu-devel] [PULL for-2.1 07/22] block: Make qiov match the request size until EOF, Kevin Wolf, 2014/07/10
- [Qemu-devel] [PULL for-2.1 08/22] qcow2: Make qiov match request size until backing file EOF, Kevin Wolf, 2014/07/10
- [Qemu-devel] [PULL for-2.1 10/22] block: Assert qiov length matches request length, Kevin Wolf, 2014/07/10
- [Qemu-devel] [PULL for-2.1 16/22] tests: Fix unterminated string output visitor enum human string, Kevin Wolf, 2014/07/10
- [Qemu-devel] [PULL for-2.1 11/22] virtio-blk: avoid dataplane VirtIOBlockReq early free, Kevin Wolf, 2014/07/10
- [Qemu-devel] [PULL for-2.1 12/22] dataplane: do not free VirtQueueElement in vring_push(), Kevin Wolf, 2014/07/10
- [Qemu-devel] [PULL for-2.1 13/22] virtio-blk: avoid g_slice_new0() for VirtIOBlockReq and VirtQueueElement, Kevin Wolf, 2014/07/10
- [Qemu-devel] [PULL for-2.1 15/22] AioContext: do not rely on aio_poll(ctx, true) result to end a loop, Kevin Wolf, 2014/07/10
- [Qemu-devel] [PULL for-2.1 17/22] qtest: fix vhost-user-test compilation with old GLib,
Kevin Wolf <=
- [Qemu-devel] [PULL for-2.1 19/22] virtio-blk: Factor common checks out of virtio_blk_handle_read/write(), Kevin Wolf, 2014/07/10
- [Qemu-devel] [PULL for-2.1 14/22] virtio-blk: embed VirtQueueElement in VirtIOBlockReq, Kevin Wolf, 2014/07/10
- [Qemu-devel] [PULL for-2.1 21/22] virtio-blk: Treat read/write beyond end as invalid, Kevin Wolf, 2014/07/10
- [Qemu-devel] [PULL for-2.1 20/22] virtio-blk: Bypass error action and I/O accounting on invalid r/w, Kevin Wolf, 2014/07/10
- [Qemu-devel] [PULL for-2.1 18/22] dma-helpers: Fix too long qiov, Kevin Wolf, 2014/07/10
- [Qemu-devel] [PULL for-2.1 22/22] ide: Treat read/write beyond end as invalid, Kevin Wolf, 2014/07/10
- Re: [Qemu-devel] [PULL for-2.1 00/22] Block patches for 2.1.0-rc2, Peter Maydell, 2014/07/11