From 226fe60191ac5466f235427270a2ff55ec848686 Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Thu, 5 Jun 2008 13:03:31 +0100 Subject: minios: add a blkfront synchronous interface Signed-off-by: Samuel Thibault --- extras/mini-os/blkfront.c | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) (limited to 'extras/mini-os/blkfront.c') diff --git a/extras/mini-os/blkfront.c b/extras/mini-os/blkfront.c index cb82228523..2e2eea2271 100644 --- a/extras/mini-os/blkfront.c +++ b/extras/mini-os/blkfront.c @@ -323,14 +323,33 @@ void blkfront_aio(struct blkfront_aiocb *aiocbp, int write) if(notify) notify_remote_via_evtchn(dev->evtchn); } -void blkfront_aio_write(struct blkfront_aiocb *aiocbp) +static void blkfront_aio_cb(struct blkfront_aiocb *aiocbp, int ret) { - blkfront_aio(aiocbp, 1); + aiocbp->data = (void*) 1; } -void blkfront_aio_read(struct blkfront_aiocb *aiocbp) +void blkfront_io(struct blkfront_aiocb *aiocbp, int write) { - blkfront_aio(aiocbp, 0); + unsigned long flags; + ASSERT(!aiocbp->aio_cb); + aiocbp->aio_cb = blkfront_aio_cb; + blkfront_aio(aiocbp, write); + aiocbp->data = NULL; + + local_irq_save(flags); + DEFINE_WAIT(w); + while (1) { + blkfront_aio_poll(aiocbp->aio_dev); + if (aiocbp->data) + break; + + add_waiter(w, blkfront_queue); + local_irq_restore(flags); + schedule(); + local_irq_save(flags); + } + remove_waiter(w); + local_irq_restore(flags); } static void blkfront_push_operation(struct blkfront_dev *dev, uint8_t op, uint64_t id) -- cgit v1.2.3