From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Cc: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
Subject: [Qemu-devel] [PULL 10/10] qtest: fix vhost-user-test compilation with old GLib
Date: Thu, 10 Jul 2014 18:04:13 +0200 [thread overview]
Message-ID: <1405008253-9816-11-git-send-email-pbonzini@redhat.com> (raw)
In-Reply-To: <1405008253-9816-1-git-send-email-pbonzini@redhat.com>
From: Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>
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: Paolo Bonzini <pbonzini@redhat.com>
---
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
next prev parent reply other threads:[~2014-07-10 16:04 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-10 16:04 [Qemu-devel] [PULL v3 00/10] KVM changes (+ misc small fixes) for 2.1 Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 01/10] mips/kvm: Init EBase to correct KSEG0 Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 02/10] mips/kvm: Disable FPU on reset with KVM Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 03/10] mips_malta: Remove incorrect KVM T&E references Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 04/10] mips_malta: Catch kernels linked at wrong address Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 05/10] watchdog: fix deadlock with -watchdog-action pause Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 06/10] Enforce stack protector usage Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 07/10] target-i386: Add "kvmclock-stable-bit" feature bit name Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 08/10] oslib-posix: Fix new compiler error with -Wclobbered Paolo Bonzini
2014-07-10 16:04 ` [Qemu-devel] [PULL 09/10] mc146818rtc: register the clock reset notifier on the right clock Paolo Bonzini
2014-07-10 16:04 ` Paolo Bonzini [this message]
2014-07-11 11:13 ` [Qemu-devel] [PULL v3 00/10] KVM changes (+ misc small fixes) for 2.1 Peter Maydell
2014-07-11 11:14 ` Paolo Bonzini
2014-07-11 11:18 ` Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2014-07-09 15:59 [Qemu-devel] [PULL for-2.1 " Paolo Bonzini
2014-07-09 15:59 ` [Qemu-devel] [PULL 10/10] qtest: fix vhost-user-test compilation with old GLib Paolo Bonzini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1405008253-9816-11-git-send-email-pbonzini@redhat.com \
--to=pbonzini@redhat.com \
--cc=n.nikolaev@virtualopensystems.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).