qtest: fix vhost-user-test compilation with old GLib

PATCH Applied Nikolay Nikolaev 4 participants 5 messages Jul 9, 2014 – Jul 13, 2014

Share & tools

Nikolay Nikolaev

author

2014-07-09 15:06 UTC #0 lore raw

PATCH 1/1 qtest: fix vhost-user-test compilation with old GLib

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 <[email protected]>

Signed-off-by Nikolay Nikolaev <[email protected]>

---
 tests/vhost-user-test.c |    4 ++++
 1 file changed, 4 insertions(+)

tests/vhost-user-test.c +4 -0

index b9dcec1..75fedf0 100644
@@ -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

Kevin Wolf

Tested-by on v1 1/1

2014-07-09 16:28 UTC #1 lore raw

Am 09.07.2014 um 17:06 hat Nikolay Nikolaev geschrieben:

Quoted 5 lines

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 <[email protected]>
Signed-off-by Nikolay Nikolaev <[email protected]>

Thanks, this fixes the build for me.

Tested-by Kevin Wolf <[email protected]>

Michael S. Tsirkin

Applied

2014-07-13 22:24 UTC #2 lore raw

In reply to Nikolay Nikolaev

Quoted 5 lines · Nikolay Nikolaev

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 <[email protected]>
Signed-off-by Nikolay Nikolaev <[email protected]>

Applied, thanks!

Quoted 19 lines

---
 tests/vhost-user-test.c |    4 ++++
 1 file changed, 4 insertions(+)

tests/vhost-user-test.c +4 -0

index b9dcec1..75fedf0 100644
@@ -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

Michael S. Tsirkin

2014-07-13 22:24 UTC #3 lore raw

Quoted 8 lines · Michael S. Tsirkin

Quoted 5 lines · Nikolay Nikolaev
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 <[email protected]>
Signed-off-by Nikolay Nikolaev <[email protected]>
Applied, thanks!

but again please put for-2.1 in subject.

Quoted 19 lines

---
 tests/vhost-user-test.c |    4 ++++
 1 file changed, 4 insertions(+)

tests/vhost-user-test.c +4 -0

index b9dcec1..75fedf0 100644
@@ -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

Peter Maydell

Applied

2014-07-13 23:09 UTC #4 lore raw

In reply to Michael S. Tsirkin

Quoted 8 lines · Michael S. Tsirkin

Quoted 5 lines · Nikolay Nikolaev
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 <[email protected]>
Signed-off-by Nikolay Nikolaev <[email protected]>
Applied, thanks!

Applied to what? This is already in master as commit 0a58991a (via Paolo's kvm tree).

thanks
-- PMM