qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>,
	Anthony Liguori <anthony@codemonkey.ws>
Subject: [Qemu-devel] [PULL 42/42] win32-aio: drop win32_aio_flush_cb()
Date: Thu, 22 Aug 2013 22:11:38 +0200	[thread overview]
Message-ID: <1377202298-22896-43-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1377202298-22896-1-git-send-email-stefanha@redhat.com>

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 <sw@weilnetz.de>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 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

      parent reply	other threads:[~2013-08-22 20:13 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-22 20:10 [Qemu-devel] [PULL 00/42] Block patches Stefan Hajnoczi
2013-08-22 20:10 ` [Qemu-devel] [PULL 01/42] qcow2: Change default for new images to compat=1.1 Stefan Hajnoczi
2013-08-22 20:10 ` [Qemu-devel] [PULL 02/42] block: Introduce bs->zero_beyond_eof Stefan Hajnoczi
2013-08-22 20:10 ` [Qemu-devel] [PULL 03/42] block: Produce zeros when protocols reading beyond end of file Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 04/42] block: better error message for read only format name Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 05/42] vmdk: Move l1_size check into vmdk_add_extent() Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 06/42] vmdk: fix L1 and L2 table size in vmdk3 open Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 07/42] vmdk: support vmfsSparse files Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 08/42] vmdk: support vmfs files Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 09/42] aio / timers: Rename qemu_timer_* functions Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 10/42] aio / timers: Rename qemu_new_clock and expose clock types Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 11/42] aio / timers: add qemu-timer.c utility functions Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 12/42] aio / timers: Consistent treatment of disabled clocks for deadlines Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 13/42] aio / timers: add ppoll support with qemu_poll_ns Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 14/42] aio / timers: Add prctl(PR_SET_TIMERSLACK, 1, ...) to reduce timer slack Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 15/42] aio / timers: Make qemu_run_timers and qemu_run_all_timers return progress Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 16/42] aio / timers: Split QEMUClock into QEMUClock and QEMUTimerList Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 17/42] aio / timers: Untangle include files Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 18/42] aio / timers: Add QEMUTimerListGroup and helper functions Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 19/42] aio / timers: Add QEMUTimerListGroup to AioContext Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 20/42] aio / timers: Add a notify callback to QEMUTimerList Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 21/42] aio / timers: aio_ctx_prepare sets timeout from AioContext timers Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 22/42] aio / timers: Add aio_timer_init & aio_timer_new wrappers Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 23/42] aio / timers: Convert aio_poll to use AioContext timers' deadline Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 24/42] aio / timers: Convert mainloop to use timeout Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 25/42] aio / timers: On timer modification, qemu_notify or aio_notify Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 26/42] aio / timers: Introduce new API timer_new and friends Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 27/42] aio / timers: Use all timerlists in icount warp calculations Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 28/42] aio / timers: Add documentation and new format calls Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 29/42] aio / timers: Remove alarm timers Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 30/42] aio / timers: Remove legacy qemu_clock_deadline & qemu_timerlist_deadline Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 31/42] aio / timers: Add qemu_clock_get_ms and qemu_clock_get_ms Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 32/42] aio / timers: Rearrange timer.h & make legacy functions call non-legacy Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 33/42] aio / timers: Remove main_loop_timerlist Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 34/42] aio / timers: Convert rtc_clock to be a QEMUClockType Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 35/42] aio / timers: convert block_job_sleep_ns and co_sleep_ns to new API Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 36/42] aio / timers: Add test harness for AioContext timers Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 37/42] aio / timers: Add scripts/switch-timer-api Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 38/42] aio / timers: Switch entire codebase to the new timer API Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 39/42] aio / timers: Remove legacy interface Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 40/42] aio / timers: remove dummy_io_handler_flush from tests/test-aio.c Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 41/42] aio-win32: replace incorrect AioHandler->opaque usage with ->e Stefan Hajnoczi
2013-08-22 20:11 ` Stefan Hajnoczi [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1377202298-22896-43-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).