[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 42/42] win32-aio: drop win32_aio_flush_cb()
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 42/42] win32-aio: drop win32_aio_flush_cb() |
Date: |
Thu, 22 Aug 2013 22:11:38 +0200 |
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().
Reviewed-by: Stefan Weil <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
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
- [Qemu-devel] [PULL 23/42] aio / timers: Convert aio_poll to use AioContext timers' deadline, (continued)
- [Qemu-devel] [PULL 23/42] aio / timers: Convert aio_poll to use AioContext timers' deadline, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 24/42] aio / timers: Convert mainloop to use timeout, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 25/42] aio / timers: On timer modification, qemu_notify or aio_notify, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 27/42] aio / timers: Use all timerlists in icount warp calculations, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 26/42] aio / timers: Introduce new API timer_new and friends, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 28/42] aio / timers: Add documentation and new format calls, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 36/42] aio / timers: Add test harness for AioContext timers, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 34/42] aio / timers: Convert rtc_clock to be a QEMUClockType, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 37/42] aio / timers: Add scripts/switch-timer-api, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 35/42] aio / timers: convert block_job_sleep_ns and co_sleep_ns to new API, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 42/42] win32-aio: drop win32_aio_flush_cb(),
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 41/42] aio-win32: replace incorrect AioHandler->opaque usage with ->e, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 32/42] aio / timers: Rearrange timer.h & make legacy functions call non-legacy, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 39/42] aio / timers: Remove legacy interface, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 40/42] aio / timers: remove dummy_io_handler_flush from tests/test-aio.c, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 33/42] aio / timers: Remove main_loop_timerlist, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 29/42] aio / timers: Remove alarm timers, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 31/42] aio / timers: Add qemu_clock_get_ms and qemu_clock_get_ms, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 30/42] aio / timers: Remove legacy qemu_clock_deadline & qemu_timerlist_deadline, Stefan Hajnoczi, 2013/08/22
- [Qemu-devel] [PULL 38/42] aio / timers: Switch entire codebase to the new timer API, Stefan Hajnoczi, 2013/08/23