From patchwork Thu Aug 22 20:11:36 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 269186 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)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 42ECD2C00A7 for ; Fri, 23 Aug 2013 06:28:50 +1000 (EST) Received: from localhost ([::1]:33638 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCbUu-0000VS-7X for incoming@patchwork.ozlabs.org; Thu, 22 Aug 2013 16:28:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59866) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCbG3-00051e-Ka for qemu-devel@nongnu.org; Thu, 22 Aug 2013 16:13:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VCbFu-0004kd-Ns for qemu-devel@nongnu.org; Thu, 22 Aug 2013 16:13:27 -0400 Received: from mx1.redhat.com ([209.132.183.28]:22666) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCbFu-0004js-DG for qemu-devel@nongnu.org; Thu, 22 Aug 2013 16:13:18 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r7MKDDrh030871 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 22 Aug 2013 16:13:13 -0400 Received: from localhost (ovpn-112-17.ams2.redhat.com [10.36.112.17]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r7MKDCf1028859; Thu, 22 Aug 2013 16:13:13 -0400 From: Stefan Hajnoczi To: Date: Thu, 22 Aug 2013 22:11:36 +0200 Message-Id: <1377202298-22896-41-git-send-email-stefanha@redhat.com> In-Reply-To: <1377202298-22896-1-git-send-email-stefanha@redhat.com> References: <1377202298-22896-1-git-send-email-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Stefan Hajnoczi , Alex Bligh , Anthony Liguori Subject: [Qemu-devel] [PULL 40/42] aio / timers: remove dummy_io_handler_flush from tests/test-aio.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Alex Bligh Remove dummy_io_handler_flush from tests/test-aio.c as it does nothing now. Signed-off-by: Alex Bligh Signed-off-by: Stefan Hajnoczi --- tests/test-aio.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/tests/test-aio.c b/tests/test-aio.c index 3ad2294..07a1f61 100644 --- a/tests/test-aio.c +++ b/tests/test-aio.c @@ -77,11 +77,6 @@ static void dummy_io_handler_read(void *opaque) { } -static int dummy_io_handler_flush(void *opaque) -{ - return 1; -} - static void bh_delete_cb(void *opaque) { BHTestData *data = opaque; @@ -382,7 +377,7 @@ static void test_timer_schedule(void) */ g_assert(!pipe2(pipefd, O_NONBLOCK)); aio_set_fd_handler(ctx, pipefd[0], - dummy_io_handler_read, NULL, dummy_io_handler_flush); + dummy_io_handler_read, NULL, NULL); aio_poll(ctx, false); aio_timer_init(ctx, &data.timer, data.clock_type, @@ -723,7 +718,7 @@ static void test_source_timer_schedule(void) */ g_assert(!pipe2(pipefd, O_NONBLOCK)); aio_set_fd_handler(ctx, pipefd[0], - dummy_io_handler_read, NULL, dummy_io_handler_flush); + dummy_io_handler_read, NULL, NULL); do {} while (g_main_context_iteration(NULL, false)); aio_timer_init(ctx, &data.timer, data.clock_type,