diff mbox

aio / timers: fix build of test/test-aio.c on non-linux platforms

Message ID 1377794897-11215-1-git-send-email-alex@alex.org.uk
State New
Headers show

Commit Message

Alex Bligh Aug. 29, 2013, 4:48 p.m. UTC 
tests/test-aio.c used pipe2 which is Linux only. Use qemu_pipe
and qemu_set_nonblock for portabillity. Addition of O_CLOEXEC
is a harmless bonus.

Signed-off-by: Alex Bligh <alex@alex.org.uk>
---
 tests/test-aio.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Comments

Stefan Hajnoczi Sept. 3, 2013, 9:56 a.m. UTC | #1 
On Thu, Aug 29, 2013 at 05:48:16PM +0100, Alex Bligh wrote:
> tests/test-aio.c used pipe2 which is Linux only. Use qemu_pipe
> and qemu_set_nonblock for portabillity. Addition of O_CLOEXEC
> is a harmless bonus.
> 
> Signed-off-by: Alex Bligh <alex@alex.org.uk>
> ---
>  tests/test-aio.c |   11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan
diff mbox

Patch

diff --git a/tests/test-aio.c b/tests/test-aio.c
index 07a1f61..4215701 100644
--- a/tests/test-aio.c
+++ b/tests/test-aio.c
@@ -13,6 +13,7 @@ 
 #include <glib.h>
 #include "block/aio.h"
 #include "qemu/timer.h"
+#include "qemu/sockets.h"
 
 AioContext *ctx;
 
@@ -375,7 +376,10 @@  static void test_timer_schedule(void)
     /* aio_poll will not block to wait for timers to complete unless it has
      * an fd to wait on. Fixing this breaks other tests. So create a dummy one.
      */
-    g_assert(!pipe2(pipefd, O_NONBLOCK));
+    g_assert(!qemu_pipe(pipefd));
+    qemu_set_nonblock(pipefd[0]);
+    qemu_set_nonblock(pipefd[1]);
+
     aio_set_fd_handler(ctx, pipefd[0],
                        dummy_io_handler_read, NULL, NULL);
     aio_poll(ctx, false);
@@ -716,7 +720,10 @@  static void test_source_timer_schedule(void)
     /* aio_poll will not block to wait for timers to complete unless it has
      * an fd to wait on. Fixing this breaks other tests. So create a dummy one.
      */
-    g_assert(!pipe2(pipefd, O_NONBLOCK));
+    g_assert(!qemu_pipe(pipefd));
+    qemu_set_nonblock(pipefd[0]);
+    qemu_set_nonblock(pipefd[1]);
+
     aio_set_fd_handler(ctx, pipefd[0],
                        dummy_io_handler_read, NULL, NULL);
     do {} while (g_main_context_iteration(NULL, false));