[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 16/17] tests: drop event_active_cb()
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v3 16/17] tests: drop event_active_cb() |
Date: |
Mon, 10 Jun 2013 14:26:12 +0200 |
The .io_flush() handler no longer exists and has no users. Drop the
io_flush argument to aio_set_fd_handler() and related functions.
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
tests/test-aio.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/tests/test-aio.c b/tests/test-aio.c
index 1251952..7b2892a 100644
--- a/tests/test-aio.c
+++ b/tests/test-aio.c
@@ -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));
--
1.8.1.4
- [Qemu-devel] [PATCH v3 05/17] aio: stop using .io_flush(), (continued)
- [Qemu-devel] [PATCH v3 05/17] aio: stop using .io_flush(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 06/17] block/curl: drop curl_aio_flush(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 07/17] block/gluster: drop qemu_gluster_aio_flush_cb(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 08/17] block/iscsi: drop iscsi_process_flush(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 09/17] block/linux-aio: drop qemu_laio_completion_cb(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 10/17] block/nbd: drop nbd_have_request(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 12/17] block/sheepdog: drop have_co_req() and aio_flush_request(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 11/17] block/rbd: drop qemu_rbd_aio_flush_cb(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 15/17] thread-pool: drop thread_pool_active(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 04/17] tests: adjust test-thread-pool to new aio_poll() semantics, Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 16/17] tests: drop event_active_cb(),
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v3 17/17] aio: drop io_flush argument, Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 13/17] block/ssh: drop return_true(), Stefan Hajnoczi, 2013/06/10
- [Qemu-devel] [PATCH v3 14/17] dataplane/virtio-blk: drop flush_true() and flush_io(), Stefan Hajnoczi, 2013/06/10