[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 18/24] block: switch bdrv_aio_writev() to coroutines
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 18/24] block: switch bdrv_aio_writev() to coroutines |
Date: |
Fri, 14 Oct 2011 18:49:13 +0200 |
From: Stefan Hajnoczi <address@hidden>
More sync, aio, and coroutine unification. Make bdrv_aio_writev() go
through coroutine request processing.
Remove the dirty block callback mechanism which was needed only for aio
processing and can be done more naturally in coroutine context.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 66 +-------------------------------------------------------------
1 files changed, 2 insertions(+), 64 deletions(-)
diff --git a/block.c b/block.c
index 02e15ca..8c7d05e 100644
--- a/block.c
+++ b/block.c
@@ -2385,76 +2385,14 @@ BlockDriverAIOCB *bdrv_aio_readv(BlockDriverState *bs,
int64_t sector_num,
cb, opaque, false, bdrv_co_do_rw);
}
-typedef struct BlockCompleteData {
- BlockDriverCompletionFunc *cb;
- void *opaque;
- BlockDriverState *bs;
- int64_t sector_num;
- int nb_sectors;
-} BlockCompleteData;
-
-static void block_complete_cb(void *opaque, int ret)
-{
- BlockCompleteData *b = opaque;
-
- if (b->bs->dirty_bitmap) {
- set_dirty_bitmap(b->bs, b->sector_num, b->nb_sectors, 1);
- }
- b->cb(b->opaque, ret);
- g_free(b);
-}
-
-static BlockCompleteData *blk_dirty_cb_alloc(BlockDriverState *bs,
- int64_t sector_num,
- int nb_sectors,
- BlockDriverCompletionFunc *cb,
- void *opaque)
-{
- BlockCompleteData *blkdata = g_malloc0(sizeof(BlockCompleteData));
-
- blkdata->bs = bs;
- blkdata->cb = cb;
- blkdata->opaque = opaque;
- blkdata->sector_num = sector_num;
- blkdata->nb_sectors = nb_sectors;
-
- return blkdata;
-}
-
BlockDriverAIOCB *bdrv_aio_writev(BlockDriverState *bs, int64_t sector_num,
QEMUIOVector *qiov, int nb_sectors,
BlockDriverCompletionFunc *cb, void *opaque)
{
- BlockDriver *drv = bs->drv;
- BlockDriverAIOCB *ret;
- BlockCompleteData *blk_cb_data;
-
trace_bdrv_aio_writev(bs, sector_num, nb_sectors, opaque);
- if (!drv)
- return NULL;
- if (bs->read_only)
- return NULL;
- if (bdrv_check_request(bs, sector_num, nb_sectors))
- return NULL;
-
- if (bs->dirty_bitmap) {
- blk_cb_data = blk_dirty_cb_alloc(bs, sector_num, nb_sectors, cb,
- opaque);
- cb = &block_complete_cb;
- opaque = blk_cb_data;
- }
-
- ret = drv->bdrv_aio_writev(bs, sector_num, qiov, nb_sectors,
- cb, opaque);
-
- if (ret) {
- if (bs->wr_highest_sector < sector_num + nb_sectors - 1) {
- bs->wr_highest_sector = sector_num + nb_sectors - 1;
- }
- }
-
- return ret;
+ return bdrv_co_aio_rw_vector(bs, sector_num, qiov, nb_sectors,
+ cb, opaque, true, bdrv_co_do_rw);
}
--
1.7.6.4
- [Qemu-devel] [PATCH 06/24] scsi: Support I/O status, (continued)
- [Qemu-devel] [PATCH 06/24] scsi: Support I/O status, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 13/24] block: directly invoke .bdrv_* from emulation functions, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 11/24] vvfat: Fix potential buffer overflow, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 10/24] block/vvfat: Remove unused code, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 12/24] block: directly invoke .bdrv_aio_*() in bdrv_co_io_em(), Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 14/24] block: split out bdrv_co_do_readv() and bdrv_co_do_writev(), Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 15/24] block: switch bdrv_read()/bdrv_write() to coroutines, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 17/24] block: mark blocks dirty on coroutine write completion, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 16/24] block: switch bdrv_aio_readv() to coroutines, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 18/24] block: switch bdrv_aio_writev() to coroutines,
Kevin Wolf <=
- [Qemu-devel] [PATCH 19/24] linux-aio: Allow reads beyond the end of growable images, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 20/24] block: drop emulation functions that use coroutines, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 23/24] block: drop .bdrv_read()/.bdrv_write() emulation, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 22/24] block: use coroutine interface for raw format, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 24/24] block: drop bdrv_has_async_rw(), Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 21/24] raw-posix: remove bdrv_read()/bdrv_write(), Kevin Wolf, 2011/10/14
- Re: [Qemu-devel] [PULL 00/24] Block patches, Anthony Liguori, 2011/10/14