From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33385) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCUwg-00020I-NU for qemu-devel@nongnu.org; Thu, 22 Aug 2013 09:29:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VCUwZ-0006wm-HL for qemu-devel@nongnu.org; Thu, 22 Aug 2013 09:29:02 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5957) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCUwZ-0006wc-9Z for qemu-devel@nongnu.org; Thu, 22 Aug 2013 09:28:55 -0400 From: Stefan Hajnoczi Date: Thu, 22 Aug 2013 15:28:36 +0200 Message-Id: <1377178116-28488-3-git-send-email-stefanha@redhat.com> In-Reply-To: <1377178116-28488-1-git-send-email-stefanha@redhat.com> References: <1377178116-28488-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH 2/2] win32-aio: drop win32_aio_flush_cb() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Weil , Anthony Liguori , Stefan Hajnoczi The io_flush argument to qemu_aio_set_event_notifier() has been removed since the block layer learnt to drain requests by itself. Fix the Windows build for win32-aio.o by updating the qemu_aio_set_event_notifier() call and dropping win32_aio_flush_cb(). Signed-off-by: Stefan Hajnoczi --- block/win32-aio.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/block/win32-aio.c b/block/win32-aio.c index fcb7c75..5d1d199 100644 --- a/block/win32-aio.c +++ b/block/win32-aio.c @@ -105,13 +105,6 @@ static void win32_aio_completion_cb(EventNotifier *e) } } -static int win32_aio_flush_cb(EventNotifier *e) -{ - QEMUWin32AIOState *s = container_of(e, QEMUWin32AIOState, e); - - return (s->count > 0) ? 1 : 0; -} - static void win32_aio_cancel(BlockDriverAIOCB *blockacb) { QEMUWin32AIOCB *waiocb = (QEMUWin32AIOCB *)blockacb; @@ -201,8 +194,7 @@ QEMUWin32AIOState *win32_aio_init(void) goto out_close_efd; } - qemu_aio_set_event_notifier(&s->e, win32_aio_completion_cb, - win32_aio_flush_cb); + qemu_aio_set_event_notifier(&s->e, win32_aio_completion_cb); return s; -- 1.8.3.1