[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 25/25] raw-posix: drop raw_get_aio_fd() since it
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH v2 25/25] raw-posix: drop raw_get_aio_fd() since it is no longer used |
Date: |
Wed, 7 May 2014 12:27:41 +0200 |
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 <address@hidden>
---
block/raw-posix.c | 34 ----------------------------------
include/block/block.h | 9 ---------
2 files changed, 43 deletions(-)
diff --git a/block/raw-posix.c b/block/raw-posix.c
index 7d0325a..a3ec44e 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -2304,40 +2304,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 c126c7c..d223e33 100644
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -449,15 +449,6 @@ void bdrv_unref(BlockDriverState *bs);
void bdrv_set_in_use(BlockDriverState *bs, int in_use);
int bdrv_in_use(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,
--
1.9.0
- [Qemu-devel] [PATCH v2 16/25] block/raw-win32: create one QEMUWin32AIOState per BDRVRawState, (continued)
- [Qemu-devel] [PATCH v2 16/25] block/raw-win32: create one QEMUWin32AIOState per BDRVRawState, Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 11/25] nfs: implement .bdrv_detach/attach_aio_context(), Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 18/25] rbd: use BlockDriverState's AioContext, Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 17/25] block/raw-win32: implement .bdrv_detach/attach_aio_context(), Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 20/25] ssh: use BlockDriverState's AioContext, Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 21/25] vmdk: implement .bdrv_detach/attach_aio_context(), Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 22/25] dataplane: use the QEMU block layer for I/O, Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 23/25] dataplane: delete IOQueue since it is no longer used, Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 24/25] dataplane: implement async flush, Stefan Hajnoczi, 2014/05/07
- [Qemu-devel] [PATCH v2 25/25] raw-posix: drop raw_get_aio_fd() since it is no longer used,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH v2 19/25] sheepdog: implement .bdrv_detach/attach_aio_context(), Stefan Hajnoczi, 2014/05/07