From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com
Subject: [Qemu-devel] [PULL v2 for-2.1 17/22] qtest: fix vhost-user-test compilation with old GLib
Date: Mon, 14 Jul 2014 13:43:07 +0200 [thread overview]
Message-ID: <1405338192-18850-18-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1405338192-18850-1-git-send-email-kwolf@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>
Tested-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@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-14 11:43 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-14 11:42 [Qemu-devel] [PULL v2 for-2.1 00/22] Block patches for 2.1.0-rc2 Kevin Wolf
2014-07-14 11:42 ` [Qemu-devel] [PULL v2 for-2.1 01/22] block/backup: Fix hang for unaligned image size Kevin Wolf
2014-07-14 11:42 ` [Qemu-devel] [PULL v2 for-2.1 02/22] block: Fix bdrv_is_allocated() return value Kevin Wolf
2014-07-14 11:42 ` [Qemu-devel] [PULL v2 for-2.1 03/22] block: prefer aio_poll to qemu_aio_wait Kevin Wolf
2014-07-14 11:42 ` [Qemu-devel] [PULL v2 for-2.1 04/22] block: drop aio functions that operate on the main AioContext Kevin Wolf
2014-07-14 11:42 ` [Qemu-devel] [PULL v2 for-2.1 05/22] test-aio: fix GSource-based timer test Kevin Wolf
2014-07-14 11:42 ` [Qemu-devel] [PULL v2 for-2.1 06/22] AioContext: speed up aio_notify Kevin Wolf
2014-07-14 11:42 ` [Qemu-devel] [PULL v2 for-2.1 07/22] block: Make qiov match the request size until EOF Kevin Wolf
2014-07-14 11:42 ` [Qemu-devel] [PULL v2 for-2.1 08/22] qcow2: Make qiov match request size until backing file EOF Kevin Wolf
2014-07-14 11:42 ` [Qemu-devel] [PULL v2 for-2.1 09/22] qed: " Kevin Wolf
2014-07-14 11:43 ` [Qemu-devel] [PULL v2 for-2.1 10/22] block: Assert qiov length matches request length Kevin Wolf
2014-07-14 11:43 ` [Qemu-devel] [PULL v2 for-2.1 11/22] virtio-blk: avoid dataplane VirtIOBlockReq early free Kevin Wolf
2014-07-14 11:43 ` [Qemu-devel] [PULL v2 for-2.1 12/22] dataplane: do not free VirtQueueElement in vring_push() Kevin Wolf
2014-07-14 11:43 ` [Qemu-devel] [PULL v2 for-2.1 13/22] virtio-blk: avoid g_slice_new0() for VirtIOBlockReq and VirtQueueElement Kevin Wolf
2014-07-14 11:43 ` [Qemu-devel] [PULL v2 for-2.1 14/22] virtio-blk: embed VirtQueueElement in VirtIOBlockReq Kevin Wolf
2014-07-14 11:43 ` [Qemu-devel] [PULL v2 for-2.1 15/22] AioContext: do not rely on aio_poll(ctx, true) result to end a loop Kevin Wolf
2014-07-14 11:43 ` [Qemu-devel] [PULL v2 for-2.1 16/22] tests: Fix unterminated string output visitor enum human string Kevin Wolf
2014-07-14 11:43 ` Kevin Wolf [this message]
2014-07-14 11:43 ` [Qemu-devel] [PULL v2 for-2.1 18/22] dma-helpers: Fix too long qiov Kevin Wolf
2014-07-14 11:43 ` [Qemu-devel] [PULL v2 for-2.1 19/22] virtio-blk: Factor common checks out of virtio_blk_handle_read/write() Kevin Wolf
2014-07-14 11:43 ` [Qemu-devel] [PULL v2 for-2.1 20/22] virtio-blk: Bypass error action and I/O accounting on invalid r/w Kevin Wolf
2014-07-14 11:43 ` [Qemu-devel] [PULL v2 for-2.1 21/22] virtio-blk: Treat read/write beyond end as invalid Kevin Wolf
2014-07-14 11:43 ` [Qemu-devel] [PULL v2 for-2.1 22/22] ide: " Kevin Wolf
2014-07-14 15:01 ` [Qemu-devel] [PULL v2 for-2.1 00/22] Block patches for 2.1.0-rc2 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=1405338192-18850-18-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.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).