target/xtensa: import xtensa/config/core-isa.h

[qemu.git] / tests / test-aio.c

diff --git a/tests/test-aio.c b/tests/test-aio.c
index e5f8b55d304bccf393e6a1fc18230cd669109db5..86fb73b3d5bb51ddd5611e7ab2ef7fa02299fd59 100644 (file)
--- a/tests/test-aio.c
+++ b/tests/test-aio.c
@@ -10,12 +10,16 @@
  * See the COPYING.LIB file in the top-level directory.
  */
 
  * See the COPYING.LIB file in the top-level directory.
  */
 

-#include <glib.h>
+#include "qemu/osdep.h"

 #include "block/aio.h"
 #include "block/aio.h"

+#include "qapi/error.h"

 #include "qemu/timer.h"
 #include "qemu/sockets.h"
 #include "qemu/timer.h"
 #include "qemu/sockets.h"

+#include "qemu/error-report.h"
+#include "qemu/coroutine.h"
+#include "qemu/main-loop.h"

 
 

-AioContext *ctx;
+static AioContext *ctx;

 
 typedef struct {
     EventNotifier e;
 
 typedef struct {
     EventNotifier e;


@@ -24,14 +28,6 @@ typedef struct {
     bool auto_set;
 } EventNotifierTestData;
 
     bool auto_set;
 } EventNotifierTestData;
 

-/* Wait until there are no more BHs or AIO requests */
-static void wait_for_aio(void)
-{
-    while (aio_poll(ctx, true)) {
-        /* Do nothing */
-    }
-}
-

 /* Wait until event notifier becomes inactive */
 static void wait_until_inactive(EventNotifierTestData *data)
 {
 /* Wait until event notifier becomes inactive */
 static void wait_until_inactive(EventNotifierTestData *data)
 {


@@ -65,8 +61,6 @@ static void bh_test_cb(void *opaque)
     }
 }
 
     }
 }
 

-#if !defined(_WIN32)
-

 static void timer_test_cb(void *opaque)
 {
     TimerTestData *data = opaque;
 static void timer_test_cb(void *opaque)
 {
     TimerTestData *data = opaque;


@@ -76,12 +70,10 @@ static void timer_test_cb(void *opaque)
     }
 }
 
     }
 }
 

-static void dummy_io_handler_read(void *opaque)
+static void dummy_io_handler_read(EventNotifier *e)

 {
 }
 
 {
 }
 

-#endif /* !_WIN32 */
-

 static void bh_delete_cb(void *opaque)
 {
     BHTestData *data = opaque;
 static void bh_delete_cb(void *opaque)
 {
     BHTestData *data = opaque;


@@ -108,16 +100,9 @@ static void event_ready_cb(EventNotifier *e)
 
 /* Tests using aio_*.  */
 
 
 /* Tests using aio_*.  */
 

-static void test_notify(void)
-{
-    g_assert(!aio_poll(ctx, false));
-    aio_notify(ctx);
-    g_assert(!aio_poll(ctx, true));
-    g_assert(!aio_poll(ctx, false));
-}
-

 typedef struct {
     QemuMutex start_lock;
 typedef struct {
     QemuMutex start_lock;

+    EventNotifier notifier;

     bool thread_acquired;
 } AcquireTestData;
 
     bool thread_acquired;
 } AcquireTestData;
 


@@ -129,6 +114,11 @@ static void *test_acquire_thread(void *opaque)
     qemu_mutex_lock(&data->start_lock);
     qemu_mutex_unlock(&data->start_lock);
 
     qemu_mutex_lock(&data->start_lock);
     qemu_mutex_unlock(&data->start_lock);
 

+    /* event_notifier_set might be called either before or after
+     * the main thread's call to poll().  The test case's outcome
+     * should be the same in either case.
+     */
+    event_notifier_set(&data->notifier);

     aio_context_acquire(ctx);
     aio_context_release(ctx);
 
     aio_context_acquire(ctx);
     aio_context_release(ctx);
 


@@ -137,20 +127,25 @@ static void *test_acquire_thread(void *opaque)
     return NULL;
 }
 
     return NULL;
 }
 

-static void dummy_notifier_read(EventNotifier *unused)
+static void set_event_notifier(AioContext *ctx, EventNotifier *notifier,
+                               EventNotifierHandler *handler)

 {
 {

-    g_assert(false); /* should never be invoked */
+    aio_set_event_notifier(ctx, notifier, false, handler, NULL);
+}
+
+static void dummy_notifier_read(EventNotifier *n)
+{
+    event_notifier_test_and_clear(n);

 }
 
 static void test_acquire(void)
 {
     QemuThread thread;
 }
 
 static void test_acquire(void)
 {
     QemuThread thread;

-    EventNotifier notifier;

     AcquireTestData data;
 
     /* Dummy event notifier ensures aio_poll() will block */
     AcquireTestData data;
 
     /* Dummy event notifier ensures aio_poll() will block */

-    event_notifier_init(&notifier, false);
-    aio_set_event_notifier(ctx, &notifier, dummy_notifier_read);
+    event_notifier_init(&data.notifier, false);
+    set_event_notifier(ctx, &data.notifier, dummy_notifier_read);

     g_assert(!aio_poll(ctx, false)); /* consume aio_notify() */
 
     qemu_mutex_init(&data.start_lock);
     g_assert(!aio_poll(ctx, false)); /* consume aio_notify() */
 
     qemu_mutex_init(&data.start_lock);


@@ -164,12 +159,13 @@ static void test_acquire(void)
     /* Block in aio_poll(), let other thread kick us and acquire context */
     aio_context_acquire(ctx);
     qemu_mutex_unlock(&data.start_lock); /* let the thread run */
     /* Block in aio_poll(), let other thread kick us and acquire context */
     aio_context_acquire(ctx);
     qemu_mutex_unlock(&data.start_lock); /* let the thread run */

-    g_assert(!aio_poll(ctx, true));
+    g_assert(aio_poll(ctx, true));
+    g_assert(!data.thread_acquired);

     aio_context_release(ctx);
 
     qemu_thread_join(&thread);
     aio_context_release(ctx);
 
     qemu_thread_join(&thread);

-    aio_set_event_notifier(ctx, &notifier, NULL);
-    event_notifier_cleanup(&notifier);
+    set_event_notifier(ctx, &data.notifier, NULL);
+    event_notifier_cleanup(&data.notifier);

 
     g_assert(data.thread_acquired);
 }
 
     g_assert(data.thread_acquired);
 }


@@ -204,7 +200,9 @@ static void test_bh_schedule10(void)
     g_assert(aio_poll(ctx, true));
     g_assert_cmpint(data.n, ==, 2);
 
     g_assert(aio_poll(ctx, true));
     g_assert_cmpint(data.n, ==, 2);
 

-    wait_for_aio();
+    while (data.n < 10) {
+        aio_poll(ctx, true);
+    }

     g_assert_cmpint(data.n, ==, 10);
 
     g_assert(!aio_poll(ctx, false));
     g_assert_cmpint(data.n, ==, 10);
 
     g_assert(!aio_poll(ctx, false));


@@ -252,7 +250,9 @@ static void test_bh_delete_from_cb(void)
     qemu_bh_schedule(data1.bh);
     g_assert_cmpint(data1.n, ==, 0);
 
     qemu_bh_schedule(data1.bh);
     g_assert_cmpint(data1.n, ==, 0);
 

-    wait_for_aio();
+    while (data1.n < data1.max) {
+        aio_poll(ctx, true);
+    }

     g_assert_cmpint(data1.n, ==, data1.max);
     g_assert(data1.bh == NULL);
 
     g_assert_cmpint(data1.n, ==, data1.max);
     g_assert(data1.bh == NULL);
 


@@ -287,7 +287,12 @@ static void test_bh_delete_from_cb_many(void)
     g_assert_cmpint(data4.n, ==, 1);
     g_assert(data1.bh == NULL);
 
     g_assert_cmpint(data4.n, ==, 1);
     g_assert(data1.bh == NULL);
 

-    wait_for_aio();
+    while (data1.n < data1.max ||
+           data2.n < data2.max ||
+           data3.n < data3.max ||
+           data4.n < data4.max) {
+        aio_poll(ctx, true);
+    }

     g_assert_cmpint(data1.n, ==, data1.max);
     g_assert_cmpint(data2.n, ==, data2.max);
     g_assert_cmpint(data3.n, ==, data3.max);
     g_assert_cmpint(data1.n, ==, data1.max);
     g_assert_cmpint(data2.n, ==, data2.max);
     g_assert_cmpint(data3.n, ==, data3.max);


@@ -306,7 +311,7 @@ static void test_bh_flush(void)
     qemu_bh_schedule(data.bh);
     g_assert_cmpint(data.n, ==, 0);
 
     qemu_bh_schedule(data.bh);
     g_assert_cmpint(data.n, ==, 0);
 

-    wait_for_aio();
+    g_assert(aio_poll(ctx, true));

     g_assert_cmpint(data.n, ==, 1);
 
     g_assert(!aio_poll(ctx, false));
     g_assert_cmpint(data.n, ==, 1);
 
     g_assert(!aio_poll(ctx, false));


@@ -318,11 +323,11 @@ static void test_set_event_notifier(void)
 {
     EventNotifierTestData data = { .n = 0, .active = 0 };
     event_notifier_init(&data.e, false);
 {
     EventNotifierTestData data = { .n = 0, .active = 0 };
     event_notifier_init(&data.e, false);

-    aio_set_event_notifier(ctx, &data.e, event_ready_cb);
+    set_event_notifier(ctx, &data.e, event_ready_cb);

     g_assert(!aio_poll(ctx, false));
     g_assert_cmpint(data.n, ==, 0);
 
     g_assert(!aio_poll(ctx, false));
     g_assert_cmpint(data.n, ==, 0);
 

-    aio_set_event_notifier(ctx, &data.e, NULL);
+    set_event_notifier(ctx, &data.e, NULL);

     g_assert(!aio_poll(ctx, false));
     g_assert_cmpint(data.n, ==, 0);
     event_notifier_cleanup(&data.e);
     g_assert(!aio_poll(ctx, false));
     g_assert_cmpint(data.n, ==, 0);
     event_notifier_cleanup(&data.e);


@@ -332,8 +337,8 @@ static void test_wait_event_notifier(void)
 {
     EventNotifierTestData data = { .n = 0, .active = 1 };
     event_notifier_init(&data.e, false);
 {
     EventNotifierTestData data = { .n = 0, .active = 1 };
     event_notifier_init(&data.e, false);

-    aio_set_event_notifier(ctx, &data.e, event_ready_cb);
-    g_assert(!aio_poll(ctx, false));
+    set_event_notifier(ctx, &data.e, event_ready_cb);
+    while (aio_poll(ctx, false));

     g_assert_cmpint(data.n, ==, 0);
     g_assert_cmpint(data.active, ==, 1);
 
     g_assert_cmpint(data.n, ==, 0);
     g_assert_cmpint(data.active, ==, 1);
 


@@ -346,7 +351,7 @@ static void test_wait_event_notifier(void)
     g_assert_cmpint(data.n, ==, 1);
     g_assert_cmpint(data.active, ==, 0);
 
     g_assert_cmpint(data.n, ==, 1);
     g_assert_cmpint(data.active, ==, 0);
 

-    aio_set_event_notifier(ctx, &data.e, NULL);
+    set_event_notifier(ctx, &data.e, NULL);

     g_assert(!aio_poll(ctx, false));
     g_assert_cmpint(data.n, ==, 1);
 
     g_assert(!aio_poll(ctx, false));
     g_assert_cmpint(data.n, ==, 1);
 


@@ -357,8 +362,8 @@ static void test_flush_event_notifier(void)
 {
     EventNotifierTestData data = { .n = 0, .active = 10, .auto_set = true };
     event_notifier_init(&data.e, false);
 {
     EventNotifierTestData data = { .n = 0, .active = 10, .auto_set = true };
     event_notifier_init(&data.e, false);

-    aio_set_event_notifier(ctx, &data.e, event_ready_cb);
-    g_assert(!aio_poll(ctx, false));
+    set_event_notifier(ctx, &data.e, event_ready_cb);
+    while (aio_poll(ctx, false));

     g_assert_cmpint(data.n, ==, 0);
     g_assert_cmpint(data.active, ==, 10);
 
     g_assert_cmpint(data.n, ==, 0);
     g_assert_cmpint(data.active, ==, 10);
 


@@ -373,18 +378,42 @@ static void test_flush_event_notifier(void)
     g_assert_cmpint(data.active, ==, 0);
     g_assert(!aio_poll(ctx, false));
 
     g_assert_cmpint(data.active, ==, 0);
     g_assert(!aio_poll(ctx, false));
 

-    aio_set_event_notifier(ctx, &data.e, NULL);
+    set_event_notifier(ctx, &data.e, NULL);

     g_assert(!aio_poll(ctx, false));
     event_notifier_cleanup(&data.e);
 }
 
     g_assert(!aio_poll(ctx, false));
     event_notifier_cleanup(&data.e);
 }
 

+static void test_aio_external_client(void)
+{
+    int i, j;
+
+    for (i = 1; i < 3; i++) {
+        EventNotifierTestData data = { .n = 0, .active = 10, .auto_set = true };
+        event_notifier_init(&data.e, false);
+        aio_set_event_notifier(ctx, &data.e, true, event_ready_cb, NULL);
+        event_notifier_set(&data.e);
+        for (j = 0; j < i; j++) {
+            aio_disable_external(ctx);
+        }
+        for (j = 0; j < i; j++) {
+            assert(!aio_poll(ctx, false));
+            assert(event_notifier_test_and_clear(&data.e));
+            event_notifier_set(&data.e);
+            aio_enable_external(ctx);
+        }
+        assert(aio_poll(ctx, false));
+        set_event_notifier(ctx, &data.e, NULL);
+        event_notifier_cleanup(&data.e);
+    }
+}
+

 static void test_wait_event_notifier_noflush(void)
 {
     EventNotifierTestData data = { .n = 0 };
     EventNotifierTestData dummy = { .n = 0, .active = 1 };
 
     event_notifier_init(&data.e, false);
 static void test_wait_event_notifier_noflush(void)
 {
     EventNotifierTestData data = { .n = 0 };
     EventNotifierTestData dummy = { .n = 0, .active = 1 };
 
     event_notifier_init(&data.e, false);

-    aio_set_event_notifier(ctx, &data.e, event_ready_cb);
+    set_event_notifier(ctx, &data.e, event_ready_cb);

 
     g_assert(!aio_poll(ctx, false));
     g_assert_cmpint(data.n, ==, 0);
 
     g_assert(!aio_poll(ctx, false));
     g_assert_cmpint(data.n, ==, 0);


@@ -397,7 +426,7 @@ static void test_wait_event_notifier_noflush(void)
 
     /* An active event notifier forces aio_poll to look at EventNotifiers.  */
     event_notifier_init(&dummy.e, false);
 
     /* An active event notifier forces aio_poll to look at EventNotifiers.  */
     event_notifier_init(&dummy.e, false);

-    aio_set_event_notifier(ctx, &dummy.e, event_ready_cb);
+    set_event_notifier(ctx, &dummy.e, event_ready_cb);

 
     event_notifier_set(&data.e);
     g_assert(aio_poll(ctx, false));
 
     event_notifier_set(&data.e);
     g_assert(aio_poll(ctx, false));


@@ -417,34 +446,28 @@ static void test_wait_event_notifier_noflush(void)
     g_assert_cmpint(dummy.n, ==, 1);
     g_assert_cmpint(dummy.active, ==, 0);
 
     g_assert_cmpint(dummy.n, ==, 1);
     g_assert_cmpint(dummy.active, ==, 0);
 

-    aio_set_event_notifier(ctx, &dummy.e, NULL);
+    set_event_notifier(ctx, &dummy.e, NULL);

     event_notifier_cleanup(&dummy.e);
 
     event_notifier_cleanup(&dummy.e);
 

-    aio_set_event_notifier(ctx, &data.e, NULL);
+    set_event_notifier(ctx, &data.e, NULL);

     g_assert(!aio_poll(ctx, false));
     g_assert_cmpint(data.n, ==, 2);
 
     event_notifier_cleanup(&data.e);
 }
 
     g_assert(!aio_poll(ctx, false));
     g_assert_cmpint(data.n, ==, 2);
 
     event_notifier_cleanup(&data.e);
 }
 

-#if !defined(_WIN32)
-

 static void test_timer_schedule(void)
 {
     TimerTestData data = { .n = 0, .ctx = ctx, .ns = SCALE_MS * 750LL,
                            .max = 2,
 static void test_timer_schedule(void)
 {
     TimerTestData data = { .n = 0, .ctx = ctx, .ns = SCALE_MS * 750LL,
                            .max = 2,

-                           .clock_type = QEMU_CLOCK_VIRTUAL };
-    int pipefd[2];
+                           .clock_type = QEMU_CLOCK_REALTIME };
+    EventNotifier e;

 
     /* 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.
      */
 
     /* 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(!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);
+    event_notifier_init(&e, false);
+    set_event_notifier(ctx, &e, dummy_io_handler_read);

     aio_poll(ctx, false);
 
     aio_timer_init(ctx, &data.timer, data.clock_type,
     aio_poll(ctx, false);
 
     aio_timer_init(ctx, &data.timer, data.clock_type,


@@ -483,15 +506,12 @@ static void test_timer_schedule(void)
     g_assert(!aio_poll(ctx, false));
     g_assert_cmpint(data.n, ==, 2);
 
     g_assert(!aio_poll(ctx, false));
     g_assert_cmpint(data.n, ==, 2);
 

-    aio_set_fd_handler(ctx, pipefd[0], NULL, NULL, NULL);
-    close(pipefd[0]);
-    close(pipefd[1]);
+    set_event_notifier(ctx, &e, NULL);
+    event_notifier_cleanup(&e);

 
     timer_del(&data.timer);
 }
 
 
     timer_del(&data.timer);
 }
 

-#endif /* !_WIN32 */
-

 /* Now the same tests, using the context as a GSource.  They are
  * very similar to the ones above, with g_main_context_iteration
  * replacing aio_poll.  However:
 /* Now the same tests, using the context as a GSource.  They are
  * very similar to the ones above, with g_main_context_iteration
  * replacing aio_poll.  However:


@@ -505,14 +525,6 @@ static void test_timer_schedule(void)
  *   works well, and that's what I am using.
  */
 
  *   works well, and that's what I am using.
  */
 

-static void test_source_notify(void)
-{
-    while (g_main_context_iteration(NULL, false));
-    aio_notify(ctx);
-    g_assert(g_main_context_iteration(NULL, true));
-    g_assert(!g_main_context_iteration(NULL, false));
-}
-

 static void test_source_flush(void)
 {
     g_assert(!g_main_context_iteration(NULL, false));
 static void test_source_flush(void)
 {
     g_assert(!g_main_context_iteration(NULL, false));


@@ -665,11 +677,11 @@ static void test_source_set_event_notifier(void)
 {
     EventNotifierTestData data = { .n = 0, .active = 0 };
     event_notifier_init(&data.e, false);
 {
     EventNotifierTestData data = { .n = 0, .active = 0 };
     event_notifier_init(&data.e, false);

-    aio_set_event_notifier(ctx, &data.e, event_ready_cb);
+    set_event_notifier(ctx, &data.e, event_ready_cb);

     while (g_main_context_iteration(NULL, false));
     g_assert_cmpint(data.n, ==, 0);
 
     while (g_main_context_iteration(NULL, false));
     g_assert_cmpint(data.n, ==, 0);
 

-    aio_set_event_notifier(ctx, &data.e, NULL);
+    set_event_notifier(ctx, &data.e, NULL);

     while (g_main_context_iteration(NULL, false));
     g_assert_cmpint(data.n, ==, 0);
     event_notifier_cleanup(&data.e);
     while (g_main_context_iteration(NULL, false));
     g_assert_cmpint(data.n, ==, 0);
     event_notifier_cleanup(&data.e);


@@ -679,8 +691,8 @@ static void test_source_wait_event_notifier(void)
 {
     EventNotifierTestData data = { .n = 0, .active = 1 };
     event_notifier_init(&data.e, false);
 {
     EventNotifierTestData data = { .n = 0, .active = 1 };
     event_notifier_init(&data.e, false);

-    aio_set_event_notifier(ctx, &data.e, event_ready_cb);
-    g_assert(g_main_context_iteration(NULL, false));
+    set_event_notifier(ctx, &data.e, event_ready_cb);
+    while (g_main_context_iteration(NULL, false));

     g_assert_cmpint(data.n, ==, 0);
     g_assert_cmpint(data.active, ==, 1);
 
     g_assert_cmpint(data.n, ==, 0);
     g_assert_cmpint(data.active, ==, 1);
 


@@ -693,7 +705,7 @@ static void test_source_wait_event_notifier(void)
     g_assert_cmpint(data.n, ==, 1);
     g_assert_cmpint(data.active, ==, 0);
 
     g_assert_cmpint(data.n, ==, 1);
     g_assert_cmpint(data.active, ==, 0);
 

-    aio_set_event_notifier(ctx, &data.e, NULL);
+    set_event_notifier(ctx, &data.e, NULL);

     while (g_main_context_iteration(NULL, false));
     g_assert_cmpint(data.n, ==, 1);
 
     while (g_main_context_iteration(NULL, false));
     g_assert_cmpint(data.n, ==, 1);
 


@@ -704,8 +716,8 @@ static void test_source_flush_event_notifier(void)
 {
     EventNotifierTestData data = { .n = 0, .active = 10, .auto_set = true };
     event_notifier_init(&data.e, false);
 {
     EventNotifierTestData data = { .n = 0, .active = 10, .auto_set = true };
     event_notifier_init(&data.e, false);

-    aio_set_event_notifier(ctx, &data.e, event_ready_cb);
-    g_assert(g_main_context_iteration(NULL, false));
+    set_event_notifier(ctx, &data.e, event_ready_cb);
+    while (g_main_context_iteration(NULL, false));

     g_assert_cmpint(data.n, ==, 0);
     g_assert_cmpint(data.active, ==, 10);
 
     g_assert_cmpint(data.n, ==, 0);
     g_assert_cmpint(data.active, ==, 10);
 


@@ -720,7 +732,7 @@ static void test_source_flush_event_notifier(void)
     g_assert_cmpint(data.active, ==, 0);
     g_assert(!g_main_context_iteration(NULL, false));
 
     g_assert_cmpint(data.active, ==, 0);
     g_assert(!g_main_context_iteration(NULL, false));
 

-    aio_set_event_notifier(ctx, &data.e, NULL);
+    set_event_notifier(ctx, &data.e, NULL);

     while (g_main_context_iteration(NULL, false));
     event_notifier_cleanup(&data.e);
 }
     while (g_main_context_iteration(NULL, false));
     event_notifier_cleanup(&data.e);
 }


@@ -731,7 +743,7 @@ static void test_source_wait_event_notifier_noflush(void)
     EventNotifierTestData dummy = { .n = 0, .active = 1 };
 
     event_notifier_init(&data.e, false);
     EventNotifierTestData dummy = { .n = 0, .active = 1 };
 
     event_notifier_init(&data.e, false);

-    aio_set_event_notifier(ctx, &data.e, event_ready_cb);
+    set_event_notifier(ctx, &data.e, event_ready_cb);

 
     while (g_main_context_iteration(NULL, false));
     g_assert_cmpint(data.n, ==, 0);
 
     while (g_main_context_iteration(NULL, false));
     g_assert_cmpint(data.n, ==, 0);


@@ -744,7 +756,7 @@ static void test_source_wait_event_notifier_noflush(void)
 
     /* An active event notifier forces aio_poll to look at EventNotifiers.  */
     event_notifier_init(&dummy.e, false);
 
     /* An active event notifier forces aio_poll to look at EventNotifiers.  */
     event_notifier_init(&dummy.e, false);

-    aio_set_event_notifier(ctx, &dummy.e, event_ready_cb);
+    set_event_notifier(ctx, &dummy.e, event_ready_cb);

 
     event_notifier_set(&data.e);
     g_assert(g_main_context_iteration(NULL, false));
 
     event_notifier_set(&data.e);
     g_assert(g_main_context_iteration(NULL, false));


@@ -764,35 +776,29 @@ static void test_source_wait_event_notifier_noflush(void)
     g_assert_cmpint(dummy.n, ==, 1);
     g_assert_cmpint(dummy.active, ==, 0);
 
     g_assert_cmpint(dummy.n, ==, 1);
     g_assert_cmpint(dummy.active, ==, 0);
 

-    aio_set_event_notifier(ctx, &dummy.e, NULL);
+    set_event_notifier(ctx, &dummy.e, NULL);

     event_notifier_cleanup(&dummy.e);
 
     event_notifier_cleanup(&dummy.e);
 

-    aio_set_event_notifier(ctx, &data.e, NULL);
+    set_event_notifier(ctx, &data.e, NULL);

     while (g_main_context_iteration(NULL, false));
     g_assert_cmpint(data.n, ==, 2);
 
     event_notifier_cleanup(&data.e);
 }
 
     while (g_main_context_iteration(NULL, false));
     g_assert_cmpint(data.n, ==, 2);
 
     event_notifier_cleanup(&data.e);
 }
 

-#if !defined(_WIN32)
-

 static void test_source_timer_schedule(void)
 {
     TimerTestData data = { .n = 0, .ctx = ctx, .ns = SCALE_MS * 750LL,
                            .max = 2,
 static void test_source_timer_schedule(void)
 {
     TimerTestData data = { .n = 0, .ctx = ctx, .ns = SCALE_MS * 750LL,
                            .max = 2,

-                           .clock_type = QEMU_CLOCK_VIRTUAL };
-    int pipefd[2];
+                           .clock_type = QEMU_CLOCK_REALTIME };
+    EventNotifier e;

     int64_t expiry;
 
     /* 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.
      */
     int64_t expiry;
 
     /* 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(!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);
+    event_notifier_init(&e, false);
+    set_event_notifier(ctx, &e, dummy_io_handler_read);

     do {} while (g_main_context_iteration(NULL, false));
 
     aio_timer_init(ctx, &data.timer, data.clock_type,
     do {} while (g_main_context_iteration(NULL, false));
 
     aio_timer_init(ctx, &data.timer, data.clock_type,


@@ -806,45 +812,80 @@ static void test_source_timer_schedule(void)
     g_usleep(1 * G_USEC_PER_SEC);
     g_assert_cmpint(data.n, ==, 0);
 
     g_usleep(1 * G_USEC_PER_SEC);
     g_assert_cmpint(data.n, ==, 0);
 

-    g_assert(g_main_context_iteration(NULL, false));
+    g_assert(g_main_context_iteration(NULL, true));

     g_assert_cmpint(data.n, ==, 1);
     g_assert_cmpint(data.n, ==, 1);

+    expiry += data.ns;

 
 

-    /* The comment above was not kidding when it said this wakes up itself */
-    do {
-        g_assert(g_main_context_iteration(NULL, true));
-    } while (qemu_clock_get_ns(data.clock_type) <= expiry);
-    g_usleep(1 * G_USEC_PER_SEC);
-    g_main_context_iteration(NULL, false);
+    while (data.n < 2) {
+        g_main_context_iteration(NULL, true);
+    }

 
     g_assert_cmpint(data.n, ==, 2);
 
     g_assert_cmpint(data.n, ==, 2);

+    g_assert(qemu_clock_get_ns(data.clock_type) > expiry);

 
 

-    aio_set_fd_handler(ctx, pipefd[0], NULL, NULL, NULL);
-    close(pipefd[0]);
-    close(pipefd[1]);
+    set_event_notifier(ctx, &e, NULL);
+    event_notifier_cleanup(&e);

 
     timer_del(&data.timer);
 }
 
 
     timer_del(&data.timer);
 }
 

-#endif /* !_WIN32 */
+/*
+ * Check that aio_co_enter() can chain many times
+ *
+ * Two coroutines should be able to invoke each other via aio_co_enter() many
+ * times without hitting a limit like stack exhaustion.  In other words, the
+ * calls should be chained instead of nested.
+ */

 
 

+typedef struct {
+    Coroutine *other;
+    unsigned i;
+    unsigned max;
+} ChainData;

 
 

-/* End of tests.  */
+static void coroutine_fn chain(void *opaque)
+{
+    ChainData *data = opaque;

 
 

-int main(int argc, char **argv)
+    for (data->i = 0; data->i < data->max; data->i++) {
+        /* Queue up the other coroutine... */
+        aio_co_enter(ctx, data->other);
+
+        /* ...and give control to it */
+        qemu_coroutine_yield();
+    }
+}
+
+static void test_queue_chaining(void)

 {
 {

-    GSource *src;
+    /* This number of iterations hit stack exhaustion in the past: */
+    ChainData data_a = { .max = 25000 };
+    ChainData data_b = { .max = 25000 };
+
+    data_b.other = qemu_coroutine_create(chain, &data_a);
+    data_a.other = qemu_coroutine_create(chain, &data_b);

 
 

-    init_clocks();
+    qemu_coroutine_enter(data_b.other);

 
 

-    ctx = aio_context_new();
-    src = aio_get_g_source(ctx);
-    g_source_attach(src, NULL);
-    g_source_unref(src);
+    g_assert_cmpint(data_a.i, ==, data_a.max);
+    g_assert_cmpint(data_b.i, ==, data_b.max - 1);
+
+    /* Allow the second coroutine to terminate */
+    qemu_coroutine_enter(data_a.other);
+
+    g_assert_cmpint(data_b.i, ==, data_b.max);
+}
+
+/* End of tests.  */
+
+int main(int argc, char **argv)
+{
+    qemu_init_main_loop(&error_fatal);
+    ctx = qemu_get_aio_context();

 
     while (g_main_context_iteration(NULL, false));
 
     g_test_init(&argc, &argv, NULL);
 
     while (g_main_context_iteration(NULL, false));
 
     g_test_init(&argc, &argv, NULL);

-    g_test_add_func("/aio/notify",                  test_notify);

     g_test_add_func("/aio/acquire",                 test_acquire);
     g_test_add_func("/aio/bh/schedule",             test_bh_schedule);
     g_test_add_func("/aio/bh/schedule10",           test_bh_schedule10);
     g_test_add_func("/aio/acquire",                 test_acquire);
     g_test_add_func("/aio/bh/schedule",             test_bh_schedule);
     g_test_add_func("/aio/bh/schedule10",           test_bh_schedule10);


@@ -857,11 +898,11 @@ int main(int argc, char **argv)
     g_test_add_func("/aio/event/wait",              test_wait_event_notifier);
     g_test_add_func("/aio/event/wait/no-flush-cb",  test_wait_event_notifier_noflush);
     g_test_add_func("/aio/event/flush",             test_flush_event_notifier);
     g_test_add_func("/aio/event/wait",              test_wait_event_notifier);
     g_test_add_func("/aio/event/wait/no-flush-cb",  test_wait_event_notifier_noflush);
     g_test_add_func("/aio/event/flush",             test_flush_event_notifier);

-#if !defined(_WIN32)
+    g_test_add_func("/aio/external-client",         test_aio_external_client);

     g_test_add_func("/aio/timer/schedule",          test_timer_schedule);
     g_test_add_func("/aio/timer/schedule",          test_timer_schedule);

-#endif

 
 

-    g_test_add_func("/aio-gsource/notify",                  test_source_notify);
+    g_test_add_func("/aio/coroutine/queue-chaining", test_queue_chaining);
+

     g_test_add_func("/aio-gsource/flush",                   test_source_flush);
     g_test_add_func("/aio-gsource/bh/schedule",             test_source_bh_schedule);
     g_test_add_func("/aio-gsource/bh/schedule10",           test_source_bh_schedule10);
     g_test_add_func("/aio-gsource/flush",                   test_source_flush);
     g_test_add_func("/aio-gsource/bh/schedule",             test_source_bh_schedule);
     g_test_add_func("/aio-gsource/bh/schedule10",           test_source_bh_schedule10);


@@ -874,8 +915,6 @@ int main(int argc, char **argv)
     g_test_add_func("/aio-gsource/event/wait",              test_source_wait_event_notifier);
     g_test_add_func("/aio-gsource/event/wait/no-flush-cb",  test_source_wait_event_notifier_noflush);
     g_test_add_func("/aio-gsource/event/flush",             test_source_flush_event_notifier);
     g_test_add_func("/aio-gsource/event/wait",              test_source_wait_event_notifier);
     g_test_add_func("/aio-gsource/event/wait/no-flush-cb",  test_source_wait_event_notifier_noflush);
     g_test_add_func("/aio-gsource/event/flush",             test_source_flush_event_notifier);

-#if !defined(_WIN32)

     g_test_add_func("/aio-gsource/timer/schedule",          test_source_timer_schedule);
     g_test_add_func("/aio-gsource/timer/schedule",          test_source_timer_schedule);

-#endif

     return g_test_run();
 }
     return g_test_run();
 }