[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 10/10] qtest: fix vhost-user-test compilation with ol
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 10/10] qtest: fix vhost-user-test compilation with old GLib |
Date: |
Thu, 10 Jul 2014 18:04:13 +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>
Signed-off-by: Paolo Bonzini <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 v3 00/10] KVM changes (+ misc small fixes) for 2.1, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 02/10] mips/kvm: Disable FPU on reset with KVM, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 01/10] mips/kvm: Init EBase to correct KSEG0, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 03/10] mips_malta: Remove incorrect KVM T&E references, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 04/10] mips_malta: Catch kernels linked at wrong address, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 06/10] Enforce stack protector usage, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 08/10] oslib-posix: Fix new compiler error with -Wclobbered, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 05/10] watchdog: fix deadlock with -watchdog-action pause, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 09/10] mc146818rtc: register the clock reset notifier on the right clock, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 07/10] target-i386: Add "kvmclock-stable-bit" feature bit name, Paolo Bonzini, 2014/07/10
- [Qemu-devel] [PULL 10/10] qtest: fix vhost-user-test compilation with old GLib,
Paolo Bonzini <=
- Re: [Qemu-devel] [PULL v3 00/10] KVM changes (+ misc small fixes) for 2.1, Peter Maydell, 2014/07/11