From patchwork Sun Oct 16 00:50:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreya Shrivastava X-Patchwork-Id: 682633 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sxN8G3cRPz9sfH for ; Sun, 16 Oct 2016 11:51:58 +1100 (AEDT) Received: from localhost ([::1]:54577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bvZg9-0002SV-9u for incoming@patchwork.ozlabs.org; Sat, 15 Oct 2016 20:51:53 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34863) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bvZfW-0002As-2T for qemu-devel@nongnu.org; Sat, 15 Oct 2016 20:51:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bvZfS-0004mp-VI for qemu-devel@nongnu.org; Sat, 15 Oct 2016 20:51:14 -0400 Received: from mx2.sigaint.org ([87.121.52.221]:52401) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bvZfQ-0004YS-8n for qemu-devel@nongnu.org; Sat, 15 Oct 2016 20:51:10 -0400 Received: from sigaintevyh2rzvw.onion (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 14a75c09; Sun, 16 Oct 2016 00:50:58 +0000 (UTC) Received: from 127.0.0.1 (HTTP authenticated user pink89) by localhost with HTTP; Sun, 16 Oct 2016 00:50:58 -0000 Message-ID: <6d027264208d6f6013e3c8248405a968.webmail@localhost> Date: Sun, 16 Oct 2016 00:50:58 -0000 From: "Shreya Shrivastava" To: qemu-devel@nongnu.org MIME-Version: 1.0 X-Priority: 3 (Normal) Importance: Normal X-detected-operating-system: by eggs.gnu.org: OpenBSD 4.x-5.x X-Received-From: 87.121.52.221 Subject: [Qemu-devel] [PATCH 3/4] Add error checking for event_notifier_init. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stefanha@gmail.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add checks for negative return value to uses of event_notifier_init. Signed-off-by: Shreya Shrivastava --- tests/test-aio.c | 59 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 30 insertions(+), 29 deletions(-) } @@ -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, 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);