Commit 1b9ecdb1 authored by Stefan Hajnoczi's avatar Stefan Hajnoczi
Browse files

tests: drop event_active_cb() 



Drop the io_flush argument to aio_set_event_notifier().

Reviewed-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent bb52b14b

tests/test-aio.c

+8 −14
Original line number Diff line number Diff line
@@ -65,12 +65,6 @@ static void bh_delete_cb(void *opaque) 
    }

}



static int event_active_cb(EventNotifier *e)

{

    EventNotifierTestData *data = container_of(e, EventNotifierTestData, e);

    return data->active > 0;

}



static void event_ready_cb(EventNotifier *e)

{

    EventNotifierTestData *data = container_of(e, EventNotifierTestData, e);
@@ -239,7 +233,7 @@ static void test_set_event_notifier(void) 
{

    EventNotifierTestData data = { .n = 0, .active = 0 };

    event_notifier_init(&data.e, false);

    aio_set_event_notifier(ctx, &data.e, event_ready_cb, event_active_cb);

    aio_set_event_notifier(ctx, &data.e, event_ready_cb, NULL);

    g_assert(!aio_poll(ctx, false));

    g_assert_cmpint(data.n, ==, 0);
@@ -253,7 +247,7 @@ static void test_wait_event_notifier(void) 
{

    EventNotifierTestData data = { .n = 0, .active = 1 };

    event_notifier_init(&data.e, false);

    aio_set_event_notifier(ctx, &data.e, event_ready_cb, event_active_cb);

    aio_set_event_notifier(ctx, &data.e, event_ready_cb, NULL);

    g_assert(!aio_poll(ctx, false));

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

    g_assert_cmpint(data.active, ==, 1);
@@ -278,7 +272,7 @@ static void test_flush_event_notifier(void) 
{

    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, event_active_cb);

    aio_set_event_notifier(ctx, &data.e, event_ready_cb, NULL);

    g_assert(!aio_poll(ctx, false));

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

    g_assert_cmpint(data.active, ==, 10);
@@ -318,7 +312,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);

    aio_set_event_notifier(ctx, &dummy.e, event_ready_cb, event_active_cb);

    aio_set_event_notifier(ctx, &dummy.e, event_ready_cb, NULL);



    event_notifier_set(&data.e);

    g_assert(aio_poll(ctx, false));
@@ -521,7 +515,7 @@ static void test_source_set_event_notifier(void) 
{

    EventNotifierTestData data = { .n = 0, .active = 0 };

    event_notifier_init(&data.e, false);

    aio_set_event_notifier(ctx, &data.e, event_ready_cb, event_active_cb);

    aio_set_event_notifier(ctx, &data.e, event_ready_cb, NULL);

    while (g_main_context_iteration(NULL, false));

    g_assert_cmpint(data.n, ==, 0);
@@ -535,7 +529,7 @@ static void test_source_wait_event_notifier(void) 
{

    EventNotifierTestData data = { .n = 0, .active = 1 };

    event_notifier_init(&data.e, false);

    aio_set_event_notifier(ctx, &data.e, event_ready_cb, event_active_cb);

    aio_set_event_notifier(ctx, &data.e, event_ready_cb, NULL);

    g_assert(g_main_context_iteration(NULL, false));

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

    g_assert_cmpint(data.active, ==, 1);
@@ -560,7 +554,7 @@ static void test_source_flush_event_notifier(void) 
{

    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, event_active_cb);

    aio_set_event_notifier(ctx, &data.e, event_ready_cb, NULL);

    g_assert(g_main_context_iteration(NULL, false));

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

    g_assert_cmpint(data.active, ==, 10);
@@ -600,7 +594,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);

    aio_set_event_notifier(ctx, &dummy.e, event_ready_cb, event_active_cb);

    aio_set_event_notifier(ctx, &dummy.e, event_ready_cb, NULL);



    event_notifier_set(&data.e);

    g_assert(g_main_context_iteration(NULL, false));