[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 14/17] dataplane/virtio-blk: drop flush_true() an
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v4 14/17] dataplane/virtio-blk: drop flush_true() and flush_io() |
Date: |
Fri, 14 Jun 2013 13:44:00 +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 0509d3f..9e6d32b 100644
--- a/hw/block/dataplane/virtio-blk.c
+++ b/hw/block/dataplane/virtio-blk.c
@@ -264,11 +264,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,
@@ -348,14 +343,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,
@@ -486,7 +473,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);
@@ -494,7 +481,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
- Re: [Qemu-devel] [PATCH v4 03/17] tests: adjust test-aio to new aio_poll() semantics, (continued)
- [Qemu-devel] [PATCH v4 13/17] block/ssh: drop return_true(), Stefan Hajnoczi, 2013/06/14
- [Qemu-devel] [PATCH v4 15/17] thread-pool: drop thread_pool_active(), Stefan Hajnoczi, 2013/06/14
- [Qemu-devel] [PATCH v4 16/17] tests: drop event_active_cb(), Stefan Hajnoczi, 2013/06/14
- [Qemu-devel] [PATCH v4 17/17] aio: drop io_flush argument, Stefan Hajnoczi, 2013/06/14
- [Qemu-devel] [PATCH v4 05/17] aio: stop using .io_flush(), Stefan Hajnoczi, 2013/06/14
- [Qemu-devel] [PATCH v4 14/17] dataplane/virtio-blk: drop flush_true() and flush_io(),
Stefan Hajnoczi <=
- Re: [Qemu-devel] [PATCH v4 00/17] aio: drop io_flush(), Stefan Hajnoczi, 2013/06/27
- Re: [Qemu-devel] [PATCH v4 00/17] aio: drop io_flush(), Paolo Bonzini, 2013/06/27