| Message ID | 1374765505-14356-16-git-send-email-stefanha@redhat.com |
|---|---|
| State | New |
| Headers | show |
Reviewed-by: Wenchao Xia <xiawenc@linux.vnet.ibm.com> > .io_flush() is no longer called so drop flush_true() and flush_io(). > > Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> > --- > 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 8d3e145..f8624d1 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); >
diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c index 8d3e145..f8624d1 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);
.io_flush() is no longer called so drop flush_true() and flush_io(). Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> --- hw/block/dataplane/virtio-blk.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-)