Message ID | 1276508671-3062-1-git-send-email-nab@linux-iscsi.org |
---|---|
State | New |
Headers | show |
On Mon, Jun 14, 2010 at 02:44:31AM -0700, Nicholas A. Bellinger wrote: > From: Nicholas Bellinger <nab@linux-iscsi.org> > > This patch adds posix-aio-compat.c:paio_submit_len(), which is a identical > to paio_submit() expect that in expected nb_len instead of nb_sectors (* 512) > so that it can be used by BSG AIO for write()/read() of struct sg_io_v4. Jusre remove the nb_sectors argument, we already get the length passed in the iovec.
On Mon, 2010-06-14 at 07:42 -0400, Christoph Hellwig wrote: > On Mon, Jun 14, 2010 at 02:44:31AM -0700, Nicholas A. Bellinger wrote: > > From: Nicholas Bellinger <nab@linux-iscsi.org> > > > > This patch adds posix-aio-compat.c:paio_submit_len(), which is a identical > > to paio_submit() expect that in expected nb_len instead of nb_sectors (* 512) > > so that it can be used by BSG AIO for write()/read() of struct sg_io_v4. > > Jusre remove the nb_sectors argument, we already get the length passed > in the iovec. > Mmmm, should this stay in a seperate paio_submit_len() function..? Or would it be preferred to calculate struct qemu_paiocb->aio_nbytes from the passed iov[i].iov_len for the BlockDriverState->sg == BDS_BSG case..? Best, --nab
diff --git a/block/raw-posix-aio.h b/block/raw-posix-aio.h index dfc63b8..29df842 100644 --- a/block/raw-posix-aio.h +++ b/block/raw-posix-aio.h @@ -30,6 +30,9 @@ int paio_init(void); BlockDriverAIOCB *paio_submit(BlockDriverState *bs, int fd, int64_t sector_num, QEMUIOVector *qiov, int nb_sectors, BlockDriverCompletionFunc *cb, void *opaque, int type); +BlockDriverAIOCB *paio_submit_len(BlockDriverState *bs, int fd, + int64_t sector_num, QEMUIOVector *qiov, int nb_len, + BlockDriverCompletionFunc *cb, void *opaque, int type); BlockDriverAIOCB *paio_ioctl(BlockDriverState *bs, int fd, unsigned long int req, void *buf, BlockDriverCompletionFunc *cb, void *opaque); diff --git a/posix-aio-compat.c b/posix-aio-compat.c index 272e998..ac9276c 100644 --- a/posix-aio-compat.c +++ b/posix-aio-compat.c @@ -585,6 +585,34 @@ BlockDriverAIOCB *paio_submit(BlockDriverState *bs, int fd, return &acb->common; } +BlockDriverAIOCB *paio_submit_len(BlockDriverState *bs, int fd, + int64_t sector_num, QEMUIOVector *qiov, int nb_len, + BlockDriverCompletionFunc *cb, void *opaque, int type) +{ + struct qemu_paiocb *acb; + + acb = qemu_aio_get(&raw_aio_pool, bs, cb, opaque); + if (!acb) + return NULL; + acb->aio_type = type; + acb->aio_fildes = fd; + acb->ev_signo = SIGUSR2; + acb->async_context_id = get_async_context_id(); + + if (qiov) { + acb->aio_iov = qiov->iov; + acb->aio_niov = qiov->niov; + } + acb->aio_nbytes = nb_len; + acb->aio_offset = 0; + + acb->next = posix_aio_state->first_aio; + posix_aio_state->first_aio = acb; + + qemu_paio_submit(acb); + return &acb->common; +} + BlockDriverAIOCB *paio_ioctl(BlockDriverState *bs, int fd, unsigned long int req, void *buf, BlockDriverCompletionFunc *cb, void *opaque)