[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC 11/13] dataplane/virtio-blk: drop flush_true() and flu
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [RFC 11/13] dataplane/virtio-blk: drop flush_true() and flush_io() |
Date: |
Thu, 11 Apr 2013 17:44:43 +0200 |
.io_flush() is no longer called so drop flush_true() and flush_io().
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/block/dataplane/virtio-blk.c | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
index 982896c..56b80b2 100644
--- a/hw/block/dataplane/virtio-blk.c
+++ b/hw/block/dataplane/virtio-blk.c
@@ -263,11 +263,6 @@ static int process_request(IOQueue *ioq, struct iovec
iov[],
}
}
-static int flush_true(EventNotifier *e)
-{
- return true;
-}
-
static void handle_notify(EventNotifier *e)
{
VirtIOBlockDataPlane *s = container_of(e, VirtIOBlockDataPlane,
@@ -347,14 +342,6 @@ static void handle_notify(EventNotifier *e)
}
}
-static int flush_io(EventNotifier *e)
-{
- VirtIOBlockDataPlane *s = container_of(e, VirtIOBlockDataPlane,
- io_notifier);
-
- return s->num_reqs > 0;
-}
-
static void handle_io(EventNotifier *e)
{
VirtIOBlockDataPlane *s = container_of(e, VirtIOBlockDataPlane,
@@ -485,7 +472,7 @@ void virtio_blk_data_plane_start(VirtIOBlockDataPlane *s)
exit(1);
}
s->host_notifier = *virtio_queue_get_host_notifier(vq);
- aio_set_event_notifier(s->ctx, &s->host_notifier, handle_notify,
flush_true);
+ aio_set_event_notifier(s->ctx, &s->host_notifier, handle_notify, NULL);
/* Set up ioqueue */
ioq_init(&s->ioqueue, s->fd, REQ_MAX);
@@ -493,7 +480,7 @@ void virtio_blk_data_plane_start(VirtIOBlockDataPlane *s)
ioq_put_iocb(&s->ioqueue, &s->requests[i].iocb);
}
s->io_notifier = *ioq_get_notifier(&s->ioqueue);
- aio_set_event_notifier(s->ctx, &s->io_notifier, handle_io, flush_io);
+ aio_set_event_notifier(s->ctx, &s->io_notifier, handle_io, NULL);
s->started = true;
trace_virtio_blk_data_plane_start(s);
--
1.8.1.4
- [Qemu-devel] [RFC 00/13] aio: drop io_flush(), Stefan Hajnoczi, 2013/04/11
- [Qemu-devel] [RFC 03/13] aio: stop using .io_flush(), Stefan Hajnoczi, 2013/04/11
- [Qemu-devel] [RFC 07/13] block/linux-aio: drop qemu_laio_completion_cb(), Stefan Hajnoczi, 2013/04/11
- [Qemu-devel] [RFC 11/13] dataplane/virtio-blk: drop flush_true() and flush_io(),
Stefan Hajnoczi <=
- [Qemu-devel] [RFC 12/13] thread-pool: drop thread_pool_active(), Stefan Hajnoczi, 2013/04/11
- [Qemu-devel] [RFC 05/13] block/gluster: drop qemu_gluster_aio_flush_cb(), Stefan Hajnoczi, 2013/04/11
- [Qemu-devel] [RFC 01/13] block: stop relying on io_flush() in bdrv_drain_all(), Stefan Hajnoczi, 2013/04/11
- [Qemu-devel] [RFC 10/13] block/sheepdog: drop have_co_req() and aio_flush_request(), Stefan Hajnoczi, 2013/04/11
- [Qemu-devel] [RFC 09/13] block/rbd: drop qemu_rbd_aio_flush_cb(), Stefan Hajnoczi, 2013/04/11
- [Qemu-devel] [RFC 13/13] aio: drop io_flush argument, Stefan Hajnoczi, 2013/04/11
- [Qemu-devel] [RFC 06/13] block/iscsi: drop iscsi_process_flush(), Stefan Hajnoczi, 2013/04/11
- [Qemu-devel] [RFC 04/13] block/curl: drop curl_aio_flush(), Stefan Hajnoczi, 2013/04/11
- [Qemu-devel] [RFC 08/13] block/nbd: drop nbd_have_request(), Stefan Hajnoczi, 2013/04/11
- [Qemu-devel] [RFC 02/13] dataplane/virtio-blk: check exit conditions before aio_poll(), Stefan Hajnoczi, 2013/04/11