[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/4] Add error checking for event_notifier_init.
From: |
Shreya Shrivastava |
Subject: |
[Qemu-devel] [PATCH 3/4] Add error checking for event_notifier_init. |
Date: |
Sun, 16 Oct 2016 00:50:58 -0000 |
Add checks for negative return value to uses of event_notifier_init.
Signed-off-by: Shreya Shrivastava <address@hidden>
---
tests/test-aio.c | 59
++++++++++++++++++++++++++++----------------------------
1 file changed, 30 insertions(+), 29 deletions(-)
diff --git a/tests/test-aio.c b/tests/test-aio.c
index 03aa846..49b99f6 100644
--- a/tests/test-aio.c
+++ b/tests/test-aio.c
@@ -137,8 +137,8 @@ static void test_acquire(void)
AcquireTestData data;
/* Dummy event notifier ensures aio_poll() will block */
- event_notifier_init(¬ifier, false);
- set_event_notifier(ctx, ¬ifier, dummy_notifier_read);
+ if (event_notifier_init(¬ifier, false))
+ set_event_notifier(ctx, ¬ifier, dummy_notifier_read);
g_assert(!aio_poll(ctx, false)); /* consume aio_notify() */
qemu_mutex_init(&data.start_lock);
@@ -314,8 +314,8 @@ static void test_bh_flush(void)
static void test_set_event_notifier(void)
{
EventNotifierTestData data = { .n = 0, .active = 0 };
- event_notifier_init(&data.e, false);
- set_event_notifier(ctx, &data.e, event_ready_cb);
+ if (event_notifier_init(&data.e, false))
+ set_event_notifier(ctx, &data.e, event_ready_cb);
g_assert(!aio_poll(ctx, false));
g_assert_cmpint(data.n, ==, 0);
@@ -328,8 +328,8 @@ static void test_set_event_notifier(void)
static void test_wait_event_notifier(void)
{
EventNotifierTestData data = { .n = 0, .active = 1 };
- event_notifier_init(&data.e, false);
- set_event_notifier(ctx, &data.e, event_ready_cb);
+ if (event_notifier_init(&data.e, 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);
@@ -353,8 +353,8 @@ static void test_wait_event_notifier(void)
static void test_flush_event_notifier(void)
{
EventNotifierTestData data = { .n = 0, .active = 10, .auto_set = true };
- event_notifier_init(&data.e, false);
- set_event_notifier(ctx, &data.e, event_ready_cb);
+ if (event_notifier_init(&data.e, 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);
@@ -381,9 +381,10 @@ static void test_aio_external_client(void)
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);
- event_notifier_set(&data.e);
+ if (event_notifier_init(&data.e, false) {
+ aio_set_event_notifier(ctx, &data.e, true, event_ready_cb);
+ event_notifier_set(&data.e);
+ }
for (j = 0; j < i; j++) {
aio_disable_external(ctx);
}
@@ -404,8 +405,8 @@ static void test_wait_event_notifier_noflush(void)
EventNotifierTestData data = { .n = 0 };
EventNotifierTestData dummy = { .n = 0, .active = 1 };
- event_notifier_init(&data.e, false);
- set_event_notifier(ctx, &data.e, event_ready_cb);
+ if (event_notifier_init(&data.e, false))
+ set_event_notifier(ctx, &data.e, event_ready_cb);
g_assert(!aio_poll(ctx, false));
g_assert_cmpint(data.n, ==, 0);
@@ -417,8 +418,8 @@ static void test_wait_event_notifier_noflush(void)
data.n = 0;
/* An active event notifier forces aio_poll to look at
EventNotifiers. */
- event_notifier_init(&dummy.e, false);
- set_event_notifier(ctx, &dummy.e, event_ready_cb);
+ if (event_notifier_init(&dummy.e, false)
+ set_event_notifier(ctx, &dummy.e, event_ready_cb);
event_notifier_set(&data.e);
g_assert(aio_poll(ctx, false));
@@ -458,8 +459,8 @@ 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.
*/
- event_notifier_init(&e, false);
- set_event_notifier(ctx, &e, dummy_io_handler_read);
+ if (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,
@@ -668,8 +669,8 @@ static void test_source_bh_flush(void)
static void test_source_set_event_notifier(void)
{
EventNotifierTestData data = { .n = 0, .active = 0 };
- event_notifier_init(&data.e, false);
- set_event_notifier(ctx, &data.e, event_ready_cb);
+ if (event_notifier_init(&data.e, false)
+ set_event_notifier(ctx, &data.e, event_ready_cb);
while (g_main_context_iteration(NULL, false));
g_assert_cmpint(data.n, ==, 0);
@@ -682,8 +683,8 @@ static void test_source_set_event_notifier(void)
static void test_source_wait_event_notifier(void)
{
EventNotifierTestData data = { .n = 0, .active = 1 };
- event_notifier_init(&data.e, false);
- set_event_notifier(ctx, &data.e, event_ready_cb);
+ if (event_notifier_init(&data.e, 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);
@@ -707,8 +708,8 @@ static void test_source_wait_event_notifier(void)
static void test_source_flush_event_notifier(void)
{
EventNotifierTestData data = { .n = 0, .active = 10, .auto_set = true };
- event_notifier_init(&data.e, false);
- set_event_notifier(ctx, &data.e, event_ready_cb);
+ if (event_notifier_init(&data.e, 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);
@@ -734,8 +735,8 @@ static void test_source_wait_event_notifier_noflush(void)
EventNotifierTestData data = { .n = 0 };
EventNotifierTestData dummy = { .n = 0, .active = 1 };
- event_notifier_init(&data.e, false);
- set_event_notifier(ctx, &data.e, event_ready_cb);
+ if (event_notifier_init(&data.e, false))
+ set_event_notifier(ctx, &data.e, event_ready_cb);
while (g_main_context_iteration(NULL, false));
g_assert_cmpint(data.n, ==, 0);
@@ -747,8 +748,8 @@ static void test_source_wait_event_notifier_noflush(void)
data.n = 0;
/* An active event notifier forces aio_poll to look at
EventNotifiers. */
- event_notifier_init(&dummy.e, false);
- set_event_notifier(ctx, &dummy.e, event_ready_cb);
+ if (event_notifier_init(&dummy.e, false))
+ set_event_notifier(ctx, &dummy.e, event_ready_cb);
event_notifier_set(&data.e);
g_assert(g_main_context_iteration(NULL, false));
@@ -789,8 +790,8 @@ 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.
*/
- event_notifier_init(&e, false);
- set_event_notifier(ctx, &e, dummy_io_handler_read);
+ if (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,
--
1.9.1
- [Qemu-devel] [PATCH 3/4] Add error checking for event_notifier_init.,
Shreya Shrivastava <=