[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/24] block: directly invoke .bdrv_aio_*() in bdrv_
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 12/24] block: directly invoke .bdrv_aio_*() in bdrv_co_io_em() |
Date: |
Fri, 14 Oct 2011 18:49:07 +0200 |
From: Stefan Hajnoczi <address@hidden>
We will unify block layer request processing across sync, aio, and
coroutines and this means a .bdrv_co_*() emulation function should not
call back into the public interface. There's no need here, just call
.bdrv_aio_*() directly.
The gory details: bdrv_co_io_em() cannot call back into the public
bdrv_aio_*() interface since that will be handled using coroutines,
which causes us to call into bdrv_co_io_em() again in an infinite loop
:).
Signed-off-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
block.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index 25b03dd..09f8aad 100644
--- a/block.c
+++ b/block.c
@@ -3011,11 +3011,11 @@ static int coroutine_fn bdrv_co_io_em(BlockDriverState
*bs, int64_t sector_num,
BlockDriverAIOCB *acb;
if (is_write) {
- acb = bdrv_aio_writev(bs, sector_num, iov, nb_sectors,
- bdrv_co_io_em_complete, &co);
+ acb = bs->drv->bdrv_aio_writev(bs, sector_num, iov, nb_sectors,
+ bdrv_co_io_em_complete, &co);
} else {
- acb = bdrv_aio_readv(bs, sector_num, iov, nb_sectors,
- bdrv_co_io_em_complete, &co);
+ acb = bs->drv->bdrv_aio_readv(bs, sector_num, iov, nb_sectors,
+ bdrv_co_io_em_complete, &co);
}
trace_bdrv_co_io_em(bs, sector_num, nb_sectors, is_write, acb);
--
1.7.6.4
- [Qemu-devel] [PATCH 03/24] block: Keep track of devices' I/O status, (continued)
- [Qemu-devel] [PATCH 03/24] block: Keep track of devices' I/O status, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 04/24] virtio: Support I/O status, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 05/24] ide: Support I/O status, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 07/24] QMP: query-status: Add 'io-status' key, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 08/24] HMP: Print 'io-status' information, Kevin Wolf, 2011/10/14
- [Qemu-devel] [PATCH 09/24] block/vvfat: Fix potential memory leaks and other memory errors, Kevin Wolf, 2011/10/14
- [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 <=
- [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, 2011/10/14
- [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