Skip to content

Commit

Permalink
dataplane/virtio-blk: drop flush_true() and flush_io()
Browse files Browse the repository at this point in the history
.io_flush() is no longer called so drop flush_true() and flush_io().

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
  • Loading branch information
stefanhaRH committed Aug 19, 2013
1 parent f0d3576 commit ce68936
Showing 1 changed file with 2 additions and 15 deletions.
17 changes: 2 additions & 15 deletions hw/block/dataplane/virtio-blk.c
Original file line number Diff line number Diff line change
Expand Up @@ -261,11 +261,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,
Expand Down Expand Up @@ -345,14 +340,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,
Expand Down Expand Up @@ -485,15 +472,15 @@ 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);
for (i = 0; i < ARRAY_SIZE(s->requests); i++) {
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);
Expand Down

0 comments on commit ce68936

Please sign in to comment.