remove bdrv_aio_read/bdrv_aio_write
PATCH 1/3 remove bdrv_aio_read/bdrv_aio_write
Always use the vectored APIs to reduce code churn once we switch the BlockDriver API to be vectored.
Signed-off-by Christoph Hellwig <[email protected]>
hw/ide.c +7 -3
@@ -496,6 +496,8 @@ typedef struct BMDMAState {IDEState *ide_if;BlockDriverCompletionFunc *dma_cb;BlockDriverAIOCB *aiocb; +struct iovec iov; +QEMUIOVector qiov;int64_t sector_num;uint32_t nsector; } BMDMAState;
@@ -1467,9 +1469,11 @@ static void ide_atapi_cmd_read_dma_cb(vo#ifdef DEBUG_AIO printf ("aio_read_cd: lba=%u n=%d\n" , s->lba, n);#endif - bm->aiocb =bdrv_aio_read (s->bs, (int64_t )s->lba <<2 , - s->io_buffer + data_offset, n *4 , - ide_atapi_cmd_read_dma_cb, bm); + bm->iov.iov_base = s->io_buffer + data_offset; + bm->iov.iov_len = n *4 *512 ; +qemu_iovec_init_external (&bm->qiov, &bm->iov,1 ); + bm->aiocb =bdrv_aio_readv (s->bs, (int64_t )s->lba <<2 , &bm->qiov, + n *4 , ide_atapi_cmd_read_dma_cb, bm);if (!bm->aiocb) {/* Note: media not present is the most likely case */ ide_atapi_cmd_error(s, SENSE_NOT_READY,
hw/scsi-disk.c +64 -63
287 lines not on this page · raw message
block-qcow.c +20 -8
@@ -530,6 +530,8 @@ typedef struct QCowAIOCB {int n;uint64_t cluster_offset;uint8_t *cluster_data; +struct iovec hd_iov; +QEMUIOVector hd_qiov;BlockDriverAIOCB *hd_aiocb; } QCowAIOCB;
@@ -584,8 +586,11 @@ static void qcow_aio_read_cb(void *opaquif (!acb->cluster_offset) {if (bs->backing_hd) {/* read from the base image */ - acb->hd_aiocb =bdrv_aio_read (bs->backing_hd, - acb->sector_num, acb->buf, acb->n, qcow_aio_read_cb, acb); + acb->hd_iov.iov_base = acb->buf; + acb->hd_iov.iov_len = acb->n *512 ; +qemu_iovec_init_external (&acb->hd_qiov, &acb->hd_iov,1 ); + acb->hd_aiocb =bdrv_aio_readv (bs->backing_hd, acb->sector_num, + &acb->hd_qiov, acb->n, qcow_aio_read_cb, acb);if (acb->hd_aiocb ==NULL ) goto fail; }else {
@@ -605,9 +610,12 @@ static void qcow_aio_read_cb(void *opaqu ret = -EIO ; goto fail; } - acb->hd_aiocb =bdrv_aio_read (s->hd, + acb->hd_iov.iov_base = acb->buf; + acb->hd_iov.iov_len = acb->n *512 ; +qemu_iovec_init_external (&acb->hd_qiov, &acb->hd_iov,1 ); + acb->hd_aiocb =bdrv_aio_readv (s->hd, (acb->cluster_offset >>9 ) + index_in_cluster, - acb->buf, acb->n, qcow_aio_read_cb, acb); + &acb->hd_qiov, acb->n, qcow_aio_read_cb, acb);if (acb->hd_aiocb ==NULL ) goto fail; }
@@ -687,10 +695,14 @@ static void qcow_aio_write_cb(void *opaq }else { src_buf = acb->buf; } - acb->hd_aiocb =bdrv_aio_write (s->hd, - (cluster_offset >>9 ) + index_in_cluster, - src_buf, acb->n, - qcow_aio_write_cb, acb); + + acb->hd_iov.iov_base = (void *)src_buf; + acb->hd_iov.iov_len = acb->n *512 ; +qemu_iovec_init_external (&acb->hd_qiov, &acb->hd_iov,1 ); + acb->hd_aiocb =bdrv_aio_writev (s->hd, + (cluster_offset >>9 ) + index_in_cluster, + &acb->hd_qiov, acb->n, + qcow_aio_write_cb, acb);if (acb->hd_aiocb ==NULL ) goto fail; }
block-qcow2.c +21 -8
@@ -1270,6 +1270,8 @@ typedef struct QCowAIOCB {uint64_t cluster_offset;uint8_t *cluster_data;BlockDriverAIOCB *hd_aiocb; +struct iovec hd_iov; +QEMUIOVector hd_qiov;QEMUBH *bh;QCowL2Meta l2meta; } QCowAIOCB;
@@ -1347,8 +1349,12 @@ fail: n1 =backing_read1 (bs->backing_hd, acb->sector_num, acb->buf, acb->n);if (n1 >0 ) { - acb->hd_aiocb =bdrv_aio_read (bs->backing_hd, acb->sector_num, - acb->buf, acb->n, qcow_aio_read_cb, acb); + acb->hd_iov.iov_base = acb->buf; + acb->hd_iov.iov_len = acb->n *512 ; +qemu_iovec_init_external (&acb->hd_qiov, &acb->hd_iov,1 ); + acb->hd_aiocb =bdrv_aio_readv (bs->backing_hd, acb->sector_num, + &acb->hd_qiov, acb->n, + qcow_aio_read_cb, acb);if (acb->hd_aiocb ==NULL ) goto fail; }else {
@@ -1377,9 +1383,13 @@ fail: ret = -EIO ; goto fail; } - acb->hd_aiocb =bdrv_aio_read (s->hd, + + acb->hd_iov.iov_base = acb->buf; + acb->hd_iov.iov_len = acb->n *512 ; +qemu_iovec_init_external (&acb->hd_qiov, &acb->hd_iov,1 ); + acb->hd_aiocb =bdrv_aio_readv (s->hd, (acb->cluster_offset >>9 ) + index_in_cluster, - acb->buf, acb->n, qcow_aio_read_cb, acb); + &acb->hd_qiov, acb->n, qcow_aio_read_cb, acb);if (acb->hd_aiocb ==NULL ) goto fail; }
@@ -1476,10 +1486,13 @@ static void qcow_aio_write_cb(void *opaq }else { src_buf = acb->buf; } - acb->hd_aiocb =bdrv_aio_write (s->hd, - (acb->cluster_offset >>9 ) + index_in_cluster, - src_buf, acb->n, - qcow_aio_write_cb, acb); + acb->hd_iov.iov_base = (void *)src_buf; + acb->hd_iov.iov_len = acb->n *512 ; +qemu_iovec_init_external (&acb->hd_qiov, &acb->hd_iov,1 ); + acb->hd_aiocb =bdrv_aio_writev (s->hd, + (acb->cluster_offset >>9 ) + index_in_cluster, + &acb->hd_qiov, acb->n, + qcow_aio_write_cb, acb);if (acb->hd_aiocb ==NULL ) goto fail; }
block.c +8 -2
@@ -55,6 +55,12 @@ typedef struct BlockDriverAIOCBSync {int ret; } BlockDriverAIOCBSync; +static BlockDriverAIOCB *bdrv_aio_read (BlockDriverState *bs, +int64_t sector_num,uint8_t *buf,int nb_sectors, +BlockDriverCompletionFunc *cb,void *opaque); +static BlockDriverAIOCB *bdrv_aio_write (BlockDriverState *bs, +int64_t sector_num,const uint8_t *buf,int nb_sectors, +BlockDriverCompletionFunc *cb,void *opaque);static BlockDriverAIOCB *bdrv_aio_read_em (BlockDriverState *bs,int64_t sector_num,uint8_t *buf,int nb_sectors,BlockDriverCompletionFunc *cb,void *opaque);
@@ -1370,7 +1376,7 @@ BlockDriverAIOCB *bdrv_aio_writev(BlockD cb, opaque, 1); } -BlockDriverAIOCB *bdrv_aio_read (BlockDriverState *bs,int64_t sector_num, +static BlockDriverAIOCB *bdrv_aio_read (BlockDriverState *bs,int64_t sector_num,uint8_t *buf,int nb_sectors,BlockDriverCompletionFunc *cb,void *opaque) {
@@ -1393,7 +1399,7 @@ BlockDriverAIOCB *bdrv_aio_read(BlockDrireturn ret; } -BlockDriverAIOCB *bdrv_aio_write (BlockDriverState *bs,int64_t sector_num, +static BlockDriverAIOCB *bdrv_aio_write (BlockDriverState *bs,int64_t sector_num,const uint8_t *buf,int nb_sectors,BlockDriverCompletionFunc *cb,void *opaque) {
block.h +0 -7
@@ -96,13 +96,6 @@ BlockDriverAIOCB *bdrv_aio_readv(BlockDrBlockDriverAIOCB *bdrv_aio_writev (BlockDriverState *bs,int64_t sector_num,QEMUIOVector *iov,int nb_sectors,BlockDriverCompletionFunc *cb,void *opaque); - -BlockDriverAIOCB *bdrv_aio_read (BlockDriverState *bs,int64_t sector_num, -uint8_t *buf,int nb_sectors, -BlockDriverCompletionFunc *cb,void *opaque); -BlockDriverAIOCB *bdrv_aio_write (BlockDriverState *bs,int64_t sector_num, -const uint8_t *buf,int nb_sectors, -BlockDriverCompletionFunc *cb,void *opaque);void bdrv_aio_cancel (BlockDriverAIOCB *acb);/* sg packet commands */
Anthony Liguori
AppliedQuoted 6 lines · Christoph Hellwig
Always use the vectored APIs to reduce code churn once we switch the BlockDriver API to be vectored.
Signed-off-by Christoph Hellwig <[email protected]>
Applied all. Thanks.
Signature · 3 lines
Regards, Anthony Liguori