diff options
| author | Stefan Hajnoczi <stefanha@redhat.com> | 2014-05-08 16:34:58 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-06-04 09:56:12 +0200 |
| commit | 76ef2cf5493a215efc351f48ae7094d6c183fcac (patch) | |
| tree | 820f8d55f657064db196f79b0343d92789ea65bb | |
| parent | 8d242f0ed5908333035dd5a8a94c06d7fe3b765c (diff) | |
raw-posix: drop raw_get_aio_fd() since it is no longer used
virtio-blk data-plane now uses the QEMU block layer for I/O. We do not
need raw_get_aio_fd() anymore. It was a layering violation anyway, so
let's get rid of it.
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | block/raw-posix.c | 34 | ||||
| -rw-r--r-- | include/block/block.h | 9 |
2 files changed, 0 insertions, 43 deletions
diff --git a/block/raw-posix.c b/block/raw-posix.c index ffdb1763f8..c2b30be3d3 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -2331,40 +2331,6 @@ static BlockDriver bdrv_host_cdrom = { }; #endif /* __FreeBSD__ */ -#ifdef CONFIG_LINUX_AIO -/** - * Return the file descriptor for Linux AIO - * - * This function is a layering violation and should be removed when it becomes - * possible to call the block layer outside the global mutex. It allows the - * caller to hijack the file descriptor so I/O can be performed outside the - * block layer. - */ -int raw_get_aio_fd(BlockDriverState *bs) -{ - BDRVRawState *s; - - if (!bs->drv) { - return -ENOMEDIUM; - } - - if (bs->drv == bdrv_find_format("raw")) { - bs = bs->file; - } - - /* raw-posix has several protocols so just check for raw_aio_readv */ - if (bs->drv->bdrv_aio_readv != raw_aio_readv) { - return -ENOTSUP; - } - - s = bs->opaque; - if (!s->use_aio) { - return -ENOTSUP; - } - return s->fd; -} -#endif /* CONFIG_LINUX_AIO */ - static void bdrv_file_init(void) { /* diff --git a/include/block/block.h b/include/block/block.h index 292754f9fe..29ac56da2c 100644 --- a/include/block/block.h +++ b/include/block/block.h @@ -481,15 +481,6 @@ void bdrv_op_block_all(BlockDriverState *bs, Error *reason); void bdrv_op_unblock_all(BlockDriverState *bs, Error *reason); bool bdrv_op_blocker_is_empty(BlockDriverState *bs); -#ifdef CONFIG_LINUX_AIO -int raw_get_aio_fd(BlockDriverState *bs); -#else -static inline int raw_get_aio_fd(BlockDriverState *bs) -{ - return -ENOTSUP; -} -#endif - enum BlockAcctType { BDRV_ACCT_READ, BDRV_ACCT_WRITE, |