From: "Michael S. Tsirkin" <mst@redhat.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Peter Maydell <peter.maydell@linaro.org>,
Nikolay Nikolaev <n.nikolaev@virtualopensystems.com>,
Anthony Liguori <aliguori@amazon.com>,
Antonios Motakis <a.motakis@virtualopensystems.com>
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 [thread overview]
Message-ID: <1405640614-9252-5-git-send-email-mst@redhat.com> (raw)
In-Reply-To: <1405640614-9252-1-git-send-email-mst@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>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@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
--
MST
next prev parent reply other threads:[~2014-07-17 23:42 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-17 23:44 [Qemu-devel] [PULL v2 0/7] pc,vhost,test fixes Michael S. Tsirkin
2014-07-17 23:44 ` [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 23:44 ` [Qemu-devel] [PULL v2 2/7] pc_piix: Reuse pc_compat_1_2() for pc-0.1[0123] Michael S. Tsirkin
2014-07-17 23:44 ` [Qemu-devel] [PULL v2 3/7] fix typo: apci -> acpi Michael S. Tsirkin
2014-07-17 23:44 ` Michael S. Tsirkin [this message]
2014-07-17 23:44 ` [Qemu-devel] [PULL v2 5/7] vhost-user: Fix VHOST_SET_MEM_TABLE processing Michael S. Tsirkin
2014-07-17 23:44 ` [Qemu-devel] [PULL v2 6/7] qtest: Adapt vhost-user-test to latest vhost-user changes Michael S. Tsirkin
2014-09-13 9:48 ` Linhaifeng
2014-07-17 23:44 ` [Qemu-devel] [PULL v2 7/7] vhost-user: minor cleanups Michael S. Tsirkin
2014-07-18 12:24 ` [Qemu-devel] [PULL v2 0/7] pc,vhost,test fixes Peter Maydell
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=1405640614-9252-5-git-send-email-mst@redhat.com \
--to=mst@redhat.com \
--cc=a.motakis@virtualopensystems.com \
--cc=aliguori@amazon.com \
--cc=kwolf@redhat.com \
--cc=n.nikolaev@virtualopensystems.com \
--cc=peter.maydell@linaro.org \
--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).